diff --git a/build-scan.txt b/build-scan.txt new file mode 100644 index 000000000000..913490248455 --- /dev/null +++ b/build-scan.txt @@ -0,0 +1 @@ +https://gradle.com/s/6yijophyjju3k diff --git a/instrumentation-api-incubator/build.gradle.kts b/instrumentation-api-incubator/build.gradle.kts index c6e0eaa576ba..369dacc256da 100644 --- a/instrumentation-api-incubator/build.gradle.kts +++ b/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("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")) } } diff --git a/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts b/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts index f0f6141eb0b0..17bc4e3cbf51 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..a88e3c979452 100644 --- a/instrumentation/alibaba-druid-1.0/library/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts b/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts index 708d2b7b1ae4..7e7e106a35d5 100644 --- a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts b/instrumentation/apache-dbcp-2.0/library/build.gradle.kts index a662876a4782..29b634773221 100644 --- a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts +++ b/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")) } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts index 31e40dd3c8aa..8221df2b5c1b 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts +++ b/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 { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts index 3403f770cd17..e9985e8cca3a 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts +++ b/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().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().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")) } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts index 8a3e396a43d8..bccdeea07d21 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts +++ b/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")) } } 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 79258da0e422..fe3c32d8d563 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 @@ -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")) } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts index 38dd2cd78fbe..f2a7bb46647f 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts @@ -24,19 +24,29 @@ dependencies { testLibrary("software.amazon.awssdk:sqs:2.2.0") } -tasks { - withType().configureEach { + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true) systemProperty("otel.instrumentation.aws-sdk.experimental-record-individual-http-error", true) systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header") systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } - 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/aws-sdk/aws-sdk-2.2/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts index c832ee002c1e..b3f8a89ba9f6 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts @@ -46,6 +46,16 @@ testing { implementation("software.amazon.awssdk:aws-json-protocol:$version") implementation("software.amazon.awssdk:dynamodb:$version") implementation("software.amazon.awssdk:lambda:$version") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -77,12 +87,8 @@ tasks { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts b/instrumentation/c3p0-0.9/javaagent/build.gradle.kts index 509cd19804aa..4f45fffabd4c 100644 --- a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts +++ b/instrumentation/c3p0-0.9/javaagent/build.gradle.kts @@ -23,19 +23,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")) } } diff --git a/instrumentation/c3p0-0.9/library/build.gradle.kts b/instrumentation/c3p0-0.9/library/build.gradle.kts index a7b7f6a397ee..a7a2591b5106 100644 --- a/instrumentation/c3p0-0.9/library/build.gradle.kts +++ b/instrumentation/c3p0-0.9/library/build.gradle.kts @@ -9,12 +9,22 @@ 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") + } + } + } + } } +} - check { - dependsOn(testStableSemconv) +tasks { check { + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts index d401d4f03f1b..820089c0abe5 100644 --- a/instrumentation/camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts @@ -67,8 +67,34 @@ dependencies { latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+") // documented limitation } -tasks { - withType().configureEach { + +testing { + suites { + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.camel.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.camel.experimental-span-attributes=true") + } + } + } + } + + 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") + } + } + } + } + } +} + +tasks { withType().configureEach { jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true") // TODO: fix camel instrumentation so that it uses semantic attributes extractors @@ -83,18 +109,8 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.camel.experimental-span-attributes=true") - systemProperty("metadataConfig", "otel.instrumentation.camel.experimental-span-attributes=true") - } - - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv, testExperimental) + dependsOn(testing.suites.named("testStableSemconv"), testing.suites.named("testExperimental")) } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts index 7abc06528df7..352032cd2113 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts @@ -40,18 +40,28 @@ dependencies { // Requires old Guava. Can't use enforcedPlatform since predates BOM configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.google.guava:guava:19.0") -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } 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 b49f63d13fa1..458eb4b87169 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts @@ -23,18 +23,28 @@ dependencies { testInstrumentation(project(":instrumentation:cassandra:cassandra-4.4:javaagent")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } 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 1c9ec282a5c6..ab5c2f3a8ebc 100644 --- a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts @@ -26,18 +26,28 @@ dependencies { testInstrumentation(project(":instrumentation:cassandra:cassandra-4.0:javaagent")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts index 19f0d3172cd5..37f51c205ca9 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts @@ -11,16 +11,26 @@ dependencies { testImplementation(project(":instrumentation:cassandra:cassandra-4.4:testing")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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 cf36f4d1d23e..b38ccb757a71 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts +++ b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts @@ -24,20 +24,31 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" -tasks { - test { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", collectMetadata) - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("collectMetadata", collectMetadata) + } + } + } + } + } +} + +tasks { + test { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) systemProperty("collectMetadata", collectMetadata) } 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 76e51366e10a..08b0ebbd3aeb 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts @@ -30,8 +30,23 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:2.5.+") // see couchbase-2.6 module } -tasks { - withType().configureEach { + +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") + } + } + } + } + } +} + +tasks { withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED") @@ -40,12 +55,7 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.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 3e41596e7b8a..596d989d8af2 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts @@ -33,8 +33,34 @@ dependencies { latestDepTestLibrary("com.couchbase.client:java-client:2.+") // see couchbase-3.1 module } -tasks { - withType().configureEach { + +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.couchbase.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.couchbase.experimental-span-attributes=true") + } + } + } + } + } +} + +tasks { withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") @@ -42,17 +68,7 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - 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.couchbase.experimental-span-attributes=true") - systemProperty("metadataConfig", "otel.instrumentation.couchbase.experimental-span-attributes=true") - } - check { - dependsOn(testStableSemconv, testExperimental) + dependsOn(testing.suites.named("testStableSemconv"), testing.suites.named("testExperimental")) } } 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..11561fe261e3 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 } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..af53fc6a58f3 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 } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..2d6ee187b4e0 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") } -tasks { - withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts index 231579a5c1c9..11f196bf9060 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts @@ -56,6 +56,17 @@ testing { } resources { setSrcDirs(listOf("src/test/resources")) + + 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") + } + } + } + } } } @@ -81,13 +92,8 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts index b0b0af1321c3..8c41d6d3b90d 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts @@ -35,20 +35,30 @@ dependencies { latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+") // see elasticsearch-rest-6.4 module } -tasks { - withType().configureEach { + +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") + } + } + } + } + } +} + +tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts index 1e53d35d09f0..3f15b158e7f4 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts @@ -35,18 +35,28 @@ dependencies { latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+") // see elasticsearch-rest-7.0 module } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts index 992f5c71e582..09984df7b844 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts @@ -38,20 +38,30 @@ dependencies { testImplementation("org.testcontainers:elasticsearch") } -tasks { - withType().configureEach { + +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") + } + } + } + } + } +} + +tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.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 df0e3a7d4f36..cf6dec551d40 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts @@ -49,25 +49,41 @@ dependencies { latestDepTestLibrary("org.elasticsearch.client:transport:5.2.+") // see elasticsearch-transport-5.3 module } -tasks { - withType().configureEach { - // required on jdk17 - jvmArgs("--add-opens=java.base/java.nio=ALL-UNNAMED") - jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") - } + } + } + } + } - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") + 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 + jvmArgs("--add-opens=java.base/java.nio=ALL-UNNAMED") + jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } 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 33473220b647..39e41b5d3b4b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts @@ -65,8 +65,34 @@ dependencies { latestDepTestLibrary("org.springframework.data:spring-data-elasticsearch:3.0.+") // see elasticsearch-transport-6.0 module } -tasks { - withType().configureEach { + +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) // required on jdk17 @@ -76,17 +102,7 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - 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/external-annotations/javaagent/build.gradle.kts b/instrumentation/external-annotations/javaagent/build.gradle.kts index 40241cf2c0ed..ab6580a13fd2 100644 --- a/instrumentation/external-annotations/javaagent/build.gradle.kts +++ b/instrumentation/external-annotations/javaagent/build.gradle.kts @@ -34,25 +34,36 @@ dependencies { testCompileOnly("org.springframework:spring-core:4.3.30.RELEASE") } -tasks { - val testIncludeProperty by registering(Test::class) { - filter { - includeTestsMatching("ConfiguredTraceAnnotationsTest") + +testing { + suites { + val testIncludeProperty by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("ConfiguredTraceAnnotationsTest") + } + } + } + } } - include("**/ConfiguredTraceAnnotationsTest.*") - jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass\$InterestingMethod") - } - val testExcludeMethodsProperty by registering(Test::class) { - filter { - includeTestsMatching("TracedMethodsExclusionTest") + val testExcludeMethodsProperty by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("TracedMethodsExclusionTest") + } + } + } + } } - include("**/TracedMethodsExclusionTest.*") - jvmArgs( - "-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]" - ) } +} +tasks { test { filter { excludeTestsMatching("ConfiguredTraceAnnotationsTest") @@ -61,7 +72,7 @@ tasks { } check { - dependsOn(testIncludeProperty) - dependsOn(testExcludeMethodsProperty) + dependsOn(testing.suites.named("testIncludeProperty")) + dependsOn(testing.suites.named("testExcludeMethodsProperty")) } } diff --git a/instrumentation/geode-1.4/javaagent/build.gradle.kts b/instrumentation/geode-1.4/javaagent/build.gradle.kts index 2367a9385f30..a6035df42077 100644 --- a/instrumentation/geode-1.4/javaagent/build.gradle.kts +++ b/instrumentation/geode-1.4/javaagent/build.gradle.kts @@ -19,19 +19,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/graphql-java/graphql-java-20.0/javaagent/build.gradle.kts b/instrumentation/graphql-java/graphql-java-20.0/javaagent/build.gradle.kts index 12c0823a144a..9d7f02569f7b 100644 --- a/instrumentation/graphql-java/graphql-java-20.0/javaagent/build.gradle.kts +++ b/instrumentation/graphql-java/graphql-java-20.0/javaagent/build.gradle.kts @@ -23,19 +23,29 @@ dependencies { testImplementation(project(":instrumentation:graphql-java:graphql-java-common:testing")) } -tasks { - withType().configureEach { - jvmArgs("-Dotel.instrumentation.graphql.add-operation-name-to-span-name.enabled=true") - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - val testDataFetcher by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.graphql.data-fetcher.enabled=true") +testing { + suites { + val testDataFetcher by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.graphql.data-fetcher.enabled=true") systemProperty("metadataConfig", "otel.instrumentation.graphql.data-fetcher.enabled=true") + } + } + } + } + } +} + +tasks { withType().configureEach { + jvmArgs("-Dotel.instrumentation.graphql.add-operation-name-to-span-name.enabled=true") + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } check { - dependsOn(testDataFetcher) + dependsOn(testing.suites.named("testDataFetcher")) } } diff --git a/instrumentation/guava-10.0/javaagent/build.gradle.kts b/instrumentation/guava-10.0/javaagent/build.gradle.kts index 1dd1aa52d4b6..4048ac15d574 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") + } + } + } + } } +} - check { - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) +tasks { check { + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts index f46f2d1bf8ec..ccfcffbd9601 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts @@ -48,8 +48,22 @@ if (findProperty("testLatestDeps") as Boolean) { } } -tasks { - withType().configureEach { + +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 jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true") // required on jdk17 @@ -57,11 +71,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/hibernate/hibernate-4.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts index aa70c11f7a09..6dd61145b983 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts @@ -47,6 +47,16 @@ testing { } resources { setSrcDirs(listOf("src/test/resources")) + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -84,12 +94,8 @@ tasks { jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts index e55b3d811672..7e03fac9ff6b 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts @@ -47,6 +47,16 @@ testing { implementation("org.hibernate:hibernate-core:6.+") } else { implementation("org.hibernate:hibernate-core:6.0.0.Final") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } } @@ -83,12 +93,8 @@ tasks { } } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) dependsOn(testing.suites) } } diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts index 4a00fb6e5a56..1ce299f8145f 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts @@ -24,8 +24,22 @@ otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_17) } -tasks { - withType().configureEach { + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { jvmArgs("-javaagent:" + springAgent.singleFile.absolutePath) // TODO run tests both with and without experimental span attributes @@ -34,11 +48,7 @@ tasks { jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } - 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/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts index dbf4fd8ee5da..ca537a65e172 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts @@ -31,17 +31,27 @@ dependencies { latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // documented limitation } -tasks { - withType().configureEach { - // TODO run tests both with and without experimental span attributes - jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true") + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + // TODO run tests both with and without experimental span attributes + jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true") } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts index 8e60b78a15f3..c1dc9fcf4c3e 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts @@ -40,6 +40,16 @@ testing { implementation("io.vertx:vertx-pg-client:4.1.5") } compileOnly("io.vertx:vertx-codegen:4.1.5") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } @@ -104,13 +114,9 @@ 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")) } } diff --git a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts index 2ed1ce77f193..93fda6ab5ee9 100644 --- a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts @@ -24,19 +24,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")) } } diff --git a/instrumentation/hikaricp-3.0/library/build.gradle.kts b/instrumentation/hikaricp-3.0/library/build.gradle.kts index 73fda349d202..b87ff69b35c9 100644 --- a/instrumentation/hikaricp-3.0/library/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/library/build.gradle.kts @@ -9,12 +9,22 @@ 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") + } + } + } + } } +} - check { - dependsOn(testStableSemconv) +tasks { check { + 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..a7f7905e9afd 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.named("testStableSemconv")) } } diff --git a/instrumentation/jdbc/javaagent/build.gradle.kts b/instrumentation/jdbc/javaagent/build.gradle.kts index 894616e9cf9e..f171a4c998d3 100644 --- a/instrumentation/jdbc/javaagent/build.gradle.kts +++ b/instrumentation/jdbc/javaagent/build.gradle.kts @@ -54,51 +54,70 @@ sourceSets { } } -tasks { - val testSlick by registering(Test::class) { - filter { + +testing { + suites { + val testSlick by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("SlickTest") + } + } + } } - include("**/SlickTest.*") - } - test { - filter { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { excludeTestsMatching("SlickTest") excludeTestsMatching("PreparedStatementParametersTest") + } + } + } } - jvmArgs("-Dotel.instrumentation.jdbc-datasource.enabled=true") - } - val testStableSemconv by registering(Test::class) { - filter { - excludeTestsMatching("SlickTest") - excludeTestsMatching("PreparedStatementParametersTest") + val testSlickStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("SlickTest") + } + } + } } - jvmArgs("-Dotel.instrumentation.jdbc-datasource.enabled=true") - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - val testSlickStableSemconv by registering(Test::class) { - filter { - includeTestsMatching("SlickTest") + val testCaptureParameters by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("PreparedStatementParametersTest") + } + } + } } - include("**/SlickTest.*") - jvmArgs("-Dotel.semconv-stability.opt-in=database") } +} - val testCaptureParameters by registering(Test::class) { +tasks { + test { filter { - includeTestsMatching("PreparedStatementParametersTest") + excludeTestsMatching("SlickTest") + excludeTestsMatching("PreparedStatementParametersTest") } - jvmArgs("-Dotel.instrumentation.jdbc.experimental.capture-query-parameters=true") + jvmArgs("-Dotel.instrumentation.jdbc-datasource.enabled=true") } check { - dependsOn(testSlick) - dependsOn(testStableSemconv) - dependsOn(testSlickStableSemconv) - dependsOn(testCaptureParameters) + dependsOn(testing.suites.named("testSlick")) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testSlickStableSemconv")) + dependsOn(testing.suites.named("testCaptureParameters")) } } diff --git a/instrumentation/jdbc/library/build.gradle.kts b/instrumentation/jdbc/library/build.gradle.kts index 03e0f372c10d..2459ce927117 100644 --- a/instrumentation/jdbc/library/build.gradle.kts +++ b/instrumentation/jdbc/library/build.gradle.kts @@ -15,8 +15,22 @@ dependencies { testImplementation(project(":instrumentation:jdbc:testing")) } -tasks { - // We cannot use "--release" javac option here because that will forbid using apis that were added + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { // We cannot use "--release" javac option here because that will forbid using apis that were added // in later versions. In JDBC wrappers we wish to implement delegation for methods that are not // present in jdk8. compileJava { @@ -51,12 +65,8 @@ tasks { include("io/opentelemetry/javaagent/bootstrap/**") } - 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-1.4/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts index 22293482fb0a..c43f13b2ee27 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts @@ -33,6 +33,16 @@ testing { dependencies { implementation("redis.clients:jedis:2.7.2") 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,8 @@ 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) + dependsOn(testing.suites.named("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..64f69318258f 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 } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..fa45f2a4ffaf 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts @@ -24,18 +24,28 @@ dependencies { testInstrumentation(project(":instrumentation:jedis:jedis-3.0:javaagent")) } -tasks { - withType().configureEach { + +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 jvmArgs("-Djava.net.preferIPv4Stack=true") 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..e33d7ec35d85 100644 --- a/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts +++ b/instrumentation/jms/jms-1.1/javaagent/build.gradle.kts @@ -41,6 +41,17 @@ testing { all { testTask.configure { jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true") + + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("Jms1SuppressReceiveSpansTest") + } + } + } + } } } } @@ -53,13 +64,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 +73,7 @@ tasks { check { dependsOn(testing.suites) - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("testReceiveSpansDisabled")) } } diff --git a/instrumentation/jms/jms-3.0/javaagent/build.gradle.kts b/instrumentation/jms/jms-3.0/javaagent/build.gradle.kts index d52b6ce0be57..ede948b76496 100644 --- a/instrumentation/jms/jms-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jms/jms-3.0/javaagent/build.gradle.kts @@ -33,16 +33,25 @@ otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_11) } -tasks { - test { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - } - val testReceiveSpansDisabled by registering(Test::class) { - filter { +testing { + suites { + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("Jms3SuppressReceiveSpansTest") + } + } + } } - include("**/Jms3SuppressReceiveSpansTest.*") + } +} + +tasks { + test { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } test { @@ -53,6 +62,6 @@ tasks { } check { - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("testReceiveSpansDisabled")) } } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts index 96b8a675cc73..60ea23c8fe14 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts @@ -25,29 +25,40 @@ dependencies { testImplementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - - // TODO run tests both with and without experimental span attributes - jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true") - } - val testPropagationDisabled by registering(Test::class) { - filter { +testing { + suites { + val testPropagationDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("KafkaClientPropagationDisabledTest") + } + } + } } - include("**/KafkaClientPropagationDisabledTest.*") - jvmArgs("-Dotel.instrumentation.kafka.producer-propagation.enabled=false") - } - val testReceiveSpansDisabled by registering(Test::class) { - filter { + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("KafkaClientSuppressReceiveSpansTest") + } + } + } } - include("**/KafkaClientSuppressReceiveSpansTest.*") + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + + // TODO run tests both with and without experimental span attributes + jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true") } test { @@ -59,7 +70,7 @@ tasks { } check { - dependsOn(testPropagationDisabled) - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("testPropagationDisabled")) + dependsOn(testing.suites.named("testReceiveSpansDisabled")) } } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts index b3d3a24ec8a8..c0dddc1ac646 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts @@ -16,18 +16,26 @@ dependencies { testAnnotationProcessor("com.google.auto.value:auto-value") } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - } - val testReceiveSpansDisabled by registering(Test::class) { - filter { +testing { + suites { + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("InterceptorsSuppressReceiveSpansTest") includeTestsMatching("WrapperSuppressReceiveSpansTest") + } + } + } } - include("**/InterceptorsSuppressReceiveSpansTest.*", "**/WrapperSuppressReceiveSpansTest.*") + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } test { @@ -40,6 +48,6 @@ tasks { } check { - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("testReceiveSpansDisabled")) } } diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts b/instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts index 9483d0527bd1..f2512efc3594 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts @@ -23,8 +23,23 @@ dependencies { testImplementation("org.testcontainers:kafka") } -tasks { - withType().configureEach { + +testing { + suites { + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("KafkaStreamsSuppressReceiveSpansTest") + } + } + } + } + } +} + +tasks { withType().configureEach { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) @@ -33,13 +48,6 @@ tasks { jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true") } - val testReceiveSpansDisabled by registering(Test::class) { - filter { - includeTestsMatching("KafkaStreamsSuppressReceiveSpansTest") - } - include("**/KafkaStreamsSuppressReceiveSpansTest.*") - } - test { filter { excludeTestsMatching("KafkaStreamsSuppressReceiveSpansTest") @@ -48,6 +56,6 @@ tasks { } check { - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("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..a5bb39cbd478 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts @@ -17,19 +17,29 @@ dependencies { latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module } -tasks { - withType().configureEach { + +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 jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true") 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..498041978486 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts @@ -24,19 +24,29 @@ dependencies { latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module } -tasks { - withType().configureEach { + +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 jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true") 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..38cff187c4fd 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")) } -tasks { - withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts index 1ea17a553d5d..f0c5874595a0 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts @@ -12,17 +12,27 @@ dependencies { testImplementation(project(":instrumentation:reactor:reactor-3.1:library")) } -tasks { - withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/javaagent/build.gradle.kts index 23a8803c18b7..0e41bac68426 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/build.gradle.kts @@ -45,13 +45,23 @@ tasks.withType().configureEach { systemProperty("testLatestDeps", testLatestDeps) } -tasks { - val testAsync by registering(Test::class) { - jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector") + +testing { + suites { + val testAsync by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector") + } + } + } + } } +} - check { - dependsOn(testAsync) +tasks { check { + dependsOn(testing.suites.named("testAsync")) } } diff --git a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts index e4aac90150d9..7c10e2e74548 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts +++ b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts @@ -17,27 +17,49 @@ dependencies { } } -tasks { - withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") - } +testing { + suites { + val testAsyncLogger by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector") + } + } + } + } - val testAsyncLogger by registering(Test::class) { - jvmArgs("-DLog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector") - } + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code") + } + } + } + } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code") + val testBothSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + } + } + } + } } +} - val testBothSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") +tasks { + withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } check { - dependsOn(testAsyncLogger) - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) + dependsOn(testing.suites.named("testAsyncLogger")) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts index b0f3d1a23c67..f82634ea4b45 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts @@ -11,32 +11,43 @@ dependencies { testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing")) } -tasks { - test { - filter { - excludeTestsMatching("LibraryLog4j2BaggageTest") - excludeTestsMatching("LibraryLog4j2LoggingKeysTest") - } - } - val testAddBaggage by registering(Test::class) { - filter { +testing { + suites { + val testAddBaggage by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("LibraryLog4j2BaggageTest") + } + } + } + } + + val testLoggingKeys by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("LibraryLog4j2LoggingKeysTest") + } + } + } } - jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true") } +} - val testLoggingKeys by registering(Test::class) { +tasks { + test { filter { - includeTestsMatching("LibraryLog4j2LoggingKeysTest") + excludeTestsMatching("LibraryLog4j2BaggageTest") + excludeTestsMatching("LibraryLog4j2LoggingKeysTest") } - jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test") - jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test") - jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test") } named("check") { - dependsOn(testAddBaggage) - dependsOn(testLoggingKeys) + dependsOn(testing.suites.named("testAddBaggage")) + dependsOn(testing.suites.named("testLoggingKeys")) } } diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts index 678322b8df6b..cd5c36f7679f 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts @@ -21,33 +21,44 @@ dependencies { latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.16.+") // see log4j-context-data-2.17 module } -tasks { - test { - filter { - excludeTestsMatching("Log4j27BaggageTest") - excludeTestsMatching("Log4j27LoggingKeysTest") - } - jvmArgs("-Dotel.instrumentation.common.mdc.resource-attributes=service.name,telemetry.sdk.language") - } - val testAddBaggage by registering(Test::class) { - filter { +testing { + suites { + val testAddBaggage by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("Log4j27BaggageTest") + } + } + } + } + + val testLoggingKeys by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("Log4j27LoggingKeysTest") + } + } + } } - jvmArgs("-Dotel.instrumentation.log4j-context-data.add-baggage=true") } +} - val testLoggingKeys by registering(Test::class) { +tasks { + test { filter { - includeTestsMatching("Log4j27LoggingKeysTest") + excludeTestsMatching("Log4j27BaggageTest") + excludeTestsMatching("Log4j27LoggingKeysTest") } - jvmArgs("-Dotel.instrumentation.common.logging.trace-id=trace_id_test") - jvmArgs("-Dotel.instrumentation.common.logging.span-id=span_id_test") - jvmArgs("-Dotel.instrumentation.common.logging.trace-flags=trace_flags_test") + jvmArgs("-Dotel.instrumentation.common.mdc.resource-attributes=service.name,telemetry.sdk.language") } named("check") { - dependsOn(testAddBaggage) - dependsOn(testLoggingKeys) + dependsOn(testing.suites.named("testAddBaggage")) + dependsOn(testing.suites.named("testLoggingKeys")) } } diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts index fbc8cf09056a..20448a6ddab3 100644 --- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts @@ -81,6 +81,26 @@ testing { implementation("ch.qos.logback:logback-classic") { version { strictly("1.3.0") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code") + } + } + } + } + + val testBothSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + } + } + } + } } } implementation("org.slf4j:slf4j-api") { @@ -126,18 +146,10 @@ testing { tasks { - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code") - } - - val testBothSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/micrometer/micrometer-1.5/javaagent/build.gradle.kts b/instrumentation/micrometer/micrometer-1.5/javaagent/build.gradle.kts index 66ab5db32fdc..be83deb020e8 100644 --- a/instrumentation/micrometer/micrometer-1.5/javaagent/build.gradle.kts +++ b/instrumentation/micrometer/micrometer-1.5/javaagent/build.gradle.kts @@ -19,31 +19,45 @@ dependencies { testImplementation(project(":instrumentation:micrometer:micrometer-1.5:testing")) } -tasks { - val testPrometheusMode by registering(Test::class) { - filter { + +testing { + suites { + val testPrometheusMode by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*PrometheusModeTest") + } + } + } } - include("**/*PrometheusModeTest.*") - jvmArgs("-Dotel.instrumentation.micrometer.prometheus-mode.enabled=true") - } - val testBaseTimeUnit by registering(Test::class) { - filter { + val testBaseTimeUnit by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*TimerMillisecondsTest") + } + } + } } - include("**/*TimerMillisecondsTest.*") - jvmArgs("-Dotel.instrumentation.micrometer.base-time-unit=milliseconds") - } - val testHistogramGauges by registering(Test::class) { - filter { + val testHistogramGauges by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*HistogramGaugesTest") + } + } + } } - include("**/*HistogramGaugesTest.*") - jvmArgs("-Dotel.instrumentation.micrometer.histogram-gauges.enabled=true") } +} +tasks { test { filter { excludeTestsMatching("*TimerMillisecondsTest") @@ -53,9 +67,9 @@ tasks { } check { - dependsOn(testBaseTimeUnit) - dependsOn(testPrometheusMode) - dependsOn(testHistogramGauges) + dependsOn(testing.suites.named("testBaseTimeUnit")) + dependsOn(testing.suites.named("testPrometheusMode")) + dependsOn(testing.suites.named("testHistogramGauges")) } withType().configureEach { diff --git a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts index 6d5716d02711..1b6fecad3869 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts index c0376f9c0f11..820effc4a4d4 100644 --- a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts @@ -12,16 +12,26 @@ dependencies { testImplementation(project(":instrumentation:mongo:mongo-3.1:testing")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..7c428059baa0 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..c154a9076f87 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..875b85e1cba6 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..1ffb0e94cd88 100644 --- a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts +++ b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts @@ -35,18 +35,24 @@ dependencies { latestDepTestLibrary("io.netty:netty-codec-http:4.0.+") // see netty-4.1 module } -tasks { - val testConnectionSpan by registering(Test::class) { - filter { + +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") } +} +tasks { test { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") @@ -57,7 +63,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/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts index d67ed6f01858..cfda558350ed 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts @@ -39,16 +39,27 @@ dependencies { latestDepTestLibrary("org.opensearch.client:opensearch-rest-client:2.+") // see opensearch-rest-3.0 module } + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { test { 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/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts index 951deb88b4e9..c5096a98e3b0 100644 --- a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts @@ -32,16 +32,27 @@ dependencies { testImplementation(project(":instrumentation:opensearch:opensearch-rest-common:testing")) } + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { test { 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/opentelemetry-instrumentation-api/javaagent/build.gradle.kts b/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts index 57a75a08004b..60b10852c6ec 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts @@ -39,6 +39,26 @@ testing { implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:$oldServerSpanVersion") implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") implementation(project(":instrumentation:opentelemetry-instrumentation-api:testing")) + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code") + } + } + } + } + + val testBothSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + } + } + } + } } } } @@ -67,17 +87,9 @@ configurations.configureEach { tasks { - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code") - } - - val testBothSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts b/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts index 9af1f2963c2b..94a2c45124dd 100644 --- a/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts +++ b/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts @@ -22,20 +22,31 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" -tasks { - test { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", collectMetadata) - } - 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 { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", collectMetadata) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/oracle-ucp-11.2/library/build.gradle.kts b/instrumentation/oracle-ucp-11.2/library/build.gradle.kts index b9b6020e3e2d..e70e5b353577 100644 --- a/instrumentation/oracle-ucp-11.2/library/build.gradle.kts +++ b/instrumentation/oracle-ucp-11.2/library/build.gradle.kts @@ -10,16 +10,27 @@ dependencies { testImplementation(project(":instrumentation:oracle-ucp-11.2:testing")) } + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } + } +} + tasks { test { 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/oshi/javaagent/build.gradle.kts b/instrumentation/oshi/javaagent/build.gradle.kts index b8bf11ee38bd..df58249e0365 100644 --- a/instrumentation/oshi/javaagent/build.gradle.kts +++ b/instrumentation/oshi/javaagent/build.gradle.kts @@ -22,18 +22,28 @@ dependencies { testImplementation(project(":instrumentation:oshi:testing")) } -tasks { - withType().configureEach { - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.oshi.experimental-metrics.enabled=true") +testing { + suites { + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.oshi.experimental-metrics.enabled=true") systemProperty("testExperimental", "true") systemProperty("metadataConfig", "otel.instrumentation.oshi.experimental-metrics.enabled=true") + } + } + } + } + } +} + +tasks { withType().configureEach { + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } check { - dependsOn(testExperimental) + dependsOn(testing.suites.named("testExperimental")) } } diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/build.gradle.kts b/instrumentation/pulsar/pulsar-2.8/javaagent/build.gradle.kts index a0f01abb60b3..030296ffaca8 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/build.gradle.kts +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/build.gradle.kts @@ -19,14 +19,23 @@ dependencies { testImplementation("org.apache.pulsar:pulsar-client-admin:2.8.0") } -tasks { - val testReceiveSpanDisabled by registering(Test::class) { - filter { + +testing { + suites { + val testReceiveSpanDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("PulsarClientSuppressReceiveSpansTest") + } + } + } } - include("**/PulsarClientSuppressReceiveSpansTest.*") } +} +tasks { test { filter { excludeTestsMatching("PulsarClientSuppressReceiveSpansTest") @@ -35,7 +44,7 @@ tasks { } check { - dependsOn(testReceiveSpanDisabled) + dependsOn(testing.suites.named("testReceiveSpanDisabled")) } } diff --git a/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts b/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts index 6c80b8f7aa1c..7ca9cf01cd54 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } 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..65010f9999a3 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")) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts index 0fa3c63fd407..084f0b2dc874 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts @@ -51,6 +51,26 @@ testing { implementation(project(":instrumentation-annotations")) val version = if (testLatestDeps) "latest.release" else "3.1.0.RELEASE" implementation("io.projectreactor:reactor-test:$version") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code") + } + } + } + } + + val testBothSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") + } + } + } + } } } } @@ -58,17 +78,9 @@ testing { tasks { - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code") - } - - val testBothSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=code/dup") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) - dependsOn(testBothSemconv) + dependsOn(testing.suites.named("testStableSemconv")) + dependsOn(testing.suites.named("testBothSemconv")) } } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts index a5d9f62bc544..f32350637b31 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts @@ -31,16 +31,23 @@ dependencies { latestDepTestLibrary("io.projectreactor.netty:reactor-netty:0.+") // see reactor-netty-1.0 modules } -tasks { - val testConnectionSpan by registering(Test::class) { - filter { + +testing { + suites { + val testConnectionSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("ReactorNettyConnectionSpanTest") + } + } + } } - include("**/ReactorNettyConnectionSpanTest.*") - jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true") - jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } +} +tasks { test { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") @@ -50,6 +57,6 @@ tasks { } check { - dependsOn(testConnectionSpan) + dependsOn(testing.suites.named("testConnectionSpan")) } } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts index c54a3abed42e..8c424ced50d9 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts @@ -43,18 +43,24 @@ dependencies { testImplementation(project(":instrumentation-annotations")) } -tasks { - val testConnectionSpan by registering(Test::class) { - filter { + +testing { + suites { + val testConnectionSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("ReactorNettyConnectionSpanTest") includeTestsMatching("ReactorNettyClientSslTest") + } + } + } } - include("**/ReactorNettyConnectionSpanTest.*", "**/ReactorNettyClientSslTest.*") - jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true") - jvmArgs("-Dotel.instrumentation.reactor-netty.connection-telemetry.enabled=true") - jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } +} +tasks { test { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") @@ -65,6 +71,6 @@ tasks { } check { - dependsOn(testConnectionSpan) + dependsOn(testing.suites.named("testConnectionSpan")) } } diff --git a/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts b/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts index 3eabc34c913b..3afae2bde22a 100644 --- a/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts +++ b/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts @@ -24,17 +24,27 @@ dependencies { testImplementation(project(":instrumentation:redisson:redisson-common:testing")) } -tasks { - withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + +testing { + suites { + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } +} - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") +tasks { withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts index bb76d29aa456..8ff6b42d7532 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts @@ -17,14 +17,23 @@ dependencies { testImplementation(project(":instrumentation:rocketmq:rocketmq-client:rocketmq-client-5.0:testing")) } -tasks { - val testReceiveSpanDisabled by registering(Test::class) { - filter { + +testing { + suites { + val testReceiveSpanDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("RocketMqClientSuppressReceiveSpanTest") + } + } + } } - include("**/RocketMqClientSuppressReceiveSpanTest.*") } +} +tasks { test { filter { excludeTestsMatching("RocketMqClientSuppressReceiveSpanTest") @@ -34,6 +43,6 @@ tasks { } check { - dependsOn(testReceiveSpanDisabled) + dependsOn(testing.suites.named("testReceiveSpanDisabled")) } } diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts index 71360a6a8ba7..0dfceeeffc37 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts @@ -19,31 +19,45 @@ tasks.register("generateDocs", JavaExec::class) { systemProperties.set("jfr.readme.path", project.projectDir.toString() + "/README.md") } -tasks { - val testG1 by registering(Test::class) { - filter { + +testing { + suites { + val testG1 by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*G1GcMemoryMetricTest*") + } + } + } } - include("**/*G1GcMemoryMetricTest.*") - jvmArgs("-XX:+UseG1GC") - } - val testPS by registering(Test::class) { - filter { + val testPS by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*PsGcMemoryMetricTest*") + } + } + } } - include("**/*PsGcMemoryMetricTest.*") - jvmArgs("-XX:+UseParallelGC") - } - val testSerial by registering(Test::class) { - filter { + val testSerial by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*SerialGcMemoryMetricTest*") + } + } + } } - include("**/*SerialGcMemoryMetricTest.*") - jvmArgs("-XX:+UseSerialGC") } +} +tasks { test { filter { excludeTestsMatching("*G1GcMemoryMetricTest") @@ -53,9 +67,9 @@ tasks { } check { - dependsOn(testG1) - dependsOn(testPS) - dependsOn(testSerial) + dependsOn(testing.suites.named("testG1")) + dependsOn(testing.suites.named("testPS")) + dependsOn(testing.suites.named("testSerial")) } compileJava { diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts index 521afc23385b..3452dfea4301 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts @@ -24,24 +24,35 @@ dependencies { latestDepTestLibrary("org.springframework.batch:spring-batch-core:4.+") // documented limitation } -tasks { - val testChunkRootSpan by registering(Test::class) { - filter { + +testing { + suites { + val testChunkRootSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*ChunkRootSpanTest") + } + } + } } - include("**/*ChunkRootSpanTest.*") - jvmArgs("-Dotel.instrumentation.spring-batch.experimental.chunk.new-trace=true") - } - val testItemLevelSpan by registering(Test::class) { - filter { + val testItemLevelSpan by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("*ItemLevelSpanTest") includeTestsMatching("*CustomSpanEventTest") + } + } + } } - include("**/*ItemLevelSpanTest.*", "**/*CustomSpanEventTest.*") - jvmArgs("-Dotel.instrumentation.spring-batch.item.enabled=true") } +} +tasks { test { filter { excludeTestsMatching("*ChunkRootSpanTest") @@ -54,8 +65,8 @@ tasks { } check { - dependsOn(testChunkRootSpan) - dependsOn(testItemLevelSpan) + dependsOn(testing.suites.named("testChunkRootSpan")) + dependsOn(testing.suites.named("testItemLevelSpan")) } withType().configureEach { diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index 8ac5e0c57289..807be4ffb5d7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -138,6 +138,16 @@ testing { implementation("ch.qos.logback:logback-classic") { version { strictly("1.2.11") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } implementation("org.slf4j:slf4j-api") { @@ -220,12 +230,8 @@ tasks { from(sourceSets["javaSpring3"].java) } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts index c6b29a675883..1ef796c46e19 100644 --- a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts @@ -45,8 +45,23 @@ dependencies { latestDepTestLibrary("org.springframework:spring-test:5.+") // see spring-data-3.0:testing module } -tasks { - withType().configureEach { + +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") + } + } + } + } + } +} + +tasks { withType().configureEach { jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED") jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") @@ -55,12 +70,7 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") - } - check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts index ae7755f0fca2..88e3d81ab39b 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts @@ -34,6 +34,16 @@ testing { implementation("org.testcontainers:testcontainers") implementation("io.r2dbc:r2dbc-h2:1.0.0.RELEASE") implementation("com.h2database:h2:1.4.197") + + val testStableSemconv by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.semconv-stability.opt-in=database") + } + } + } + } } } } @@ -47,12 +57,8 @@ tasks { jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") } - val testStableSemconv by registering(Test::class) { - jvmArgs("-Dotel.semconv-stability.opt-in=database") - } - check { dependsOn(testing.suites) - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts index a08a119ae605..c861aca11ef7 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts @@ -40,28 +40,34 @@ dependencies { latestDepTestLibrary("org.springframework.cloud:spring-cloud-stream-binder-rabbit:3.+") // documented limitation } -tasks { - val testWithRabbitInstrumentation by registering(Test::class) { - filter { + +testing { + suites { + val testWithRabbitInstrumentation by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("SpringIntegrationAndRabbitTest") + } + } + } } - include("**/SpringIntegrationAndRabbitTest.*") - jvmArgs("-Dotel.instrumentation.rabbitmq.enabled=true") - jvmArgs("-Dotel.instrumentation.spring-rabbit.enabled=true") - systemProperty("metadataConfig", "otel.instrumentation.spring-rabbit.enabled=true") - } - val testWithProducerInstrumentation by registering(Test::class) { - filter { + val testWithProducerInstrumentation by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("SpringCloudStreamProducerTest") + } + } + } } - include("**/SpringCloudStreamProducerTest.*") - jvmArgs("-Dotel.instrumentation.rabbitmq.enabled=false") - jvmArgs("-Dotel.instrumentation.spring-rabbit.enabled=false") - jvmArgs("-Dotel.instrumentation.spring-integration.producer.enabled=true") - systemProperty("metadataConfig", "otel.instrumentation.spring-integration.producer.enabled=true") } +} +tasks { test { filter { excludeTestsMatching("SpringIntegrationAndRabbitTest") @@ -72,8 +78,8 @@ tasks { } check { - dependsOn(testWithRabbitInstrumentation) - dependsOn(testWithProducerInstrumentation) + dependsOn(testing.suites.named("testWithRabbitInstrumentation")) + dependsOn(testing.suites.named("testWithProducerInstrumentation")) } withType().configureEach { diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts index fb2af9e1cc42..3bb58bdcf643 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts @@ -34,17 +34,25 @@ otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_17) } -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - } - val testReceiveSpansDisabled by registering(Test::class) { - filter { +testing { + suites { + val testReceiveSpansDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { includeTestsMatching("SpringListenerSuppressReceiveSpansTest") + } + } + } } - include("**/SpringListenerSuppressReceiveSpansTest.*") + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } test { @@ -55,6 +63,6 @@ tasks { } check { - dependsOn(testReceiveSpansDisabled) + dependsOn(testing.suites.named("testReceiveSpansDisabled")) } } diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts index c120df885619..39147dd26c9e 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts @@ -20,8 +20,23 @@ dependencies { testLibrary("org.springframework:spring-context:3.2.3.RELEASE") } -tasks { - withType().configureEach { + +testing { + suites { + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + jvmArgs("-Dotel.instrumentation.spring-scheduling.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-scheduling.experimental-span-attributes=true") + } + } + } + } + } +} + +tasks { withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") @@ -29,10 +44,7 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } - val testExperimental by registering(Test::class) { - jvmArgs("-Dotel.instrumentation.spring-scheduling.experimental-span-attributes=true") - systemProperty("metadataConfig", "otel.instrumentation.spring-scheduling.experimental-span-attributes=true") - } + } val latestDepTest = findProperty("testLatestDeps") as Boolean diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts index 0c6ae9682ea2..9adbf93651ca 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts @@ -43,8 +43,23 @@ dependencies { latestDepTestLibrary("org.springframework.boot:spring-boot-starter-security:2.+") // see spring-webmvc-6.0 module } -tasks { - withType().configureEach { + +testing { + suites { + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") + jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") + } + } + } + } + } +} + +tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) // required on jdk17 @@ -56,13 +71,8 @@ tasks { jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true") } - val testExperimental by registering(Test::class) { - systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") - jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") - } - check { - dependsOn(testExperimental) + dependsOn(testing.suites.named("testExperimental")) } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts index 640dc885e125..cc1bc9f742b0 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts @@ -44,8 +44,23 @@ otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_17) } -tasks { - withType().configureEach { + +testing { + suites { + val testExperimental by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") + jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") + } + } + } + } + } +} + +tasks { withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") @@ -56,12 +71,7 @@ tasks { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } - val testExperimental by registering(Test::class) { - systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") - jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") - } - check { - dependsOn(testExperimental) + dependsOn(testing.suites.named("testExperimental")) } } diff --git a/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts b/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts index 0f3c5a4ff953..2b66da10f450 100644 --- a/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts +++ b/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts @@ -20,18 +20,28 @@ dependencies { testImplementation("com.google.guava:guava") } -tasks { - withType().configureEach { + +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 jvmArgs("-Dotel.instrumentation.spymemcached.experimental-span-attributes=true") 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/tomcat/tomcat-jdbc/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts index 0bc199140cd1..c32014a5eee7 100644 --- a/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts +++ b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts @@ -18,19 +18,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")) } } diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts index 64fe65fce14b..b5447330f7f6 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts @@ -22,20 +22,30 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", collectMetadata) - } - 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 { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", collectMetadata) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts index 082cd49cadd7..b5011dc32ffc 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts @@ -30,20 +30,30 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", collectMetadata) - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", collectMetadata) } check { - dependsOn(testStableSemconv) + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts index 4fa02754e0df..68e7e6c870f6 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts @@ -30,19 +30,29 @@ dependencies { val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false" -tasks { - withType().configureEach { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) - systemProperty("collectMetadata", collectMetadata) - } - 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("metadataConfig", "otel.semconv-stability.opt-in=database") + } + } + } + } + } +} + +tasks { withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("collectMetadata", collectMetadata) } 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 f2011616fb2d..f1fc587f91ff 100644 --- a/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.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/vibur-dbcp-11.0/library/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts index 9f0a4b44cb9c..b7e5ecb6fdf2 100644 --- a/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts @@ -9,12 +9,22 @@ 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") + } + } + } + } } +} - check { - dependsOn(testStableSemconv) +tasks { check { + dependsOn(testing.suites.named("testStableSemconv")) } } diff --git a/testing-common/integration-tests/build.gradle.kts b/testing-common/integration-tests/build.gradle.kts index 067d71082b13..f39b8f946c90 100644 --- a/testing-common/integration-tests/build.gradle.kts +++ b/testing-common/integration-tests/build.gradle.kts @@ -27,28 +27,36 @@ dependencies { testImplementation("net.sf.jt400:jt400:6.1") } -tasks { - val testFieldInjectionDisabled by registering(Test::class) { - filter { - includeTestsMatching("context.FieldInjectionDisabledTest") + +testing { + suites { + val testFieldInjectionDisabled by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("context.FieldInjectionDisabledTest") + } + } + } + } } - include("**/FieldInjectionDisabledTest.*") - jvmArgs("-Dotel.javaagent.experimental.field-injection.enabled=false") - } - val testFieldBackedImplementation by registering(Test::class) { - filter { - includeTestsMatching("context.FieldBackedImplementationTest") + val testFieldBackedImplementation by registering(JvmTestSuite::class) { + targets { + all { + testTask.configure { + filter { + includeTestsMatching("context.FieldBackedImplementationTest") + } + } + } + } } - include("**/FieldBackedImplementationTest.*") - // this test uses reflection to access fields generated by FieldBackedProvider - // internal-reflection needs to be disabled because it removes these fields from reflection results. - jvmArgs("-Dotel.instrumentation.internal-reflection.enabled=false") - // required on jdk17 - jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") - jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } +} +tasks { test { filter { excludeTestsMatching("context.FieldInjectionDisabledTest") @@ -59,7 +67,7 @@ tasks { } check { - dependsOn(testFieldInjectionDisabled) - dependsOn(testFieldBackedImplementation) + dependsOn(testing.suites.named("testFieldInjectionDisabled")) + dependsOn(testing.suites.named("testFieldBackedImplementation")) } }