Update bytebuddy and ASM to support JDK 24

buildSrc/build.gradle.kts

@@ -30,15 +30,15 @@ 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")
   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")

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -32,11 +32,11 @@ 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.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")

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'
     }
   '''

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'

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'

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"
@@ -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"