From 928b44153142038c90227386d75cc80788a29138 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 22 Apr 2025 13:55:57 -0400 Subject: [PATCH 1/4] Update bytebuddy to 1.15.11 --- buildSrc/build.gradle.kts | 2 +- buildSrc/call-site-instrumentation-plugin/build.gradle.kts | 2 +- .../src/test/groovy/CallSiteInstrumentationPluginTest.groovy | 2 +- buildSrc/src/test/groovy/InstrumentPluginTest.groovy | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e88a6807bcf..4fe4200c36e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation(gradleApi()) implementation(localGroovy()) - implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.14.18") + implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.15.11") implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0") implementation("org.eclipse.aether", "aether-transport-http", "1.1.0") diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index d955d11cd26..35e4b3f5a22 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.ow2.asm", "asm-tree", "9.7.1") implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4") - testImplementation("net.bytebuddy", "byte-buddy", "1.14.18") + testImplementation("net.bytebuddy", "byte-buddy", "1.15.11") testImplementation("org.spockframework", "spock-core", "2.0-groovy-3.0") testImplementation("org.objenesis", "objenesis", "3.0.1") testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17") diff --git a/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy b/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy index f2e25fe672f..56edb291f9d 100644 --- a/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy +++ b/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy @@ -27,7 +27,7 @@ class CallSiteInstrumentationPluginTest extends Specification { } dependencies { - implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.18' + implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11' implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.0-rc7' } ''' diff --git a/buildSrc/src/test/groovy/InstrumentPluginTest.groovy b/buildSrc/src/test/groovy/InstrumentPluginTest.groovy index 52a8e695bd1..eb79bf833b2 100644 --- a/buildSrc/src/test/groovy/InstrumentPluginTest.groovy +++ b/buildSrc/src/test/groovy/InstrumentPluginTest.groovy @@ -23,7 +23,7 @@ class InstrumentPluginTest extends Specification { } dependencies { - compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.18' // just to build TestPlugin + compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11' // just to build TestPlugin } apply plugin: 'instrument' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00c27b9955f..93023619a01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ spock = "2.3-groovy-3.0" groovy = "3.0.17" junit5 = "5.9.2" logback = "1.2.3" -bytebuddy = "1.14.18" +bytebuddy = "1.15.11" scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+) scala211 = "2.11.12" scala212 = "2.12.18" From 58c185f4eaa03aa1d407eade970aff23fcab0bfe Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 22 Apr 2025 14:04:40 -0400 Subject: [PATCH 2/4] Update ASM to 9.8 --- buildSrc/build.gradle.kts | 4 ++-- buildSrc/call-site-instrumentation-plugin/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4fe4200c36e..536853fc847 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -37,8 +37,8 @@ dependencies { implementation("org.apache.maven", "maven-aether-provider", "3.3.9") implementation("com.google.guava", "guava", "20.0") - implementation("org.ow2.asm", "asm", "9.7.1") - implementation("org.ow2.asm", "asm-tree", "9.7.1") + implementation("org.ow2.asm", "asm", "9.8") + implementation("org.ow2.asm", "asm-tree", "9.8") testImplementation("org.spockframework", "spock-core", "2.2-groovy-3.0") testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17") diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 35e4b3f5a22..1148173b096 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -32,8 +32,8 @@ dependencies { compileOnly("com.google.code.findbugs", "jsr305", "3.0.2") implementation("org.freemarker", "freemarker", "2.3.30") - implementation("org.ow2.asm", "asm", "9.7.1") - implementation("org.ow2.asm", "asm-tree", "9.7.1") + implementation("org.ow2.asm", "asm", "9.8") + implementation("org.ow2.asm", "asm-tree", "9.8") implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4") testImplementation("net.bytebuddy", "byte-buddy", "1.15.11") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93023619a01..46327e8dc65 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ testcontainers = '1.20.1' jmc = "8.1.0" autoservice = "1.0-rc7" ddprof = "1.24.0" -asm = "9.7.1" +asm = "9.8" cafe_crypto = "0.1.0" lz4 = "1.7.1" From f61ba6f883b61ba7519c5ce008ba9d803012f1c3 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 22 Apr 2025 14:36:52 -0400 Subject: [PATCH 3/4] Increase agent jar size --- dd-java-agent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index d03ea2e440e..92afe9cf2a1 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -291,7 +291,7 @@ tasks.register('checkAgentJarSize').configure { doLast { // Arbitrary limit to prevent unintentional increases to the agent jar size // Raise or lower as required - assert shadowJar.archiveFile.get().getAsFile().length() <= 31 * 1024 * 1024 + assert shadowJar.archiveFile.get().getAsFile().length() <= 35 * 1024 * 1024 } dependsOn "shadowJar" From d8517d054ddb91a07a57800caf1f8a5b342a5f88 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 22 Apr 2025 15:03:18 -0400 Subject: [PATCH 4/4] Remove extra classes instead of increasing agent jar size --- dd-java-agent/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index 92afe9cf2a1..afe6ff2f2cf 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -42,6 +42,7 @@ ext.generalShadowJarConfig = { exclude '**/module-info.class' exclude '**/liblz4-java.so' exclude '**/liblz4-java.dylib' + exclude '**/inst/META-INF/versions/**' // Replaced by 'instrumenter.index', no need to include original service file exclude '**/META-INF/services/datadog.trace.agent.tooling.InstrumenterModule' @@ -291,7 +292,7 @@ tasks.register('checkAgentJarSize').configure { doLast { // Arbitrary limit to prevent unintentional increases to the agent jar size // Raise or lower as required - assert shadowJar.archiveFile.get().getAsFile().length() <= 35 * 1024 * 1024 + assert shadowJar.archiveFile.get().getAsFile().length() <= 31 * 1024 * 1024 } dependsOn "shadowJar"