Convert Custom Test Tasks to Test Suites for Gradle 9 Compatibility

build-scan.txt

@@ -0,0 +1 @@
+https://gradle.com/s/6yijophyjju3k

instrumentation-api-incubator/build.gradle.kts

@@ -28,6 +28,30 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 }
 
+testing {
+  suites {
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
+          }
+        }
+      }
+    }
+
+    val testBothSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
+          }
+        }
+      }
+    }
+  }
+}
+
 tasks {
   // exclude auto-generated code
   named<Checkstyle>("checkstyleMain") {
@@ -45,16 +69,8 @@ tasks {
     dependsOn("generateJflex")
   }
 
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
-  }
-
-  val testBothSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
-  }
-
   check {
-    dependsOn(testStableSemconv)
-    dependsOn(testBothSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
+    dependsOn(testing.suites.named("testBothSemconv"))
   }
 }

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,22 @@ 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,19 +21,30 @@ dependencies {
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
-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")
 
     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/apache-dbcp-2.0/library/build.gradle.kts

@@ -9,12 +9,22 @@ 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")
+          }
+        }
+      }
+    }
   }
+}
 
-  check {
-    dependsOn(testStableSemconv)
+tasks {  check {
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

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

@@ -89,6 +89,19 @@ testing {
 
         // needed by S3
         implementation("javax.xml.bind:jaxb-api:2.3.1")
+
+    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")
+          }
+        }
+      }
+    }
       }
     }
 
@@ -144,15 +157,8 @@ 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")
-  }
-
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 
   test {

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts

@@ -23,17 +23,25 @@ dependencies {
   latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
 }
 
-tasks {
-  withType<Test>().configureEach {
-    systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
-    systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
-  }
 
-  val testReceiveSpansDisabled by registering(Test::class) {
-    filter {
+testing {
+  suites {
+    val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
       includeTestsMatching("SqsSuppressReceiveSpansTest")
+          }
+        }
+      }
     }
-    include("**/SqsSuppressReceiveSpansTest.*")
+  }
+}
+
+tasks {  withType<Test>().configureEach {
+    systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
+    systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
   }
 
   test {
@@ -44,7 +52,7 @@ tasks {
   }
 
   check {
-    dependsOn(testReceiveSpansDisabled)
+    dependsOn(testing.suites.named("testReceiveSpansDisabled"))
   }
 }
 

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

@@ -46,18 +46,25 @@ testing {
         implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
         val version = if (testLatestDeps) "latest.release" else "1.12.80"
         implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
+
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
+    }
       }
     }
   }
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
 
   check {
     dependsOn(testing.suites)
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }

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

@@ -138,6 +138,39 @@ testing {
         val version = if (latestDepTest) "latest.release" else "2.10.12"
         implementation("software.amazon.awssdk:s3:$version")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
+
+    val testExperimentalSqs by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+          }
+        }
+      }
+    }
+
+    val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+      includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+          }
+        }
+      }
+    }
+
+    val testStableSemconv by registering(JvmTestSuite::class) {
+      targets {
+        all {
+          testTask.configure {
+            filter {
+      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+          }
+        }
+      }
+    }
       }
     }
 
@@ -172,20 +205,6 @@ testing {
 }
 
 tasks {
-  val testExperimentalSqs by registering(Test::class) {
-    filter {
-      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
-    }
-    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")
-    }
-    include("**/Aws2SqsSuppressReceiveSpansTest.*")
-  }
 
   test {
     filter {
@@ -196,8 +215,8 @@ tasks {
   }
 
   check {
-    dependsOn(testExperimentalSqs)
-    dependsOn(testReceiveSpansDisabled)
+    dependsOn(testing.suites.named("testExperimentalSqs"))
+    dependsOn(testing.suites.named("testReceiveSpansDisabled"))
     dependsOn(testing.suites)
   }
 
@@ -215,17 +234,7 @@ tasks {
     }
   }
 
-  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)
+    dependsOn(testing.suites.named("testStableSemconv"))
   }
 }