Remove old file references and add missing configuration

sarahchen6 · sarahchen6 · commit 24e44ed5f628 · 2025-10-24T16:37:17.000-04:00
diff --git a/buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts b/buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts
@@ -2,6 +2,8 @@ import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.junitplatform.JUnitPlatformOptions
 import org.gradle.api.services.BuildService
 import org.gradle.api.services.BuildServiceParameters
+import org.gradle.testing.base.TestingExtension
+import org.gradle.api.plugins.jvm.JvmTestSuite
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 
@@ -32,6 +34,13 @@ val forkedTestLimit = gradle.sharedServices.registerIfAbsent("forkedTestLimit",
   maxParallelUsages.set(3)
 }
 
+extensions.findByType(TestingExtension::class.java)?.apply {
+  suites.withType(JvmTestSuite::class.java).configureEach {
+    // Use JUnit 5 to run tests
+    useJUnitJupiter()
+  }
+}
+
 // Use lazy providers to avoid evaluating the property until it is needed
 val skipTestsProvider = rootProject.providers.gradleProperty("skipTests")
 val skipForkedTestsProvider = rootProject.providers.gradleProperty("skipForkedTests")
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
@@ -40,8 +40,6 @@ protobuf {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -16,7 +16,6 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-apply from: "$rootDir/gradle/configure_tests.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle
@@ -13,8 +13,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.0'
   compileOnly group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '1.0.0'
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle
@@ -14,8 +14,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 dependencies {
   compileOnly group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
   compileOnly group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '2.0.0'
diff --git a/dd-java-agent/instrumentation/jakarta-jms/build.gradle b/dd-java-agent/instrumentation/jakarta-jms/build.gradle
@@ -14,7 +14,6 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-apply from: "$rootDir/gradle/configure_tests.gradle"
 
 repositories {
   maven {
diff --git a/dd-java-agent/instrumentation/jms/build.gradle b/dd-java-agent/instrumentation/jms/build.gradle
@@ -26,8 +26,6 @@ repositories {
 addTestSuite('latestDepTest')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
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
@@ -20,8 +20,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuite('latestDepTest')
 addTestSuite('iastLatestDepTest3')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
@@ -39,7 +37,6 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams')
   testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
 
-
   // IAST testing dependencies
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')
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
@@ -28,8 +28,6 @@ apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
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
@@ -28,8 +28,6 @@ apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
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
@@ -12,8 +12,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle
@@ -8,7 +8,6 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-apply from: "$rootDir/gradle/configure_tests.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
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
@@ -14,8 +14,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -13,8 +13,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -13,8 +13,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -21,8 +21,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -12,8 +12,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-redis-client-3.9/build.gradle
@@ -9,7 +9,6 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-apply from: "$rootDir/gradle/configure_tests.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
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
@@ -3,8 +3,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -18,8 +18,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 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
@@ -18,8 +18,6 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
-apply from: "$rootDir/gradle/configure_tests.gradle"
-
 tasks.named("latestDepTest", Test) {
   finalizedBy 'latestDepForkedTest'
 }
diff --git a/gradle/configure_tests.gradle b/gradle/configure_tests.gradle

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ protobuf {`
`40`	`40`	`addTestSuiteForDir('latestDepTest', 'test')`
`41`	`41`	`addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')`
`42`	`42`
`43`		`-apply from: "$rootDir/gradle/configure_tests.gradle"`
`44`		`-`
`45`	`43`	`tasks.named("latestDepTest", Test) {`
`46`	`44`	`finalizedBy 'latestDepForkedTest'`
`47`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ muzzle {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`apply from: "$rootDir/gradle/java.gradle"`
`19`		`-apply from: "$rootDir/gradle/configure_tests.gradle"`
`20`	`19`
`21`	`20`	`addTestSuiteForDir('latestDepTest', 'test')`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ muzzle {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`apply from: "$rootDir/gradle/java.gradle"`
`17`		`-apply from: "$rootDir/gradle/configure_tests.gradle"`
`18`	`17`
`19`	`18`	`repositories {`
`20`	`19`	`maven {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ repositories {`
`26`	`26`	`addTestSuite('latestDepTest')`
`27`	`27`	`addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')`
`28`	`28`
`29`		`-apply from: "$rootDir/gradle/configure_tests.gradle"`
`30`		`-`
`31`	`29`	`tasks.named("latestDepTest", Test) {`
`32`	`30`	`finalizedBy 'latestDepForkedTest'`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own`
`28`	`28`	`addTestSuiteForDir('latestDepTest', 'test')`
`29`	`29`	`addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest')`
`30`	`30`
`31`		`-apply from: "$rootDir/gradle/configure_tests.gradle"`
`32`		`-`
`33`	`31`	`tasks.named("latestDepTest", Test) {`
`34`	`32`	`finalizedBy 'latestDepForkedTest'`
`35`	`33`	`}`