diff --git a/build-scan.txt b/build-scan.txt new file mode 100644 index 000000000000..20ae4019e4a0 --- /dev/null +++ b/build-scan.txt @@ -0,0 +1 @@ +https://gradle.com/s/7aejagx2euadi diff --git a/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts b/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts index 5f3b242fb791..d66fd296e647 100644 --- a/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/alibaba-druid-1.0/library/build.gradle.kts b/instrumentation/alibaba-druid-1.0/library/build.gradle.kts index 6101530383e6..8c245c5dc436 100644 --- a/instrumentation/alibaba-druid-1.0/library/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts b/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts index 7dc3f2098c64..d9623d39cdbb 100644 --- a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts b/instrumentation/apache-dbcp-2.0/library/build.gradle.kts index a662876a4782..2bc6cc53eae7 100644 --- a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts index 0e73aa306f41..77df8b5ef026 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts +++ b/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) - } } diff --git a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts b/instrumentation/c3p0-0.9/javaagent/build.gradle.kts index c90aaa3e5cb2..93736c8ad8e4 100644 --- a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/c3p0-0.9/library/build.gradle.kts b/instrumentation/c3p0-0.9/library/build.gradle.kts index a7b7f6a397ee..3a6eac614652 100644 --- a/instrumentation/c3p0-0.9/library/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts index 3f50980b45e4..e7fa4fdaa16b 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts +++ b/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().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")) } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts index bf3b4b5862a3..370631822473 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts +++ b/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().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")) } } diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts index 375711858747..1ea8df8a8109 100644 --- a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts +++ b/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().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")) } } diff --git a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts index f61f1b46296f..56e3ded9aec1 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts +++ b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts @@ -24,6 +24,23 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("collectMetadata", collectMetadata) + systemProperty("collectSpans", true) + } + } + } + } + } +} + tasks { test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) @@ -31,15 +48,7 @@ tasks { systemProperty("collectSpans", true) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") - systemProperty("collectMetadata", collectMetadata) - systemProperty("collectSpans", true) - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts index 3f6ce16b21e7..7a6a2c477618 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts @@ -30,6 +30,20 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:2.5.+") // see couchbase-2.6 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // required on jdk17 @@ -38,11 +52,7 @@ tasks { jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts index 891771afade8..200d222159ac 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts @@ -33,6 +33,20 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:2.+") // see couchbase-3.1 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // TODO run tests both with and without experimental span attributes @@ -43,11 +57,7 @@ tasks { jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts index c0128fac5e38..9ab9484f7d00 100644 --- a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts @@ -38,16 +38,26 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:3.1.+") // see couchbase-3.2 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts index 8efea0a3a21f..3de4b1dd7e62 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts @@ -39,16 +39,26 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:3.1.5") // see couchbase-3.1.6 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts index 333fdbdcfced..fcabb63bd0f1 100644 --- a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts @@ -36,17 +36,27 @@ dependencies { testImplementation("org.testcontainers:couchbase") } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) 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")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts index 58eee6d2040b..b5a6e02cb3eb 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts @@ -49,6 +49,32 @@ dependencies { latestDepTestLibrary("org.elasticsearch.client:transport:5.2.+") // see elasticsearch-transport-5.3 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") + systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") + } + } + } + } + } +} + tasks { withType().configureEach { // required on jdk17 @@ -58,17 +84,7 @@ tasks { systemProperty("collectSpans", true) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") - } - - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") - } - check { - dependsOn(testStableSemconv, testExperimental) + dependsOn(testing.suites.named("testStableSemconv"), testing.suites.named("testExperimental")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts index baf5f183219e..91a069d676e9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts @@ -65,6 +65,32 @@ dependencies { latestDepTestLibrary("org.springframework.data:spring-data-elasticsearch:3.0.+") // see elasticsearch-transport-6.0 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database,code") + systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") + systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") + } + } + } + } + } +} + tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) @@ -77,17 +103,7 @@ tasks { systemProperty("collectSpans", true) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database,code") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") - } - - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") - } - check { - dependsOn(testStableSemconv, testExperimental) + dependsOn(testing.suites.named("testStableSemconv"), testing.suites.named("testExperimental")) } } diff --git a/instrumentation/geode-1.4/javaagent/build.gradle.kts b/instrumentation/geode-1.4/javaagent/build.gradle.kts index dd436deef63f..d566cbd553f7 100644 --- a/instrumentation/geode-1.4/javaagent/build.gradle.kts +++ b/instrumentation/geode-1.4/javaagent/build.gradle.kts @@ -17,12 +17,22 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value") } -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")) } } diff --git a/instrumentation/guava-10.0/javaagent/build.gradle.kts b/instrumentation/guava-10.0/javaagent/build.gradle.kts index 1dd1aa52d4b6..ef5f12b7ee32 100644 --- a/instrumentation/guava-10.0/javaagent/build.gradle.kts +++ b/instrumentation/guava-10.0/javaagent/build.gradle.kts @@ -32,18 +32,33 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-extension-annotations") } -tasks { - - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code") - } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code") + } + } + } + } - val testBothSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + val testBothSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + } + } + } + } } +} +tasks { check { - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts index d5262fe7f54d..87076474716a 100644 --- a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts @@ -24,19 +24,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")) } } diff --git a/instrumentation/hikaricp-3.0/library/build.gradle.kts b/instrumentation/hikaricp-3.0/library/build.gradle.kts index 73fda349d202..54dc159e8aa0 100644 --- a/instrumentation/hikaricp-3.0/library/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/library/build.gradle.kts @@ -9,12 +9,23 @@ dependencies { testImplementation(project(":instrumentation:hikaricp-3.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")) } } diff --git a/instrumentation/influxdb-2.4/javaagent/build.gradle.kts b/instrumentation/influxdb-2.4/javaagent/build.gradle.kts index 04909adbc594..4d2c924468f2 100644 --- a/instrumentation/influxdb-2.4/javaagent/build.gradle.kts +++ b/instrumentation/influxdb-2.4/javaagent/build.gradle.kts @@ -32,6 +32,16 @@ testing { implementation("org.testcontainers:testcontainers") } } + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -49,11 +59,7 @@ tasks { } } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites) } } diff --git a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts index 22293482fb0a..10a86906362a 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts @@ -35,6 +35,16 @@ testing { implementation(project(":instrumentation:jedis:jedis-1.4:testing")) } } + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -43,12 +53,7 @@ tasks { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) } } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts index 532a471e280b..50a901b24a65 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts @@ -28,16 +28,26 @@ dependencies { latestDepTestLibrary("redis.clients:jedis:3.+") // see jedis-4.0 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts index 01afcaa36f52..2a8f2c32cf80 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts @@ -24,6 +24,20 @@ dependencies { testInstrumentation(project(":instrumentation:jedis:jedis-3.0:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // latest dep test fails because peer ip is 0:0:0:0:0:0:0:1 instead of 127.0.0.1 @@ -31,11 +45,7 @@ tasks { 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")) } } diff --git a/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts b/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts index 8c769fd89f04..b19737506f65 100644 --- a/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts +++ b/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts @@ -45,6 +45,19 @@ testing { } } } + + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("Jms1SuppressReceiveSpansTest") + } + include("**/Jms1SuppressReceiveSpansTest.*") + } + } + } + } } } @@ -53,13 +66,6 @@ tasks { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } - val testReceiveSpansDisabled by registering(Test::class) { - filter { - includeTestsMatching("Jms1SuppressReceiveSpansTest") - } - include("**/Jms1SuppressReceiveSpansTest.*") - } - test { filter { excludeTestsMatching("Jms1SuppressReceiveSpansTest") @@ -69,7 +75,6 @@ tasks { check { dependsOn(testing.suites) - dependsOn(testReceiveSpansDisabled) } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts index 97a05becb7c4..be7ebafbb4f8 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts @@ -17,6 +17,20 @@ dependencies { latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // TODO run tests both with and without experimental span attributes @@ -25,11 +39,7 @@ tasks { 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")) } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts index e9ac67e15dbc..136f0ca3e22d 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts @@ -24,6 +24,20 @@ dependencies { latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // TODO run tests both with and without experimental span attributes @@ -32,11 +46,7 @@ tasks { 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")) } } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts index 654a6172715d..b4119ec30c39 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts @@ -23,17 +23,27 @@ dependencies { testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) 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")) } } diff --git a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts index 6d5716d02711..913d92d01692 100644 --- a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts @@ -23,16 +23,26 @@ dependencies { testInstrumentation(project(":instrumentation:mongo:mongo-4.0:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts index f6b3d3495eed..c22a56f8bdda 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts @@ -33,16 +33,26 @@ dependencies { testInstrumentation(project(":instrumentation:mongo:mongo-4.0:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts index 969ed989247d..015f5c88999e 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts @@ -29,16 +29,26 @@ dependencies { testInstrumentation(project(":instrumentation:mongo:mongo-3.7:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts index d33c2ae01465..38d97350c2a2 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts @@ -24,16 +24,26 @@ dependencies { testInstrumentation(project(":instrumentation:mongo:mongo-4.0:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts index ac89ed679b18..92d674aab82f 100644 --- a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts +++ b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts @@ -35,18 +35,28 @@ dependencies { latestDepTestLibrary("io.netty:netty-codec-http:4.0.+") // see netty-4.1 module } -tasks { - val testConnectionSpan by registering(Test::class) { - filter { - includeTestsMatching("Netty40ConnectionSpanTest") - includeTestsMatching("Netty40ClientSslTest") - } - include("**/Netty40ConnectionSpanTest.*", "**/Netty40ClientSslTest.*") +testing { + suites { + val testConnectionSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("Netty40ConnectionSpanTest") + includeTestsMatching("Netty40ClientSslTest") + } + include("**/Netty40ConnectionSpanTest.*", "**/Netty40ClientSslTest.*") - jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true") - jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true") + jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true") + jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true") + } + } + } + } } +} +tasks { test { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") @@ -57,7 +67,7 @@ tasks { } check { - dependsOn(testConnectionSpan) + dependsOn(testing.suites.named("testConnectionSpan")) } } diff --git a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts index 048d21736923..5d83bea006dc 100644 --- a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts +++ b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts @@ -42,18 +42,28 @@ dependencies { testCompileOnly("io.netty:netty-transport-native-kqueue:4.1.11.Final:osx-x86_64") } -tasks { - val testConnectionSpan by registering(Test::class) { - filter { - includeTestsMatching("Netty41ConnectionSpanTest") - includeTestsMatching("Netty41ClientSslTest") - } - include("**/Netty41ConnectionSpanTest.*", "**/Netty41ClientSslTest.*") +testing { + suites { + val testConnectionSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("Netty41ConnectionSpanTest") + includeTestsMatching("Netty41ClientSslTest") + } + include("**/Netty41ConnectionSpanTest.*", "**/Netty41ClientSslTest.*") - jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true") - jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true") + jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true") + jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true") + } + } + } + } } +} +tasks { test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") @@ -65,7 +75,7 @@ tasks { } check { - dependsOn(testConnectionSpan) + dependsOn(testing.suites.named("testConnectionSpan")) } } diff --git a/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts b/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts index 6c80b8f7aa1c..dfa7819f124e 100644 --- a/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts +++ b/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts @@ -30,16 +30,26 @@ dependencies { testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/r2dbc-1.0/library/build.gradle.kts b/instrumentation/r2dbc-1.0/library/build.gradle.kts index 729385252749..4c40e9ea7e30 100644 --- a/instrumentation/r2dbc-1.0/library/build.gradle.kts +++ b/instrumentation/r2dbc-1.0/library/build.gradle.kts @@ -10,16 +10,26 @@ dependencies { testImplementation(project(":instrumentation:reactor:reactor-3.1:library")) } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().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")) } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index 681fdcb45b81..8fe5e34b24d7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -173,6 +173,16 @@ testing { } } } + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -219,12 +229,7 @@ tasks { from(sourceSets["javaSpring3"].java) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) } } diff --git a/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts b/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts index 0f3c5a4ff953..c24dbae97cc5 100644 --- a/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts +++ b/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts @@ -20,6 +20,20 @@ dependencies { testImplementation("com.google.guava:guava") } +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { withType().configureEach { // TODO run tests both with and without experimental span attributes @@ -27,11 +41,7 @@ tasks { 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")) } } diff --git a/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts index 5fd9a33e6b37..0b9f09458803 100644 --- a/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.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.named("testStableSemconv")) } } diff --git a/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts index 9f0a4b44cb9c..16c22c73ae58 100644 --- a/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts @@ -9,12 +9,23 @@ dependencies { testImplementation(project(":instrumentation:vibur-dbcp-11.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")) } }