From c2b5b107823215f621017e1fccb79e8ae8a54cf2 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 30 Sep 2025 14:32:27 -0400 Subject: [PATCH 1/4] Update instrumentations A-C --- .../akka/akka-actor-2.5/build.gradle | 4 +- .../akka-http/akka-http-10.0/build.gradle | 16 ++++---- .../akka-http/akka-http-10.6/build.gradle | 26 ++++++++---- .../armeria/armeria-grpc-0.84/build.gradle | 2 +- .../armeria/armeria-jetty-1.24/build.gradle | 18 ++++++--- .../aws-java-lambda-handler-1.2/build.gradle | 6 +-- .../aws-java/aws-java-sdk-1.11/build.gradle | 4 +- .../instrumentation/axis2-1.3/build.gradle | 20 ++++++---- .../instrumentation/cxf-2.1/build.gradle | 40 +++++++++---------- 9 files changed, 78 insertions(+), 58 deletions(-) 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 index 10bbc03bc92..ed5a80e1773 100644 --- 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 index 351cdc58bb1..ec88e612eee 100644 --- 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 index a7fbe20ce02..53dd3e4745e 100644 --- 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 index 89ea277847e..e8758aa2c2e 100644 --- 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 index a45616567a1..4e1e243d90a 100644 --- 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 index 291eb78aca0..4790e3b512f 100644 --- 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 index eb2b4ba11c7..40d5d4c778f 100644 --- 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 index eeb498f73f8..02d94cd39f2 100644 --- 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 index 1ff25265864..9487abb50c0 100644 --- 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 { From 005135f7a3093c24d50877e54853e5f722a0f71c Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 30 Sep 2025 15:44:49 -0400 Subject: [PATCH 2/4] Update instrumentations D-J --- .../enable-wallclock-profiling/build.gradle | 2 +- .../exception-profiling/build.gradle | 19 ++++++++----- .../instrumentation/finatra-2.9/build.gradle | 6 ++--- .../graal/native-image/build.gradle | 26 +++++++++--------- .../gradle-testing/build.gradle | 2 +- .../gradle/gradle-3.0/build.gradle | 2 +- .../gradle/gradle-8.3/build.gradle | 2 +- .../graphql-java-20.0/build.gradle | 27 ++++++++++++------- .../iast-instrumenter/build.gradle | 9 +++++-- .../instrumentation/jakarta-jms/build.gradle | 2 +- .../jakarta-rs-annotations-3/build.gradle | 8 +++--- .../java-completablefuture/build.gradle | 2 +- .../java-concurrent-21/build.gradle | 6 ++--- .../java-directbytebuffer/build.gradle | 14 +++++----- .../java-http-client/build.gradle | 6 ++--- .../jax-rs-annotations-2/build.gradle | 2 +- .../instrumentation/jdbc/build.gradle | 2 +- .../instrumentation/jersey/build.gradle | 8 +++--- .../jetty-client-10.0/build.gradle | 4 ++- .../jetty-client-12.0/build.gradle | 2 +- .../jetty-server-12.0/build.gradle | 13 +++++---- .../jetty-server-9.0/build.gradle | 8 +++--- .../instrumentation/jms/build.gradle | 2 +- .../junit-4.10/munit-junit-4/build.gradle | 5 ++-- .../junit/junit-5.3/build.gradle | 2 +- .../junit/junit-5.3/junit-5.8/build.gradle | 2 +- 26 files changed, 107 insertions(+), 76 deletions(-) diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle index c053f0b80b5..ea7dd0cbe3d 100644 --- 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 index 070f65df6bc..26ffcded4e8 100644 --- 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 index 971fcf8e604..45a3ce2243c 100644 --- 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 index b34f14ea3ba..40dd85bcf19 100644 --- 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 index 174880b8a18..100bd08fb97 100644 --- 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 index 277663acc4b..53208256d37 100644 --- 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 index 277663acc4b..53208256d37 100644 --- 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 index 031d6d07071..7444153dc28 100644 --- 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 index 5c87f017d35..9fe2827d46b 100644 --- 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 index ff497d21c84..301cc89c030 100644 --- 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 index 692894c79d0..434c6d33dc8 100644 --- 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 index 3095b5712cf..97fd1d4e5cc 100644 --- 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 index ab1366820e2..d4b1140498c 100644 --- 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 index 453c95e476c..83e04c801ae 100644 --- 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 index 881c76e68c8..739e196b932 100644 --- 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 index 012d4e239bd..7101a81c607 100644 --- 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 index c39dee6fc03..786941db850 100644 --- 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 index d91c2bff82a..9e07b0a0efc 100644 --- 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 index 99bcf8dd8d0..54437b89bd8 100644 --- 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 index d22928973ac..47331bf19ee 100644 --- 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 index d2b57296201..facfc840c47 100644 --- 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 index 58505b89386..64bdac3dfef 100644 --- 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 @@ -78,7 +78,7 @@ sourceSets { } } -jar { +tasks.named("jar", Jar) { from sourceSets.main_jetty904.output from sourceSets.main_jetty93.output from sourceSets.main_jetty9421.output @@ -105,7 +105,7 @@ instrument { ] } -tasks.named("compileMain_jetty10Java") { +tasks.named("compileMain_jetty10Java", JavaCompile) { setJavaVersion(it, 11) } @@ -114,10 +114,10 @@ addTestSuiteForDir('jetty94ForkedTest', 'test') addTestSuiteForDir('latestDepJetty9ForkedTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') -tasks.named("latestDepForkedTest") { +tasks.named("latestDepForkedTest", Test) { javaLauncher = getJavaLauncherFor(11) } -tasks.named("compileLatestDepForkedTestGroovy") { +tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) { setJavaVersion(it, 11) } diff --git a/dd-java-agent/instrumentation/jms/build.gradle b/dd-java-agent/instrumentation/jms/build.gradle index 949e51a4f0a..d8f1f40fbdb 100644 --- a/dd-java-agent/instrumentation/jms/build.gradle +++ b/dd-java-agent/instrumentation/jms/build.gradle @@ -28,7 +28,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/junit/junit-4.10/munit-junit-4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle index f5175b710e6..845b8b1b8c6 100644 --- 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 @@ -31,11 +31,12 @@ dependencies { latestDepTestImplementation group: 'org.scalameta', name: 'munit_2.13', version: '+' } -compileTestGroovy { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -compileLatestDepTestGroovy { + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle index d4315f94839..7bcad011e0d 100644 --- a/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle @@ -58,7 +58,7 @@ configurations.matching({ it.name.startsWith('test') }).each({ } }) -tasks.named("compileLatestDepTestJava") { +tasks.named("compileLatestDepTestJava", JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 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 index 399cfd48c4a..504dd83d6ad 100644 --- 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 @@ -57,7 +57,7 @@ configurations.matching({ it.name.startsWith('test') }).each({ } }) -tasks.named("compileLatestDepTestJava") { +tasks.named("compileLatestDepTestJava", JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 From 543697990740d1723ab62bb4a325d5e15850e8ce Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 30 Sep 2025 17:28:54 -0400 Subject: [PATCH 3/4] Update instrumentations K-Z --- dd-java-agent/instrumentation/build.gradle | 4 +- .../kafka/kafka-clients-0.11/build.gradle | 2 +- .../kafka/kafka-clients-3.8/build.gradle | 6 ++- .../instrumentation/karate/build.gradle | 2 +- .../kotlin-coroutines/build.gradle | 6 +-- .../instrumentation/liberty-20/build.gradle | 23 ++++++---- .../instrumentation/liberty-23/build.gradle | 25 +++++------ .../http-server-netty-4.0/build.gradle | 8 ++-- .../instrumentation/mule-4.5/build.gradle | 14 +++---- .../netty/netty-buffer-4.0/build.gradle | 2 +- .../netty/netty-concurrent-4.0/build.gradle | 2 +- .../netty/netty-promise-4.0/build.gradle | 2 +- .../pekko/pekko-concurrent-1.0/build.gradle | 3 +- .../pekko/pekko-http-1.0/build.gradle | 14 +++---- .../play/play-2.3/build.gradle | 2 +- .../play/play-2.4/build.gradle | 35 +++++++++++----- .../play/play-2.6/build.gradle | 31 ++++++++++---- .../instrumentation/quartz-2.0/build.gradle | 15 +++---- .../rabbitmq-amqp-2.7/build.gradle | 2 +- .../resilience4j-2.0/build.gradle | 3 +- .../resilience4j-reactor-2.0/build.gradle | 3 +- .../resteasy-appsec/build.gradle | 5 ++- .../instrumentation/restlet-2.2/build.gradle | 2 +- .../instrumentation/rmi/build.gradle | 2 +- .../scala-concurrent/build.gradle | 10 ++--- .../scala-promise/build.gradle | 2 +- .../scala-promise-2.10/build.gradle | 8 ++-- .../scala-promise-2.13/build.gradle | 8 ++-- .../instrumentation/scalatest/build.gradle | 4 +- .../instrumentation/selenium/build.gradle | 2 +- .../servlet/request-5/build.gradle | 2 +- .../instrumentation/slick/build.gradle | 4 +- .../spark/spark_2.12/build.gradle | 2 +- .../spark/spark_2.13/build.gradle | 2 +- .../spring/spring-boot-1.3/build.gradle | 6 ++- .../spring/spring-jms-3.1/build.gradle | 2 +- .../spring/spring-messaging-4.0/build.gradle | 6 ++- .../spring/spring-scheduling-3.1/build.gradle | 31 +++++++------- .../spring-webflux-5.0/build.gradle | 2 +- .../spring-webflux-6.0/build.gradle | 2 +- .../spring-webmvc-6.0/build.gradle | 4 +- .../spymemcached-2.10/build.gradle | 4 +- .../tomcat/tomcat-5.5/build.gradle | 12 ++++-- .../vertx-mysql-client-3.9/build.gradle | 2 +- .../vertx-mysql-client-4.0/build.gradle | 2 +- .../vertx-mysql-client-4.4.2/build.gradle | 2 +- .../vertx-pg-client-4.0/build.gradle | 2 +- .../vertx-pg-client-4.4.2/build.gradle | 2 +- .../vertx/vertx-rx-3.5/build.gradle | 2 +- .../vertx-web/vertx-web-3.4/build.gradle | 2 +- .../vertx-web/vertx-web-3.5/build.gradle | 2 +- .../vertx-web/vertx-web-4.0/build.gradle | 12 ++++-- .../instrumentation/weaver/build.gradle | 6 +-- .../jetty-websocket-10/build.gradle | 9 ++-- .../jetty-websocket-11/build.gradle | 6 ++- .../jetty-websocket-12/build.gradle | 6 ++- .../instrumentation/wildfly-9.0/build.gradle | 42 +++++++++---------- 57 files changed, 241 insertions(+), 182 deletions(-) diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 84cc7db1424..f6b0c16b830 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -31,7 +31,7 @@ plugins { apply from: "$rootDir/gradle/java.gradle" -tasks.register("latestDepTest") +tasks.register("latestDepTest", Test) Project parent_project = project subprojects { Project subProj -> @@ -130,7 +130,7 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep } -tasks.named('shadowJar') { +tasks.named('shadowJar', ShadowJar) { duplicatesStrategy = DuplicatesStrategy.FAIL dependencies { // the tracer is now in a separate shadow jar diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index d8bd22faa4c..d8b127053fa 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -66,7 +66,7 @@ dependencies { iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures') } -iastLatestDepTest3.configure { +tasks.named("iastLatestDepTest3", Test) { javaLauncher = getJavaLauncherFor(17) jvmArgs = ['--add-opens', 'java.base/java.util=ALL-UNNAMED'] } diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle index dc1a75ddf7a..c38f72a9e96 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle @@ -16,13 +16,14 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') -[compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each { - it.configure { +["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each { name -> + tasks.named(name, JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } } + tasks.withType(JavaCompile).each { it.configure { setJavaVersion(it, 17) @@ -30,6 +31,7 @@ tasks.withType(JavaCompile).each { targetCompatibility = JavaVersion.VERSION_1_8 } } + tasks.withType(GroovyCompile) { javaLauncher = getJavaLauncherFor(17) } diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle index 085aa516f7e..0208b8ac463 100644 --- a/dd-java-agent/instrumentation/karate/build.gradle +++ b/dd-java-agent/instrumentation/karate/build.gradle @@ -81,7 +81,7 @@ sourceSets { } } -tasks.named("compileLatestDepTestJava") { +tasks.named("compileLatestDepTestJava", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle index f68ac87ad53..678b0fd9caa 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle @@ -26,15 +26,15 @@ apply from: "$rootDir/gradle/test-with-kotlin.gradle" addTestSuite('latestDepTest') -tasks.named("compileTestFixturesGroovy") { +tasks.named("compileTestFixturesGroovy", GroovyCompile) { classpath += files(compileTestFixturesKotlin.destinationDirectory) } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(compileTestKotlin.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(compileLatestDepTestKotlin.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/liberty-20/build.gradle b/dd-java-agent/instrumentation/liberty-20/build.gradle index 3bd1b8259f4..47f66dfe8a6 100644 --- a/dd-java-agent/instrumentation/liberty-20/build.gradle +++ b/dd-java-agent/instrumentation/liberty-20/build.gradle @@ -48,7 +48,10 @@ dependencies { // because using testFixtures() causes some early evaluation of dependencies webappRuntimeOnly libs.groovy } -compileWebappJava.dependsOn ':dd-java-agent:instrumentation:servlet:request-3:testFixturesJar' + +tasks.named("compileWebappJava", JavaCompile) { + dependsOn(":dd-java-agent:instrumentation:servlet:request-3:testFixturesJar") +} configurations.testRuntimeOnly { exclude group: 'ch.qos.logback', module: 'logback-classic' @@ -86,19 +89,12 @@ tasks.register('installOpenLibertyDeps', Copy) { into extractDir outputs.file ext.serverXmlFile } -[test, forkedTest]*.dependsOn webappClasses, installOpenLibertyDeps -[test, forkedTest].each { - it.configure { - jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] - } -} tasks.register('webappCopyJars', Sync) { from configurations.webappRuntimeClasspath.findAll { it.name.endsWith('.jar') } into project.layout.buildDirectory.dir("$relAppDir/WEB-INF/lib") dependsOn ':dd-java-agent:instrumentation:servlet:request-3:testFixturesJar' } -[test, forkedTest]*.dependsOn webappCopyJars tasks.register('filterLogbackClassic', Sync) { ext.filteredLogbackDir = project.layout.buildDirectory.dir('filteredLogback') @@ -108,4 +104,13 @@ tasks.register('filterLogbackClassic', Sync) { exclude 'META-INF/**' into ext.filteredLogbackDir } -[test, forkedTest]*.dependsOn filterLogbackClassic + +tasks.named("test", Test) { + dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic) + jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] +} + +tasks.named("forkedTest", Test) { + dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic) + jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] +} diff --git a/dd-java-agent/instrumentation/liberty-23/build.gradle b/dd-java-agent/instrumentation/liberty-23/build.gradle index d240953bf8f..10c9218098a 100644 --- a/dd-java-agent/instrumentation/liberty-23/build.gradle +++ b/dd-java-agent/instrumentation/liberty-23/build.gradle @@ -54,7 +54,10 @@ dependencies { // because using testFixtures() causes some early evaluation of dependencies webappRuntimeOnly libs.groovy } -compileWebappJava.dependsOn ':dd-java-agent:instrumentation:servlet:request-5:testFixturesJar' + +tasks.named("compileWebappJava", JavaCompile) { + dependsOn(":dd-java-agent:instrumentation:servlet:request-5:testFixturesJar") +} configurations.testRuntimeOnly { exclude group: 'ch.qos.logback', module: 'logback-classic' @@ -98,19 +101,12 @@ tasks.register('installOpenLibertyDeps', Copy) { into extractDir outputs.file ext.serverXmlFile } -[test, forkedTest]*.dependsOn webappClasses, installOpenLibertyDeps -[test, forkedTest].each { - it.configure { - jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] - } -} tasks.register('webappCopyJars', Sync) { from configurations.webappRuntimeClasspath.findAll { it.name.endsWith('.jar') } into project.layout.buildDirectory.dir("$relAppDir/WEB-INF/lib") dependsOn ':dd-java-agent:instrumentation:servlet:request-5:testFixturesJar' } -[test, forkedTest]*.dependsOn webappCopyJars def filterLogbackClassicTask = tasks.register('filterLogbackClassic', Sync) { ext.filteredLogbackDir = project.layout.buildDirectory.dir('filteredLogback') @@ -147,8 +143,13 @@ def shadowJarTask = tasks.named("shadowJar", ShadowJar) { include "wlp/dev/*.jar" } } -["test", "forkedTest"].each { - tasks.named(it) { - dependsOn(filterLogbackClassicTask, shadowJarTask) - } + +tasks.named("test", Test) { + dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic, shadowJarTask) + jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] +} + +tasks.named("forkedTest", Test) { + dependsOn(webappClasses, installOpenLibertyDeps, webappCopyJars, filterLogbackClassic, shadowJarTask) + jvmArgs += ["-Dserver.xml=${installOpenLibertyDeps.serverXmlFile.absoluteFile}"] } diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle index d2b5035c01c..0c6ca40b35e 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle @@ -14,16 +14,16 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') -[compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each { - it.configure { +["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each { name -> + tasks.named(name, JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } } -[compileTestGroovy, compileLatestDepTestGroovy].each { - it.configure { +["compileTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { javaLauncher = getJavaLauncherFor(17) } } diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle index 7612c1c9a40..fbdf850fe99 100644 --- a/dd-java-agent/instrumentation/mule-4.5/build.gradle +++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle @@ -100,34 +100,34 @@ sourceSets { } } -compileMain_java11Java.configure { +tasks.named("compileMain_java11Java", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } -jar { +tasks.named("jar", Jar) { from sourceSets.main_java11.output } -forbiddenApisMain_java11 { +tasks.named("forbiddenApisMain_java11") { failOnMissingClasses = false } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn 'mvnPackage', 'extractMuleServices' } -tasks.named("compileMule46ForkedTestGroovy") { +tasks.named("compileMule46ForkedTestGroovy", GroovyCompile) { dependsOn 'mvnPackage', 'extractMule46Services' } -tasks.named("compileLatestDepForkedTestGroovy") { +tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) { dependsOn 'mvnPackage', 'extractLatestMuleServices' setJavaVersion(it, 17) } -tasks.named("compileLatestDepForkedTestJava") { +tasks.named("compileLatestDepForkedTestJava", JavaCompile) { setJavaVersion(it, 17) } diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle index 890373d9e39..f9e79837f22 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-buffer', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle index a6119373137..a9edc6abcae 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle @@ -21,7 +21,7 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle index 35a01fa44bc..571f21ddfb5 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle index 0fa5c2e2ae7..31f7ec32aea 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle @@ -23,11 +23,10 @@ apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } - dependencies { compileOnly group: 'org.apache.pekko', name: "pekko-actor_2.12", version: pekkoVersion diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle index 50659fd2d70..51033d7d999 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle @@ -88,7 +88,7 @@ dependencies { latestDepIastTestImplementation project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.16') } -iastTest { +tasks.named("iastTest", Test) { filter { // This class must be excluded from scanning because it references class from "org.apache.pekko.http" package. // When JUnit 5 scans this class, it loads every other class that is present in its method signatures (arguments, return types, throws). @@ -101,33 +101,33 @@ iastTest { } } -latestDepIastTest { +tasks.named("latestDepIastTest", Test) { filter { // Exclude the same problematic class as for iastTest to avoid class loading issues. excludeTestsMatching("*PekkoIastTestWebServer*") } } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "baseTest" dependsOn "iastTest" } -tasks.named('latestDepTest') { +tasks.named("latestDepTest", Test) { dependsOn "latestDepIastTest" } -compileBaseTestGroovy { +tasks.named("compileBaseTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory)) dependsOn "compileBaseTestScala" } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } -compileLatestPekko10TestGroovy { +tasks.named("compileLatestPekko10TestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } diff --git a/dd-java-agent/instrumentation/play/play-2.3/build.gradle b/dd-java-agent/instrumentation/play/play-2.3/build.gradle index 12f1571fa5d..a371b5e88a7 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.3/build.gradle @@ -59,7 +59,7 @@ dependencies { } } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn compileLatestDepTestScala } diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index 8a8dd498881..be824377a54 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -57,13 +57,16 @@ sourceSets { java.srcDirs "${project.projectDir}/src/main/java_play25" } } -jar { + +tasks.named("jar", Jar) { from sourceSets.main_play25.output } + project.afterEvaluate { p -> instrumentJava.dependsOn compileMain_play25Java forbiddenApisMain_play25.dependsOn instrumentMain_play25Java } + instrument { additionalClasspath = [ instrumentJava: compileMain_play25Java.destinationDirectory @@ -99,11 +102,13 @@ dependencies { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } } -compileTestGroovy { + +tasks.named("compileTestGroovy", GroovyCompile) { classpath = classpath + files(compileTestScala.destinationDirectory) dependsOn 'compileTestScala' } -compileLatestDepTestGroovy { + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn 'compileLatestDepTestScala' } @@ -125,10 +130,12 @@ sourceSets { } } } + dependencies { routeGeneratorImplementation libs.scala211 routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0' } + configurations { testGeneratedCompileClasspath.extendsFrom testCompileClasspath latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath @@ -161,36 +168,42 @@ configurations { dependsOn compileRouteGeneratorScala } } -compileTestGeneratedScala { + +tasks.named("compileTestGeneratedScala", ScalaCompile) { classpath = classpath + files(compileTestScala.destinationDirectory) dependsOn buildTestRoutes, compileLatestDepTestScala } -compileLatestDepTestGeneratedScala { + +tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala } -compileTestGroovy { + +tasks.named("compileTestGroovy", GroovyCompile) { classpath = classpath + files(compileTestGeneratedScala.destinationDirectory) dependsOn 'compileTestGeneratedScala' } -compileLatestDepTestGroovy { + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory) dependsOn 'compileLatestDepTestGeneratedScala' } // do it this way rather than through dependencies {} because // latestDepTestImplementation extends testImplementation -test { +tasks.named("test", Test) { classpath = classpath + files(compileTestGeneratedScala.destinationDirectory) } -latestDepTest { + +tasks.named("latestDepTest", Test) { classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory) } -forbiddenApisTestGenerated { +tasks.named("forbiddenApisTestGenerated") { enabled = false } -forbiddenApisLatestDepTestGenerated { + +tasks.named("forbiddenApisLatestDepTestGenerated") { enabled = false } diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle index a38297784bd..fabbffb5587 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.6/build.gradle @@ -72,14 +72,20 @@ sourceSets { java.srcDirs "${project.projectDir}/src/main/java_play27" } } -jar { + +tasks.named("jar", Jar) { from sourceSets.main_play27.output } -compileMain_play27Java.dependsOn compileJava + +tasks.named("compileMain_play27Java", JavaCompile) { + dependsOn(compileJava) +} + project.afterEvaluate { p -> instrumentJava.dependsOn compileMain_play27Java forbiddenApisMain_play27.dependsOn instrumentMain_play27Java } + instrument { additionalClasspath = [ instrumentJava: compileMain_play27Java.destinationDirectory @@ -120,23 +126,27 @@ dependencies { } latestDepTestImplementation group: 'com.typesafe.play', name: 'play-akka-http-server_2.13', version: '2.+' } + configurations.matching({ it.name.startsWith('latestDepTest') }).each({ it.resolutionStrategy { // logback-classic 1.4.11 doesn't like being loaded in the bootstrap classloader (NPE) force group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5' } }) -tasks.named("compileLatestDepTestJava") { + +tasks.named("compileLatestDepTestJava", JavaCompile) { it.sourceCompatibility = JavaVersion.VERSION_11 it.targetCompatibility = JavaVersion.VERSION_11 setJavaVersion(it, 11) } -compileLatestDepTestScala { + +tasks.named("compileLatestDepTestScala", ScalaCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileBaseTestJava.destinationDirectory) dependsOn 'compileBaseTestJava' } -latestDepTest { + +tasks.named("latestDepTest", Test) { javaLauncher = getJavaLauncherFor(11) testClassesDirs = testClassesDirs + sourceSets.baseTest.output.classesDirs } @@ -154,10 +164,12 @@ sourceSets { } } } + dependencies { routeGeneratorImplementation libs.scala213 routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.13", version: '2.+' } + configurations { latestDepTestGeneratedCompileClasspath.extendsFrom(latestDepTestCompileClasspath) } @@ -180,16 +192,18 @@ tasks.register('buildLatestDepTestRoutes', JavaExec) { dependsOn compileRouteGeneratorScala, compileLatestDepTestScala } -compileLatestDepTestGeneratedScala { + +tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala } -forbiddenApisLatestDepTestGenerated { + +tasks.named("forbiddenApisLatestDepTestGenerated") { enabled = false } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) + @@ -201,6 +215,7 @@ compileLatestDepTestGroovy { dependsOn 'compileBaseTestJava' dependsOn 'compileLatestDepTestGeneratedScala' } + dependencies { latestDepTestRuntimeOnly sourceSets.latestDepTestGenerated.output } diff --git a/dd-java-agent/instrumentation/quartz-2.0/build.gradle b/dd-java-agent/instrumentation/quartz-2.0/build.gradle index 5b0b3e0059c..2308c017b38 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/build.gradle +++ b/dd-java-agent/instrumentation/quartz-2.0/build.gradle @@ -32,13 +32,14 @@ dependencies { } -[ - compileLatestDepTestGroovy, - compileLatestDepTestJava, - compileVersion40TestGroovy, - compileVersion40TestJava -].each { - it.configure { +["compileLatestDepTestGroovy", "compileVersion40TestGroovy"].each { + tasks.named(it, GroovyCompile) { + setJavaVersion(it, 11) + } +} + +["compileLatestDepTestJava", "compileVersion40TestJava"].each { + tasks.named(it, JavaCompile) { setJavaVersion(it, 11) } } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle index 3228d059063..3d718830aab 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle @@ -40,6 +40,6 @@ tasks.withType(Test).configureEach { usesService(testcontainersLimit) } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { finalizedBy latestReactorTest } diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle index e91b118b237..e412f093382 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle @@ -25,7 +25,8 @@ idea { project.tasks.withType(AbstractCompile).configureEach { setJavaVersion(it, 17) } -compileJava.configure { + +tasks.named("compileJava", JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index 9f979a71cd7..91d0b2b75fd 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -25,7 +25,8 @@ idea { project.tasks.withType(AbstractCompile).configureEach { setJavaVersion(it, 17) } -compileJava.configure { + +tasks.named("compileJava", JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle index 7d80a9e81f7..9d05c66c564 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle +++ b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle @@ -21,7 +21,10 @@ addTestSuite('jettyAsyncTest') //check.dependsOn nettyTest, jettyAsyncTest // CI invocations are only for test/latestDepTest -test.finalizedBy nettyTest, jettyAsyncTest +tasks.named("test", Test) { + finalizedBy(nettyTest, jettyAsyncTest) +} + configurations.configureEach { resolutionStrategy.deactivateDependencyLocking() } diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle index 67a30626a17..3ca1279062c 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/restlet-2.2/build.gradle @@ -23,7 +23,7 @@ repositories { addTestSuiteForDir('baseForkedTest', 'baseTest') addTestSuite('latestDepTest') -tasks.named("test") { +tasks.named("test", Test) { dependsOn "baseForkedTest" } diff --git a/dd-java-agent/instrumentation/rmi/build.gradle b/dd-java-agent/instrumentation/rmi/build.gradle index 7e1280fda59..5ed782f102c 100644 --- a/dd-java-agent/instrumentation/rmi/build.gradle +++ b/dd-java-agent/instrumentation/rmi/build.gradle @@ -30,6 +30,6 @@ def rmic = tasks.register('rmic', Exec) { ) } -tasks.named("test") { +tasks.named("test", Test) { dependsOn rmic } diff --git a/dd-java-agent/instrumentation/scala-concurrent/build.gradle b/dd-java-agent/instrumentation/scala-concurrent/build.gradle index a5ebd5968c0..6acbd62e5b5 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/build.gradle +++ b/dd-java-agent/instrumentation/scala-concurrent/build.gradle @@ -19,16 +19,16 @@ addTestSuite('latestDepTest') addTestSuiteForDir('latest12Test', 'latestDepTest') addTestSuiteForDir('latest11Test', 'test') -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(sourceSets.test.scala.classesDirectory) } -tasks.named("compileLatest12TestGroovy") { +tasks.named("compileLatest12TestGroovy", GroovyCompile) { classpath += files(sourceSets.latest12Test.scala.classesDirectory) } -tasks.named("compileLatest11TestGroovy") { +tasks.named("compileLatest11TestGroovy", GroovyCompile) { classpath += files(sourceSets.latest11Test.scala.classesDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } @@ -45,7 +45,7 @@ dependencies { latestDepTestImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13') } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latest11Test" dependsOn "latest12Test" } diff --git a/dd-java-agent/instrumentation/scala-promise/build.gradle b/dd-java-agent/instrumentation/scala-promise/build.gradle index 25fa5520996..b87e40df348 100644 --- a/dd-java-agent/instrumentation/scala-promise/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/build.gradle @@ -13,7 +13,7 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" apply plugin: 'scala' -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(sourceSets.test.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle index baa9b68315a..9e7d061ae9f 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle @@ -30,7 +30,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest' apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } @@ -45,17 +45,17 @@ sourceSets { latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala-promise').sourceSets.test.scala } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(sourceSets.test.scala.classesDirectory) dependsOn "compileTestScala" } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) dependsOn "compileLatestDepTestScala" } -tasks.named("compileLatestDepForkedTestGroovy") { +tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepForkedTest.scala.classesDirectory) dependsOn "compileLatestDepForkedTestScala" } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle index 59b062db1f8..a692d28fbdc 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle @@ -30,7 +30,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest' apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } @@ -45,15 +45,15 @@ sourceSets { latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala-promise').sourceSets.test.scala } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(sourceSets.test.scala.classesDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } -tasks.named("compileLatestDepForkedTestGroovy") { +tasks.named("compileLatestDepForkedTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepForkedTest.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/scalatest/build.gradle b/dd-java-agent/instrumentation/scalatest/build.gradle index 53e90aaf747..8ae59538d98 100644 --- a/dd-java-agent/instrumentation/scalatest/build.gradle +++ b/dd-java-agent/instrumentation/scalatest/build.gradle @@ -23,12 +23,12 @@ dependencies { latestDepTestImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '+' } -compileTestGroovy { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/selenium/build.gradle b/dd-java-agent/instrumentation/selenium/build.gradle index 0b4a6f6537b..d4ac58956b9 100644 --- a/dd-java-agent/instrumentation/selenium/build.gradle +++ b/dd-java-agent/instrumentation/selenium/build.gradle @@ -42,7 +42,7 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late } }) -tasks.named("compileLatestDepTestJava") { +tasks.named("compileLatestDepTestJava", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/servlet/request-5/build.gradle b/dd-java-agent/instrumentation/servlet/request-5/build.gradle index e731b0ae3b2..f02da914787 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/build.gradle +++ b/dd-java-agent/instrumentation/servlet/request-5/build.gradle @@ -72,6 +72,6 @@ dependencies { // tested on tomcat-5.5:latestDepTest } -jar { +tasks.named("jar", Jar) { from zipTree(relocatedJavaxJar.outputs.files.asPath) } diff --git a/dd-java-agent/instrumentation/slick/build.gradle b/dd-java-agent/instrumentation/slick/build.gradle index 37171291dea..a0ba86d95d2 100644 --- a/dd-java-agent/instrumentation/slick/build.gradle +++ b/dd-java-agent/instrumentation/slick/build.gradle @@ -10,12 +10,12 @@ apply plugin: 'scala' addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn "compileTestScala" classpath += files(compileTestScala.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn "compileLatestDepTestScala" classpath += files(compileLatestDepTestScala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle index 62b38438696..0f7451a25d7 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle @@ -58,7 +58,7 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "test_spark24" dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle index d092bca8f48..0dd13f5c96e 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle @@ -57,6 +57,6 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '3.+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle index b6665d2e314..fba6eb65f8b 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle @@ -31,8 +31,10 @@ addTestSuiteExtendingForDir("boot2LatestDepForkedTest", "boot2LatestDepTest", "t addTestSuiteExtendingForDir("boot3ForkedTest", "boot3Test", "test") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") -[compileLatestDepTestGroovy, compileBoot3TestGroovy].each { - it.javaLauncher = getJavaLauncherFor(17) +["compileLatestDepTestGroovy", "compileBoot3TestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(17) + } } dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle index 5a840a6068a..a8ed32d6221 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle @@ -14,7 +14,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/spring/spring-messaging-4.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle index 9df4b5a091e..d0ef3d36d47 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle @@ -16,8 +16,10 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') -[compileTestGroovy, compileLatestDepTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(17) +["compileTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(17) + } } dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle index ec67b53ab3a..b4c7f3aab0b 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle @@ -27,26 +27,25 @@ addTestSuiteExtendingForDir('latestDepForkedTest','latestDepTest', 'latestDepTes addTestSuiteForDir('spring6Test', 'test') addTestSuiteForDir('latestSpring5Test', 'test') -[compileSpring6TestJava, compileLatestDepTestJava, compileLatestDepForkedTestJava].each { - setJavaVersion(it, 17) - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 +["compileSpring6TestJava", "compileLatestDepTestJava", "compileLatestDepForkedTestJava"].each { name -> + tasks.named(name, JavaCompile) { + setJavaVersion(it, 17) + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } } - -[ - compileSpring6TestGroovy, - compileLatestDepTestGroovy, - compileLatestDepForkedTestGroovy, - spring6Test, - latestDepTest, - latestDepForkedTest -].each { - it.javaLauncher = getJavaLauncherFor(17) +["compileSpring6TestGroovy", "compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(17) + } } -[spring6Test, latestDepTest, latestDepForkedTest].each { - it.jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' +["spring6Test", "latestDepTest", "latestDepForkedTest"].each { name -> + tasks.named(name, Test) { + javaLauncher = getJavaLauncherFor(17) + jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED") + } } dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index 17c5a2291ae..65608606cf4 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -130,7 +130,7 @@ dependencies { latestIastTestImplementation project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12') } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestBoot20Test" dependsOn "latestBoot24Test" dependsOn "latestBoot2LatestTest" diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index de6fb4c58d3..b4676b42e8d 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -23,7 +23,7 @@ tasks.withType(GroovyCompile).each { it.javaLauncher = getJavaLauncherFor(17) } -iastTest { +tasks.named("iastTest", Test) { jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' } diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle index 4baac9ce55a..a4838c2d48d 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle @@ -16,8 +16,8 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir("latestDepTest", "test") -[compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each { - it.configure { +["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each { name -> + tasks.named(name, JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle index eeeb24822a7..565824ff70d 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle +++ b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle @@ -10,13 +10,13 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/configure_tests.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } + dependencies { compileOnly group: 'net.spy', name: 'spymemcached', version: '2.10.4' diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle index 594c05cfb57..42d0b3e7e65 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle @@ -72,12 +72,16 @@ configurations.configureEach { } } -[compileLatest10TestGroovy, compileLatest10ForkedTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(11) +["compileLatest10TestGroovy", "compileLatest10ForkedTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(11) + } } -[compileLatestDepTestGroovy, compileLatestDepForkedTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(17) +["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(17) + } } dependencies { diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle index abf9862e4f2..93f9000af8d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle @@ -16,7 +16,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/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle index d91c485c2b5..e04507cb8ba 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle @@ -15,7 +15,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/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle index 78d8ae4d01a..6159f4e43e8 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle @@ -15,7 +15,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/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle index 1c8ec1d2f12..46dfa1e16f4 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle @@ -23,7 +23,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/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle index fdc8fe1e71c..8f29134c68c 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle @@ -14,7 +14,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/vertx/vertx-rx-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle index 4823900139c..fdf319a2514 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle @@ -5,7 +5,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/vertx/vertx-web/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle index 50b92e36cd3..56f1bf53c32 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle @@ -20,7 +20,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/vertx/vertx-web/vertx-web-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle index d00cc7f3b1e..e2fe7548b0d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle @@ -20,7 +20,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/vertx/vertx-web/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle index f5d9ca878a3..5208eaf739a 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle @@ -58,9 +58,13 @@ dependencies { latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.+' } -[compileLatestDepTestJava, compileLatestDepForkedTestJava].each { - setJavaVersion(it, 11) +["compileLatestDepTestJava", "compileLatestDepForkedTestJava"].each { name -> + tasks.named(name, JavaCompile) { + setJavaVersion(it, 11) + } } -[compileLatestDepForkedTestGroovy, compileLatestDepTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(11) +["compileLatestDepForkedTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(11) + } } diff --git a/dd-java-agent/instrumentation/weaver/build.gradle b/dd-java-agent/instrumentation/weaver/build.gradle index b9edbb0a24e..0a01cfe4963 100644 --- a/dd-java-agent/instrumentation/weaver/build.gradle +++ b/dd-java-agent/instrumentation/weaver/build.gradle @@ -30,17 +30,17 @@ dependencies { weaver084TestImplementation group: 'com.disneystreaming', name: 'weaver-cats_3', version: '0.8.4' } -compileTestGroovy { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } -compileWeaver084TestGroovy { +tasks.named("compileWeaver084TestGroovy", GroovyCompile) { dependsOn compileWeaver084TestScala classpath += files(sourceSets.weaver084Test.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle index 1b4488d5b3e..85344b23542 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle @@ -17,13 +17,16 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuite("latestDepTest") -compileMain_java11Java.configure { +tasks.named("compileMain_java11Java", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } -[compileTestGroovy, compileLatestDepTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(11) + +["compileTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(11) + } } dependencies { diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle index e1b6775832d..a1fbd11bb79 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle @@ -17,8 +17,10 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuite("latestDepTest") -[compileTestGroovy, compileLatestDepTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(11) +["compileTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(11) + } } dependencies { diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle index 248b14e4549..7ae85334ed4 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle @@ -30,8 +30,10 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir("latestDepTest", "test") -[compileTestGroovy, compileLatestDepTestGroovy].each { - it.javaLauncher = getJavaLauncherFor(17) +["compileTestGroovy", "compileLatestDepTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { + javaLauncher = getJavaLauncherFor(17) + } } dependencies { diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index eb3149d2397..03ef1494a31 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -103,49 +103,47 @@ def extractLatestWildfly = tasks.register("extractLatestWildfly", Copy) { onlyIf { !project.rootProject.hasProperty("skipTests") } } -tasks.named("test") { +tasks.named("test", Test) { dependsOn 'extractWildfly' } -tasks.named("forkedTest") { +tasks.named("forkedTest", Test) { dependsOn 'extractWildfly' } -tasks.named("latestDepForkedTest") { +tasks.named("latestDepForkedTest", Test) { dependsOn 'extractLatestWildfly' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn 'extractLatestWildfly' } -compileTestGroovy.configure { +tasks.named("compileTestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) } -[compileLatestDepTestGroovy, compileLatestDepForkedTestGroovy].each { - it.configure { +["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name -> + tasks.named(name, GroovyCompile) { javaLauncher = getJavaLauncherFor(17) } } -compileTestJava.configure { - it.configure { - setJavaVersion(it, 11) - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } +tasks.named("compileTestJava", JavaCompile) { + setJavaVersion(it, 11) + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } -[compileLatestDepTestJava, compileLatestDepForkedTestJava].each { - it.configure { +["compileLatestDepTestJava", "compileLatestDepForkedTestJava"].each { name -> + tasks.named(name, JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } } -processTestResources { +tasks.named("processTestResources", ProcessResources) { filesMatching('**/WEB-INF/web.xml') { expand( 'servletClass': 'test.TestServlet', @@ -153,11 +151,13 @@ processTestResources { } } -[processLatestDepTestResources, processLatestDepForkedTestResources].each { - it.filesMatching('**/WEB-INF/web.xml') { - expand( - 'servletClass': 'test.JakartaTestServlet', - ) +["processLatestDepTestResources", "processLatestDepForkedTestResources"].each { name -> + tasks.named(name, ProcessResources) { + filesMatching('**/WEB-INF/web.xml') { + expand( + 'servletClass': 'test.JakartaTestServlet', + ) + } } } From fb58abe9c7538dc057c9c14e7a80a050196c03b8 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 7 Oct 2025 14:02:30 -0400 Subject: [PATCH 4/4] Small edit --- dd-java-agent/instrumentation/wildfly-9.0/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index 61b5282522a..b7541780190 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -144,8 +144,8 @@ tasks.named("processTestResources", ProcessResources) { } } -["processLatestDepTestResources", "processLatestDepForkedTestResources"].each { name -> - tasks.named(name, ProcessResources) { +["processLatestDepTestResources", "processLatestDepForkedTestResources"].each { + tasks.named(it, ProcessResources) { filesMatching('**/WEB-INF/web.xml') { expand( 'servletClass': 'test.JakartaTestServlet',