Skip to content

Revert JvmTestSuite changes #14550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 31, 2025
Merged

Revert JvmTestSuite changes #14550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
caf0169
working through
jaydeluca Aug 29, 2025
9536144
the rest
jaydeluca Aug 29, 2025
a2161c8
last 3
jaydeluca Aug 29, 2025
2a0f709
spotless
jaydeluca Aug 30, 2025
82c21fe
fix jdbc
jaydeluca Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions instrumentation-api-incubator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,6 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
}

testing {
suites {
val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
}
}
}
}

val testBothSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
}
}
}
}
}
}

tasks {
// exclude auto-generated code
named<Checkstyle>("checkstyleMain") {
Expand All @@ -69,7 +45,19 @@ tasks {
dependsOn("generateJflex")
}

val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
}

val testBothSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
}

check {
dependsOn(testing.suites)
dependsOn(testStableSemconv, testBothSemconv)
}
}
24 changes: 8 additions & 16 deletions instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,20 @@ dependencies {

val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"

testing {
suites {
val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("collectMetadata", collectMetadata)
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}
}
}
}
tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath
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(testing.suites)
dependsOn(testStableSemconv)
}
}
20 changes: 6 additions & 14 deletions instrumentation/alibaba-druid-1.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,14 @@ dependencies {
testImplementation(project(":instrumentation:alibaba-druid-1.0:testing"))
}

testing {
suites {
val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}
}
}
}
tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}
}

tasks {
check {
dependsOn(testing.suites)
dependsOn(testStableSemconv)
}
}
25 changes: 9 additions & 16 deletions instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,21 @@ dependencies {

val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"

testing {
suites {
val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("collectMetadata", collectMetadata)
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}
}
}
}
tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

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(testing.suites)
dependsOn(testStableSemconv)
}
}
21 changes: 7 additions & 14 deletions instrumentation/apache-dbcp-2.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,15 @@ dependencies {
testImplementation(project(":instrumentation:apache-dbcp-2.0:testing"))
}

testing {
suites {
val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}
}
}
}
tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

jvmArgs("-Dotel.semconv-stability.opt-in=database")
}
}

tasks {
check {
dependsOn(testing.suites)
dependsOn(testStableSemconv)
}
}
25 changes: 13 additions & 12 deletions instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,6 @@ testing {
}
}
}

val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("collectMetadata", collectMetadata)
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}
}
}
}
}
}

Expand All @@ -166,6 +154,19 @@ tasks {
jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true")
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}

val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("collectMetadata", collectMetadata)
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}

check {
dependsOn(testStableSemconv)
}
}

if (!(findProperty("testLatestDeps") as Boolean)) {
Expand Down
29 changes: 11 additions & 18 deletions instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,22 @@ dependencies {
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
}

testing {
suites {
val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
filter {
includeTestsMatching("SqsSuppressReceiveSpansTest")
}
include("**/SqsSuppressReceiveSpansTest.*")
}
}
}
}
}
}

tasks {
withType<Test>().configureEach {
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "Test-Message-Header")
}

val testReceiveSpansDisabled by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

filter {
includeTestsMatching("SqsSuppressReceiveSpansTest")
}
include("**/SqsSuppressReceiveSpansTest.*")
}

test {
filter {
excludeTestsMatching("SqsSuppressReceiveSpansTest")
Expand All @@ -54,7 +47,7 @@ tasks {
}

check {
dependsOn(testing.suites)
dependsOn(testReceiveSpansDisabled)
}
}

Expand Down
18 changes: 7 additions & 11 deletions instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,17 @@ testing {
implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
}
}

val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}
}
}
}
}
}

tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}

check {
dependsOn(testing.suites)
dependsOn(testing.suites, testStableSemconv)
}
}
71 changes: 29 additions & 42 deletions instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,53 +171,40 @@ testing {
}
}

testing {
suites {
val testExperimentalSqs by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
filter {
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
}
}
}
}
tasks {
val testExperimentalSqs by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
filter {
includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
include("**/Aws2SqsSuppressReceiveSpansTest.*")
}
}
}
filter {
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", "true")
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
}

val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
filter {
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}
}
}
val testReceiveSpansDisabled by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

filter {
includeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
include("**/Aws2SqsSuppressReceiveSpansTest.*")
}
}

tasks {
val testStableSemconv by registering(Test::class) {
testClassesDirs = sourceSets.test.get().output.classesDirs
classpath = sourceSets.test.get().runtimeClasspath

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

test {
filter {
Expand All @@ -228,7 +215,7 @@ tasks {
}

check {
dependsOn(testing.suites)
dependsOn(testing.suites, testExperimentalSqs, testStableSemconv, testReceiveSpansDisabled)
}

withType<Test>().configureEach {
Expand Down
Loading