Skip to content

Commit a10452c

Browse files
fixes for arm64
1 parent e5de02b commit a10452c

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

buildSrc/src/main/kotlin/dd-trace-java.test-jvm-constraints.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension.Comp
44
import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec
55
import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
66
import datadog.gradle.plugin.testJvmConstraints.isTestJvmAllowed
7+
import java.util.Locale.getDefault
78

89
plugins {
910
java
@@ -79,6 +80,19 @@ private fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
7980
),
8081
extension.allowReflectiveAccessToJdk
8182
)
83+
84+
// TODO: Codex patch to fix arm64 Linux for ByteBuddy error:
85+
// "Could not self-attach to current VM using external process"
86+
val os = System.getProperty("os.name").lowercase(getDefault())
87+
val arch = System.getProperty("os.arch").lowercase(getDefault())
88+
val arm64 = arch.contains("aarch64") || arch.contains("arm64")
89+
90+
if (os.contains("linux") && arm64) {
91+
conditionalJvmArgs(
92+
JavaVersion.VERSION_1_9,
93+
listOf("-Djdk.attach.allowAttachSelf=true")
94+
)
95+
}
8296
}
8397

8498
// Jacoco plugin is not applied on every project

settings.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ include(
480480
":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.1",
481481
":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.7",
482482
":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-sync-3.10",
483-
":dd-java-agent:instrumentation:mule-4.5",
484483
":dd-java-agent:instrumentation:netty:netty-3.8",
485484
":dd-java-agent:instrumentation:netty:netty-4.0",
486485
":dd-java-agent:instrumentation:netty:netty-4.1",
@@ -642,11 +641,11 @@ val arch = System.getProperty("os.arch").lowercase(getDefault())
642641
val arm64 = arch.contains("aarch64") || arch.contains("arm64")
643642
val skipLinuxArm64Tests = os.contains("linux") && arm64
644643

645-
// TODO: skip `openai-java-3.0` on arm64 Linux for now
646-
// it is failing in strange way
644+
// TODO: skip modules that failing in a strange way on arm64 Linux
647645
if (!skipLinuxArm64Tests) {
648646
include(
649-
":dd-java-agent:instrumentation:openai-java:openai-java-3.0"
647+
":dd-java-agent:instrumentation:openai-java:openai-java-3.0",
648+
":dd-java-agent:instrumentation:mule-4.5",
650649
)
651650
}
652651
// Optional `akka-http-10.6` instrumentation (see BUILDING.md for how to enable it):

0 commit comments

Comments
 (0)