Skip to content

Commit be3a791

Browse files
Fixed build
1 parent 3d785c8 commit be3a791

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,20 @@ tasks.named("test", Test) {
107107
dependsOn "test_before_1_11_106"
108108
}
109109

110+
def isLinuxArm64 = {
111+
def os = System.getProperty("os.name").toLowerCase()
112+
def arch = System.getProperty("os.arch").toLowerCase()
113+
os.contains("linux") && (arch.contains("arm64") || arch.contains("aarch64"))
114+
}
115+
116+
tasks.withType(Test).configureEach {
117+
if ((name == "forkedTest" || name.endsWith("ForkedTest"))
118+
&& isLinuxArm64()) {
119+
// TODO: Remove this Linux arm64 workaround once the forked AWS SDK 1.11 tests are stable there.
120+
maxParallelForks = 1
121+
}
122+
}
123+
110124
tasks.named("forkedTest", Test) {
111125
dependsOn "test_before_1_11_106ForkedTest"
112126
}

dd-smoke-tests/openfeature/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
3232
final springBootShadowJar = System.getProperty("datadog.smoketest.springboot.shadowJar.path")
3333
final command = [javaPath()]
3434
command.addAll(defaultJavaProperties)
35+
command.add('-Dfile.encoding=UTF-8')
3536
command.add('-Ddd.trace.debug=true')
3637
command.add('-Ddd.remote_config.enabled=true')
3738
command.add("-Ddd.remote_config.url=http://localhost:${server.address.port}/v0.7/config".toString())

dd-smoke-tests/springboot-openliberty-20/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
1515
tasks.register('mvnStage', Exec) {
1616
workingDir("$appDir")
1717
environment += [
18-
"MAVEN_OPTS": "-Xmx512M",
18+
"MAVEN_OPTS": "-Xmx512M -Dfile.encoding=UTF-8",
1919
"JAVA_HOME": getLazyJavaHomeFor(8)
2020
]
2121

0 commit comments

Comments
 (0)