Update instrumentations D-J

sarahchen6 · sarahchen6 · commit 005135f7a309 · 2025-09-30T15:44:49.000-04:00
diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle
@@ -31,7 +31,7 @@ dependencies {
   latestDepTestImplementation group: 'io.netty', name: 'netty-transport', version: '+'
 }
 
-tasks.named("latestDepTest") {
+tasks.named("latestDepTest", Test) {
   dependsOn "latestDep4Test"
 }
 
diff --git a/dd-java-agent/instrumentation/exception-profiling/build.gradle b/dd-java-agent/instrumentation/exception-profiling/build.gradle
@@ -19,18 +19,25 @@ dependencies {
 }
 
 // Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)
-[compileMain_java11Java, compileTestJava].each {
+tasks.named("compileMain_java11Java", JavaCompile) {
   setJavaVersion(it, 11)
-  it.sourceCompatibility = JavaVersion.VERSION_1_8
-  it.targetCompatibility = JavaVersion.VERSION_1_8
-  it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+  options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
 }
 
-forbiddenApisMain_java11 {
+tasks.named("compileTestJava", JavaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+  options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+}
+
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
-test {
+tasks.named("test", Test) {
   useJUnitPlatform()
 }
 
diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle
@@ -35,16 +35,16 @@ dependencies {
   latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
 }
 
-tasks.named("compileLatestDepTestGroovy") {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
   dependsOn "compileLatestDepTestScala"
 }
 
-tasks.named("compileLatestPre207TestGroovy") {
+tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))
   dependsOn "compileLatestPre207TestScala"
 }
 
-tasks.named("latestDepTest") {
+tasks.named("latestDepTest", Test) {
   finalizedBy latestPre207Test
 }
diff --git a/dd-java-agent/instrumentation/graal/native-image/build.gradle b/dd-java-agent/instrumentation/graal/native-image/build.gradle
@@ -13,17 +13,19 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
-[compileMain_java11Java, compileTestJava].each {
-  it.sourceCompatibility = JavaVersion.VERSION_11
-  it.targetCompatibility = JavaVersion.VERSION_11
-  setJavaVersion(it, 11)
-  it.options.compilerArgs.addAll([
-    '-Xlint:all,-processing,-options,-path',
-    '--add-modules',
-    'jdk.internal.vm.ci',
-    '--add-exports',
-    'jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED'
-  ])
+["compileMain_java11Java", "compileTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    setJavaVersion(it, 11)
+    options.compilerArgs.addAll([
+      '-Xlint:all,-processing,-options,-path',
+      '--add-modules',
+      'jdk.internal.vm.ci',
+      '--add-exports',
+      'jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED'
+    ])
+  }
 }
 
 dependencies {
@@ -32,7 +34,7 @@ dependencies {
   main_java11CompileOnly group: 'org.graalvm.nativeimage', name: 'svm', version: '20.0.0'
 }
 
-forbiddenApisMain_java11 {
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/instrumentation/gradle-testing/build.gradle b/dd-java-agent/instrumentation/gradle-testing/build.gradle
@@ -12,6 +12,6 @@ dependencies {
   compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10")
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle
@@ -10,6 +10,6 @@ dependencies {
   compileOnly gradleApi()
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle
@@ -10,6 +10,6 @@ dependencies {
   compileOnly gradleApi()
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle
@@ -53,16 +53,23 @@ dependencies {
   latestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '22.+'
 
   [
-    compileLatestDepTestJava,
-    compileLatestDepTestGroovy,
-    compileLatestDepForkedTestJava,
-    compileLatestDepForkedTestGroovy,
-    compileGraphql21LatestDepTestJava,
-    compileGraphql21LatestDepTestGroovy,
-    compileGraphql21LatestDepForkedTestJava,
-    compileGraphql21LatestDepForkedTestGroovy
-  ].each {
-    it.configure {
+    "compileLatestDepTestJava",
+    "compileLatestDepForkedTestJava",
+    "compileGraphql21LatestDepTestJava",
+    "compileGraphql21LatestDepForkedTestJava"
+  ].each { name ->
+    tasks.named(name, JavaCompile) {
+      setJavaVersion(it, 11)
+    }
+  }
+
+  [
+    "compileLatestDepTestGroovy",
+    "compileLatestDepForkedTestGroovy",
+    "compileGraphql21LatestDepTestGroovy",
+    "compileGraphql21LatestDepForkedTestGroovy"
+  ].each { name ->
+    tasks.named(name, GroovyCompile) {
       setJavaVersion(it, 11)
     }
   }
diff --git a/dd-java-agent/instrumentation/iast-instrumenter/build.gradle b/dd-java-agent/instrumentation/iast-instrumenter/build.gradle
@@ -9,8 +9,13 @@ apply from: "${rootDir}/gradle/tries.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-compileJava.dependsOn 'generateClassNameTries'
-sourcesJar.dependsOn 'generateClassNameTries'
+tasks.named("compileJava", JavaCompile) {
+  dependsOn("generateClassNameTries")
+}
+
+tasks.named("sourcesJar", Jar) {
+  dependsOn("generateClassNameTries")
+}
 
 dependencies {
   testImplementation project(':dd-java-agent:agent-tooling')
diff --git a/dd-java-agent/instrumentation/jakarta-jms/build.gradle b/dd-java-agent/instrumentation/jakarta-jms/build.gradle
@@ -24,7 +24,7 @@ repositories {
   }
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   it.javaLauncher = getJavaLauncherFor(17)
 }
 
diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle
@@ -12,13 +12,15 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepJava11Test', 'latestDepTest', 'test')
 
-tasks.named("compileLatestDepJava11TestJava") {
+tasks.named("compileLatestDepJava11TestJava", JavaCompile) {
   setJavaVersion(it, 11)
 }
-tasks.named("compileLatestDepJava11TestGroovy") {
+
+tasks.named("compileLatestDepJava11TestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
 }
-tasks.named("latestDepJava11Test") {
+
+tasks.named("latestDepJava11Test", Test) {
   javaLauncher = getJavaLauncherFor(11)
 }
 
diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle
@@ -10,7 +10,7 @@ ext {
 }
 apply from: "${rootDir}/gradle/java.gradle"
 
-compileJava {
+tasks.named("compileJava", JavaCompile) {
   javaCompiler = javaToolchains.compilerFor {
     languageVersion = JavaLanguageVersion.of(8)
   }
diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle
@@ -27,18 +27,18 @@ idea {
  */
 addTestSuite('previewTest')
 // Configure groovy test file compilation
-compilePreviewTestGroovy.configure {
+tasks.named("compilePreviewTestGroovy", GroovyCompile) {
   javaLauncher = javaToolchains.launcherFor {
     languageVersion = JavaLanguageVersion.of(21)
   }
   options.compilerArgs.add("--enable-preview")
 }
 // Configure Java test files compilation
-compilePreviewTestJava.configure {
+tasks.named("compilePreviewTestJava", JavaCompile) {
   options.compilerArgs.add("--enable-preview")
 }
 // Configure tests execution
-previewTest.configure {
+tasks.named("previewTest", Test) {
   jvmArgs = ['--enable-preview']
 }
 // Require the preview test suite to run as part of module check
diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/build.gradle b/dd-java-agent/instrumentation/java-directbytebuffer/build.gradle
@@ -12,14 +12,16 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
 // Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)
-[compileMain_java11Java, compileTestJava].each {
-  it.sourceCompatibility = JavaVersion.VERSION_11
-  it.targetCompatibility = JavaVersion.VERSION_11
-  setJavaVersion(it, 11)
-  it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+["compileMain_java11Java", "compileTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    setJavaVersion(it, 11)
+    options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+  }
 }
 
-forbiddenApisMain_java11 {
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/instrumentation/java-http-client/build.gradle b/dd-java-agent/instrumentation/java-http-client/build.gradle
@@ -12,17 +12,17 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
 
-tasks.named("compileMain_java11Java") {
+tasks.named("compileMain_java11Java", JavaCompile) {
   it.sourceCompatibility = JavaVersion.VERSION_11
   it.targetCompatibility = JavaVersion.VERSION_11
   setJavaVersion(it, 11)
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
 }
 
-forbiddenApisMain_java11 {
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle
@@ -54,7 +54,7 @@ dependencies {
   latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+'
 }
 
-tasks.named("test") {
+tasks.named("test", Test) {
   dependsOn "resteasy31Test"
   dependsOn "nestedTest"
 }
diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle
@@ -82,7 +82,7 @@ tasks.named("check") {
   dependsOn "oldPostgresTest"
 }
 
-tasks.named("latestDepJava11Test") {
+tasks.named("latestDepJava11Test", Test) {
   javaLauncher = getJavaLauncherFor(11)
 }
 
diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle
@@ -19,19 +19,19 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('jersey2JettyTest', 'jersey2JettyTest')
 addTestSuiteForDir('jersey3JettyTest', 'jersey3JettyTest')
 
-compileJersey3JettyTestGroovy {
+tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
 }
-compileTestJava.configure {
+tasks.named("compileTestJava", JavaCompile) {
   setJavaVersion(it, 11)
   sourceCompatibility = JavaVersion.VERSION_11
   targetCompatibility = JavaVersion.VERSION_11
 }
 
-jersey3JettyTest {
+tasks.named("jersey3JettyTest", Test) {
   javaLauncher = getJavaLauncherFor(11)
 }
-test {
+tasks.named("test", Test) {
   javaLauncher = getJavaLauncherFor(11)
 }
 
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle
@@ -26,11 +26,13 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('jetty11Test', 'test')
 addTestSuiteForDir('jetty10LatestDepTest', 'test')
-compileMain_java11Java.configure {
+
+tasks.named("compileMain_java11Java", JavaCompile) {
   it.sourceCompatibility = JavaVersion.VERSION_1_8
   it.targetCompatibility = JavaVersion.VERSION_1_8
   setJavaVersion(it, 11)
 }
+
 dependencies {
   main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
   main_java11Implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) {
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle
@@ -15,7 +15,7 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-compileMain_java17Java.configure {
+tasks.named("compileMain_java17Java", JavaCompile) {
   setJavaVersion(it, 17)
 }
 
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
@@ -33,21 +33,24 @@ addTestSuiteExtendingForDir('ee10ForkedTest', 'ee10Test', 'test/ee10')
 addTestSuiteExtendingForDir('ee10LatestDepTest', 'latestDepTest', 'test/ee10')
 addTestSuiteExtendingForDir('ee10LatestDepForkedTest', 'ee10LatestDepTest', 'test/ee10')
 
-[compileMain_java17Java, compileTestJava].each {
-  it.configure {
+["compileMain_java17Java", "compileTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
     setJavaVersion(it, 17)
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 }
-[ee8LatestDepTest, ee9LatestDepTest, ee10LatestDepTest].each {
-  it.configure {
+
+["ee8LatestDepTest", "ee9LatestDepTest", "ee10LatestDepTest"].each { name ->
+  tasks.named(name, Test) {
     it.jvmArgs += ['-Dtest.dd.latestDepTest=true']
   }
 }
-forbiddenApisMain_java17 {
+
+tasks.named("forbiddenApisMain_java17") {
   failOnMissingClasses = false
 }
+
 tasks.withType(GroovyCompile).configureEach {
   javaLauncher = getJavaLauncherFor(17)
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle
diff --git a/dd-java-agent/instrumentation/jms/build.gradle b/dd-java-agent/instrumentation/jms/build.gradle
diff --git a/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle
diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle
diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dependencies {`
`31`	`31`	`latestDepTestImplementation group: 'io.netty', name: 'netty-transport', version: '+'`
`32`	`32`	`}`
`33`	`33`
`34`		`-tasks.named("latestDepTest") {`
	`34`	`+tasks.named("latestDepTest", Test) {`
`35`	`35`	`dependsOn "latestDep4Test"`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,16 @@ dependencies {`
`35`	`35`	`latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'`
`36`	`36`	`}`
`37`	`37`
`38`		`-tasks.named("compileLatestDepTestGroovy") {`
	`38`	`+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`39`	`39`	`classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`40`	`40`	`dependsOn "compileLatestDepTestScala"`
`41`	`41`	`}`
`42`	`42`
`43`		`-tasks.named("compileLatestPre207TestGroovy") {`
	`43`	`+tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {`
`44`	`44`	`classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))`
`45`	`45`	`dependsOn "compileLatestPre207TestScala"`
`46`	`46`	`}`
`47`	`47`
`48`		`-tasks.named("latestDepTest") {`
	`48`	`+tasks.named("latestDepTest", Test) {`
`49`	`49`	`finalizedBy latestPre207Test`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ dependencies {`
`12`	`12`	`compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10")`
`13`	`13`	`}`
`14`	`14`
`15`		`-forbiddenApisMain {`
	`15`	`+tasks.named("forbiddenApisMain") {`
`16`	`16`	`failOnMissingClasses = false`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ dependencies {`
`10`	`10`	`compileOnly gradleApi()`
`11`	`11`	`}`
`12`	`12`
`13`		`-forbiddenApisMain {`
	`13`	`+tasks.named("forbiddenApisMain") {`
`14`	`14`	`failOnMissingClasses = false`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ repositories {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-compileTestGroovy {`
	`27`	`+tasks.named("compileTestGroovy", GroovyCompile) {`
`28`	`28`	`it.javaLauncher = getJavaLauncherFor(17)`
`29`	`29`	`}`
`30`	`30`