Convert Custom Test Tasks to Modern Test Suites for Gradle 9 Compatibility

build-scan.txt

@@ -0,0 +1 @@
+https://gradle.com/s/7aejagx2euadi

instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts

@@ -21,19 +21,29 @@ dependencies {
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-
-    systemProperty("collectMetadata", collectMetadata)
-    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+
+            systemProperty("collectMetadata", collectMetadata)
+            systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
   }
+}
 
+tasks {
   test {
     systemProperty("collectMetadata", collectMetadata)
   }
 
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/alibaba-druid-1.0/library/build.gradle.kts

@@ -9,12 +9,23 @@ dependencies {
   testImplementation(project(":instrumentation:alibaba-druid-1.0:testing"))
 }
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
   }
+}
+
+tasks {
 
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts

@@ -21,21 +21,30 @@ dependencies {
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-
-    systemProperty("collectMetadata", collectMetadata)
-    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
-    systemProperty("collectSpans", true)
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+
+            systemProperty("collectMetadata", collectMetadata)
+            systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+            systemProperty("collectSpans", true)
+          }
+        }
+      }
+    }
   }
+}
 
+tasks {
   test {
     systemProperty("collectMetadata", collectMetadata)
     systemProperty("collectSpans", true)
   }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/apache-dbcp-2.0/library/build.gradle.kts

@@ -9,12 +9,23 @@ dependencies {
   testImplementation(project(":instrumentation:apache-dbcp-2.0:testing"))
 }
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
   }
+}
+
+tasks {
 
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -168,25 +168,52 @@ testing {
         }
       }
     }
-  }
-}
 
-tasks {
-  val testExperimentalSqs by registering(Test::class) {
-    filter {
-      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+    val testExperimentalSqs by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+              excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+            }
+            systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
+            systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
+          }
+        }
+      }
     }
-    systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
-    systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
-  }
 
-  val testReceiveSpansDisabled by registering(Test::class) {
-    filter {
-      includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+    val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+              includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+            }
+            include("**/Aws2SqsSuppressReceiveSpansTest.*")
+          }
+        }
+      }
+    }
+
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+              excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+            }
+            systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+            systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+          }
+        }
+      }
     }
-    include("**/Aws2SqsSuppressReceiveSpansTest.*")
   }
+}
 
+tasks {
   test {
     filter {
       excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
@@ -196,8 +223,6 @@ tasks {
   }
 
   check {
-    dependsOn(testExperimentalSqs)
-    dependsOn(testReceiveSpansDisabled)
     dependsOn(testing.suites)
   }
 
@@ -214,18 +239,4 @@ tasks {
       include("software/amazon/awssdk/global/handlers/execution.interceptors")
     }
   }
-
-  val testStableSemconv by registering(Test::class) {
-    filter {
-      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
-    }
-    systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-
-    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/c3p0-0.9/javaagent/build.gradle.kts

@@ -23,19 +23,28 @@ dependencies {
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-
-    systemProperty("collectMetadata", collectMetadata)
-    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+
+            systemProperty("collectMetadata", collectMetadata)
+            systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
   }
+}
 
+tasks {
   test {
     systemProperty("collectMetadata", collectMetadata)
   }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/c3p0-0.9/library/build.gradle.kts

@@ -9,12 +9,23 @@ dependencies {
   testImplementation(project(":instrumentation:c3p0-0.9:testing"))
 }
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
   }
+}
+
+tasks {
 
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts

@@ -40,16 +40,26 @@ dependencies {
 // Requires old Guava. Can't use enforcedPlatform since predates BOM
 configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.google.guava:guava:19.0")
 
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
+  }
+}
+
 tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts

@@ -23,16 +23,26 @@ dependencies {
   testInstrumentation(project(":instrumentation:cassandra:cassandra-4.4:javaagent"))
 }
 
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
+  }
+}
+
 tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts

@@ -26,16 +26,26 @@ dependencies {
   testInstrumentation(project(":instrumentation:cassandra:cassandra-4.0:javaagent"))
 }
 
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
+  }
+}
+
 tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }