From d8626408a62d456d0c72c3eb04592b2b7165cea5 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 4 Jun 2026 15:42:14 +0100 Subject: [PATCH 1/3] byte-buddy 1.18.9 --- buildSrc/build.gradle.kts | 2 +- .../gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt | 2 +- .../plugin/instrument/BuildTimeInstrumentationPluginTest.kt | 6 +++--- gradle/libs.versions.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5d1ef60c3db..e2282691c9b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -77,7 +77,7 @@ repositories { dependencies { implementation(gradleApi()) - implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.8") + implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.9") implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0") implementation("org.eclipse.aether", "aether-transport-http", "1.1.0") diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt index c65742f2c83..4b19c48666e 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt @@ -30,7 +30,7 @@ class CallSiteInstrumentationPluginTest : GradleFixture() { } dependencies { - implementation("net.bytebuddy:byte-buddy:1.18.8") + implementation("net.bytebuddy:byte-buddy:1.18.9") implementation("com.google.auto.service:auto-service-annotations:1.1.1") } """ diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt index 9bbcb7bf386..d0681d26f60 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt @@ -30,7 +30,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.8") // just to build TestPlugin + compileOnly("net.bytebuddy:byte-buddy:1.18.9") // just to build TestPlugin } buildTimeInstrumentation.plugins.set(listOf("TestPlugin")) @@ -71,7 +71,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.8") + compileOnly("net.bytebuddy:byte-buddy:1.18.9") } buildTimeInstrumentation { @@ -112,7 +112,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.8") + compileOnly("net.bytebuddy:byte-buddy:1.18.9") } buildTimeInstrumentation { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba7e784ffe5..8f52b2b9b7c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ scala33 = "3.3.0" # Bytecode manipulations & codegen autoservice = "1.1.1" asm = "9.9.1" -byte-buddy = "1.18.8" +byte-buddy = "1.18.9" instrument-java = "0.0.3" # Benchmarks From c8e4ce5c0bb97a87d0daa01e882e3b59d6f12bd0 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 4 Jun 2026 15:50:00 +0100 Subject: [PATCH 2/3] byte-buddy 1.18.10 --- buildSrc/build.gradle.kts | 2 +- .../gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt | 2 +- .../plugin/instrument/BuildTimeInstrumentationPluginTest.kt | 6 +++--- gradle/libs.versions.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e2282691c9b..91c1fed84b3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -77,7 +77,7 @@ repositories { dependencies { implementation(gradleApi()) - implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.9") + implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.10") implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0") implementation("org.eclipse.aether", "aether-transport-http", "1.1.0") diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt index 4b19c48666e..087db26fd69 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt @@ -30,7 +30,7 @@ class CallSiteInstrumentationPluginTest : GradleFixture() { } dependencies { - implementation("net.bytebuddy:byte-buddy:1.18.9") + implementation("net.bytebuddy:byte-buddy:1.18.10") implementation("com.google.auto.service:auto-service-annotations:1.1.1") } """ diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt index d0681d26f60..1fef4354b2c 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt @@ -30,7 +30,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.9") // just to build TestPlugin + compileOnly("net.bytebuddy:byte-buddy:1.18.10") // just to build TestPlugin } buildTimeInstrumentation.plugins.set(listOf("TestPlugin")) @@ -71,7 +71,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.9") + compileOnly("net.bytebuddy:byte-buddy:1.18.10") } buildTimeInstrumentation { @@ -112,7 +112,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() { } dependencies { - compileOnly("net.bytebuddy:byte-buddy:1.18.9") + compileOnly("net.bytebuddy:byte-buddy:1.18.10") } buildTimeInstrumentation { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8f52b2b9b7c..f7e2bbfbd1f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ scala33 = "3.3.0" # Bytecode manipulations & codegen autoservice = "1.1.1" asm = "9.9.1" -byte-buddy = "1.18.9" +byte-buddy = "1.18.10" instrument-java = "0.0.3" # Benchmarks From 9e48387f37fbeb5d48286975ea2c7df05ab9bece Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 4 Jun 2026 16:18:54 +0100 Subject: [PATCH 3/3] Avoid direct use of byte-buddy's ClassLoadingStrategy.Default.INJECTION as it will fail for Java 26+ --- .../trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy index 661d532966e..f76c9dff98e 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy @@ -162,7 +162,7 @@ class CallSiteInstrumentationTest extends BaseCallSiteTest { }) ) .make() - .load(Thread.currentThread().contextClassLoader, ClassLoadingStrategy.Default.INJECTION) + .load(Thread.currentThread().contextClassLoader, ClassLoadingStrategy.Default.WRAPPER) return Tuple.tuple(newType.loaded, newType.bytes) }