Gradle test fixes

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,7 @@ 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)
   }
 }

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

@@ -21,19 +21,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)
   }
 }

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)
   }
 }

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

@@ -21,19 +21,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)
   }
 }

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")
+          }
+        }
+      }
+    }
   }
+}
 
+tasks {
   check {
-    dependsOn(testStableSemconv)
+    dependsOn(testing.suites)
   }
 }

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

@@ -128,6 +128,18 @@ testing {
         }
       }
     }
+
+    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,17 +156,6 @@ 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)
-  }
-
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", collectMetadata)

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

@@ -23,19 +23,29 @@ dependencies {
   latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
 }
 
+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")
   }
 
-  val testReceiveSpansDisabled by registering(Test::class) {
-    filter {
-      includeTestsMatching("SqsSuppressReceiveSpansTest")
-    }
-    include("**/SqsSuppressReceiveSpansTest.*")
-  }
-
   test {
     filter {
       excludeTestsMatching("SqsSuppressReceiveSpansTest")
@@ -44,7 +54,7 @@ tasks {
   }
 
   check {
-    dependsOn(testReceiveSpansDisabled)
+    dependsOn(testing.suites)
   }
 }
 

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

@@ -48,16 +48,21 @@ testing {
         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)
   }
 }

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

@@ -171,21 +171,53 @@ testing {
   }
 }
 
-tasks {
-  val testExperimentalSqs by registering(Test::class) {
-    filter {
-      excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
+testing {
+  suites {
+    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 {
@@ -196,8 +228,6 @@ tasks {
   }
 
   check {
-    dependsOn(testExperimentalSqs)
-    dependsOn(testReceiveSpansDisabled)
     dependsOn(testing.suites)
   }
 
@@ -214,18 +244,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)
-  }
 }