Update instrumentations A-C

sarahchen6 · sarahchen6 · commit c2b5b1078232 · 2025-09-30T14:32:27.000-04:00
diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle
@@ -18,7 +18,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 addTestSuite('akka23Test')
 addTestSuiteForDir('latestDepTest', 'test')
 
-tasks.named("compileAkka23TestGroovy") {
+tasks.named("compileAkka23TestGroovy", GroovyCompile) {
   classpath += files(sourceSets.akka23Test.scala.classesDirectory)
 }
 
@@ -68,6 +68,6 @@ configurations.matching({ it.name.startsWith('akka23') }).each({
 
 
 // Run 2.3 tests along with the rest of unit tests
-tasks.named("test") {
+tasks.named("test", Test) {
   dependsOn "akka23Test"
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
@@ -22,12 +22,12 @@ addTestSuiteForDir 'version101IastTest', 'iastTest'
 addTestSuiteForDir 'version102IastTest', 'iastTest'
 addTestSuiteForDir 'latestDepIastTest', 'iastTest'
 
-compileLagomTestJava {
+tasks.named("compileLagomTestJava", JavaCompile) {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-compileLagomTestGroovy {
+tasks.named("compileLagomTestGroovy", GroovyCompile) {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }
@@ -170,32 +170,32 @@ dependencies {
   lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0'
 }
 
-compileBaseTestGroovy {
+tasks.named("compileBaseTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
   dependsOn "compileBaseTestScala"
 }
 
-compileBaseForkedTestGroovy {
+tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
   dependsOn "compileBaseTestScala"
 }
 
-compileVersion101TestGroovy {
+tasks.named("compileVersion101TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
   dependsOn "compileVersion101TestScala"
 }
 
-compileVersion101ForkedTestGroovy {
+tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
   dependsOn "compileVersion101TestScala"
 }
 
-compileVersion102Scala213TestGroovy {
+tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))
   dependsOn "compileVersion102Scala213TestScala"
 }
 
-compileLatestDepTestGroovy {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
   dependsOn "compileLatestDepTestScala"
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
@@ -41,21 +41,31 @@ repositories {
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
-  it.configure {
-    setJavaVersion(it, 11)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
+tasks.named("compileMain_java11Java", JavaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.named("compileTestScala", ScalaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.named("compileLatestDepTestScala", ScalaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
   dependsOn compileTestScala
   classpath += files(compileTestScala.destinationDirectory)
 }
 
-compileLatestDepTestGroovy {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
   dependsOn compileLatestDepTestScala
   classpath += files(compileLatestDepTestScala.destinationDirectory)
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle
@@ -42,7 +42,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
 apply from: "$rootDir/gradle/configure_tests.gradle"
 
-latestDepTest {
+tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
 
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
@@ -25,10 +25,18 @@ addTestSuiteForDir("jetty11Test", "test/jetty11")
 addTestSuiteExtendingForDir("jetty9LatestDepTest", "latestDepTest", "test/jetty9")
 addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty11")
 
-[compileJetty11TestGroovy, jetty11Test, compileJetty11LatestDepTestGroovy, jetty11LatestDepTest].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(11)
-  }
+tasks.named("compileJetty11TestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+tasks.named("compileJetty11LatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+
+tasks.named("jetty11Test", Test) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+tasks.named("jetty11LatestDepTest", Test) {
+  javaLauncher = getJavaLauncherFor(11)
 }
 
 dependencies {
@@ -86,6 +94,4 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
-
-
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle
@@ -10,15 +10,15 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-test {
+tasks.named("test", Test) {
   environment "_HANDLER", "Handler"
 }
 
-forkedTest {
+tasks.named("forkedTest", Test) {
   environment "_HANDLER", "Handler"
 }
 
-latestDepTest {
+tasks.named("latestDepTest", Test) {
   environment "_HANDLER", "Handler"
 }
 
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle
@@ -103,10 +103,10 @@ dependencies {
   latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'
 }
 
-tasks.named("test") {
+tasks.named("test", Test) {
   dependsOn "test_before_1_11_106"
 }
 
-tasks.named("forkedTest") {
+tasks.named("forkedTest", Test) {
   dependsOn "test_before_1_11_106ForkedTest"
 }
diff --git a/dd-java-agent/instrumentation/axis2-1.3/build.gradle b/dd-java-agent/instrumentation/axis2-1.3/build.gradle
@@ -23,16 +23,20 @@ configurations.configureEach {
   }
 }
 
-[compileLatestDepForkedTestGroovy, compileLatestDepTestGroovy].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(11)
-  }
+tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
 }
 
-[compileLatestDepForkedTestJava, compileLatestDepTestJava].each {
-  it.configure {
-    setJavaVersion(it, 11)
-  }
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+
+tasks.named("compileLatestDepForkedTestJava", JavaCompile) {
+  setJavaVersion(it, 11)
+}
+
+tasks.named("compileLatestDepTestJava", JavaCompile) {
+  setJavaVersion(it, 11)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle
@@ -23,32 +23,32 @@ apply from: "${rootDir}/gradle/java.gradle"
 addTestSuite('latestDepTest')
 addTestSuiteForDir('cxf3LatestDepTest', 'test')
 
-[compileCxf3LatestDepTestJava].each {
-  it.configure {
-    setJavaVersion(it, 11)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
+tasks.named("compileCxf3LatestDepTestJava", JavaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-[compileLatestDepTestJava].each {
-  it.configure {
-    setJavaVersion(it, 17)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
+tasks.named("compileLatestDepTestJava", JavaCompile) {
+  setJavaVersion(it, 17)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-[compileLatestDepTestGroovy, latestDepTest].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(17)
-  }
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(17)
 }
 
-[compileCxf3LatestDepTestGroovy, cxf3LatestDepTest].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(11)
-  }
+tasks.named("latestDepTest", Test) {
+  javaLauncher = getJavaLauncherFor(17)
+}
+
+tasks.named("compileCxf3LatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+
+tasks.named("cxf3LatestDepTest", Test) {
+  javaLauncher = getJavaLauncherFor(11)
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"`
`18`	`18`	`addTestSuite('akka23Test')`
`19`	`19`	`addTestSuiteForDir('latestDepTest', 'test')`
`20`	`20`
`21`		`-tasks.named("compileAkka23TestGroovy") {`
	`21`	`+tasks.named("compileAkka23TestGroovy", GroovyCompile) {`
`22`	`22`	`classpath += files(sourceSets.akka23Test.scala.classesDirectory)`
`23`	`23`	`}`
`24`	`24`
`@@ -68,6 +68,6 @@ configurations.matching({ it.name.startsWith('akka23') }).each({`
`68`	`68`
`69`	`69`
`70`	`70`	`// Run 2.3 tests along with the rest of unit tests`
`71`		`-tasks.named("test") {`
	`71`	`+tasks.named("test", Test) {`
`72`	`72`	`dependsOn "akka23Test"`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ addTestSuiteForDir 'version101IastTest', 'iastTest'`
`22`	`22`	`addTestSuiteForDir 'version102IastTest', 'iastTest'`
`23`	`23`	`addTestSuiteForDir 'latestDepIastTest', 'iastTest'`
`24`	`24`
`25`		`-compileLagomTestJava {`
	`25`	`+tasks.named("compileLagomTestJava", JavaCompile) {`
`26`	`26`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`27`	`27`	`targetCompatibility = JavaVersion.VERSION_1_8`
`28`	`28`	`}`
`29`	`29`
`30`		`-compileLagomTestGroovy {`
	`30`	`+tasks.named("compileLagomTestGroovy", GroovyCompile) {`
`31`	`31`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`32`	`32`	`targetCompatibility = JavaVersion.VERSION_1_8`
`33`	`33`	`}`
`@@ -170,32 +170,32 @@ dependencies {`
`170`	`170`	`lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0'`
`171`	`171`	`}`
`172`	`172`
`173`		`-compileBaseTestGroovy {`
	`173`	`+tasks.named("compileBaseTestGroovy", GroovyCompile) {`
`174`	`174`	`classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))`
`175`	`175`	`dependsOn "compileBaseTestScala"`
`176`	`176`	`}`
`177`	`177`
`178`		`-compileBaseForkedTestGroovy {`
	`178`	`+tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {`
`179`	`179`	`classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))`
`180`	`180`	`dependsOn "compileBaseTestScala"`
`181`	`181`	`}`
`182`	`182`
`183`		`-compileVersion101TestGroovy {`
	`183`	`+tasks.named("compileVersion101TestGroovy", GroovyCompile) {`
`184`	`184`	`classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))`
`185`	`185`	`dependsOn "compileVersion101TestScala"`
`186`	`186`	`}`
`187`	`187`
`188`		`-compileVersion101ForkedTestGroovy {`
	`188`	`+tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {`
`189`	`189`	`classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))`
`190`	`190`	`dependsOn "compileVersion101TestScala"`
`191`	`191`	`}`
`192`	`192`
`193`		`-compileVersion102Scala213TestGroovy {`
	`193`	`+tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {`
`194`	`194`	`classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))`
`195`	`195`	`dependsOn "compileVersion102Scala213TestScala"`
`196`	`196`	`}`
`197`	`197`
`198`		`-compileLatestDepTestGroovy {`
	`198`	`+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`199`	`199`	`classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`200`	`200`	`dependsOn "compileLatestDepTestScala"`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')`
`42`	`42`
`43`	`43`	`apply from: "$rootDir/gradle/configure_tests.gradle"`
`44`	`44`
`45`		`-latestDepTest {`
	`45`	`+tasks.named("latestDepTest", Test) {`
`46`	`46`	`finalizedBy 'latestDepForkedTest'`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,15 @@ apply from: "$rootDir/gradle/java.gradle"`
`10`	`10`
`11`	`11`	`addTestSuiteForDir('latestDepTest', 'test')`
`12`	`12`
`13`		`-test {`
	`13`	`+tasks.named("test", Test) {`
`14`	`14`	`environment "_HANDLER", "Handler"`
`15`	`15`	`}`
`16`	`16`
`17`		`-forkedTest {`
	`17`	`+tasks.named("forkedTest", Test) {`
`18`	`18`	`environment "_HANDLER", "Handler"`
`19`	`19`	`}`
`20`	`20`
`21`		`-latestDepTest {`
	`21`	`+tasks.named("latestDepTest", Test) {`
`22`	`22`	`environment "_HANDLER", "Handler"`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,10 @@ dependencies {`
`103`	`103`	`latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'`
`104`	`104`	`}`
`105`	`105`
`106`		`-tasks.named("test") {`
	`106`	`+tasks.named("test", Test) {`
`107`	`107`	`dependsOn "test_before_1_11_106"`
`108`	`108`	`}`
`109`	`109`
`110`		`-tasks.named("forkedTest") {`
	`110`	`+tasks.named("forkedTest", Test) {`
`111`	`111`	`dependsOn "test_before_1_11_106ForkedTest"`
`112`	`112`	`}`