Skip to content

Gradle test fixes #14542

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 14 commits into from
Aug 29, 2025
Merged

Gradle test fixes #14542

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f50dbb8
batch 1
jaydeluca Aug 28, 2025
ebb3d53
batch 2
jaydeluca Aug 28, 2025
6aba385
batch 3
jaydeluca Aug 28, 2025
e969310
batch 4
jaydeluca Aug 28, 2025
c357876
batch 5
jaydeluca Aug 28, 2025
7b03ed5
batch 6
jaydeluca Aug 28, 2025
9a3eabc
batch 7
jaydeluca Aug 28, 2025
a93d50e
batch 8
jaydeluca Aug 28, 2025
7b13a3b
batch 9 partial
jaydeluca Aug 28, 2025
130e72b
batch 9
jaydeluca Aug 28, 2025
fa824f4
batch 10 - final completion
jaydeluca Aug 28, 2025
618e378
fix missing test suite definition for mongo-4.0
jaydeluca Aug 28, 2025
fb35bd6
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instru…
jaydeluca Aug 28, 2025
b00697c
use simpler dependsOn where possible
jaydeluca Aug 29, 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
36 changes: 26 additions & 10 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,6 +28,30 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
}

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

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

tasks {
// exclude auto-generated code
named<Checkstyle>("checkstyleMain") {
Expand All @@ -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"))
Copy link
Member

@trask trask Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we have this everywhere for consistency (and so we know we aren't missing any)?

check {
  dependsOn(testing.suites)
}

}
}
23 changes: 16 additions & 7 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,19 +21,28 @@ dependencies {

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

tasks {
val testStableSemconv by registering(Test::class) {
jvmArgs("-Dotel.semconv-stability.opt-in=database")

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

tasks {
test {
systemProperty("collectMetadata", collectMetadata)
}

check {
dependsOn(testStableSemconv)
dependsOn(testing.suites.named("testStableSemconv"))
}
}
18 changes: 14 additions & 4 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,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"))
}
}
23 changes: 16 additions & 7 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,19 +21,28 @@ dependencies {

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

tasks {
val testStableSemconv by registering(Test::class) {
jvmArgs("-Dotel.semconv-stability.opt-in=database")

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

tasks {
test {
systemProperty("collectMetadata", collectMetadata)
}

check {
dependsOn(testStableSemconv)
dependsOn(testing.suites.named("testStableSemconv"))
}
}
18 changes: 14 additions & 4 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,12 +9,22 @@ dependencies {
testImplementation(project(":instrumentation:apache-dbcp-2.0:testing"))
}

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

tasks {
check {
dependsOn(testStableSemconv)
dependsOn(testing.suites.named("testStableSemconv"))
}
}
21 changes: 13 additions & 8 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,6 +128,18 @@ testing {
}
}
}

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

Expand All @@ -144,15 +156,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 {
Expand Down
26 changes: 18 additions & 8 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,19 +23,29 @@ dependencies {
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
}

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

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

val testReceiveSpansDisabled by registering(Test::class) {
filter {
includeTestsMatching("SqsSuppressReceiveSpansTest")
}
include("**/SqsSuppressReceiveSpansTest.*")
}

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

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

Expand Down
15 changes: 10 additions & 5 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,16 +48,21 @@ testing {
implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
}
}

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

tasks {
val testStableSemconv by registering(Test::class) {
jvmArgs("-Dotel.semconv-stability.opt-in=database")
}

check {
dependsOn(testing.suites)
dependsOn(testStableSemconv)
}
}
77 changes: 49 additions & 28 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,21 +171,53 @@ testing {
}
}

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

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

val testStableSemconv by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
filter {
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
jvmArgs("-Dotel.semconv-stability.opt-in=database")
systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
}
}
}
}
include("**/Aws2SqsSuppressReceiveSpansTest.*")
}
}

tasks {

test {
filter {
Expand All @@ -196,9 +228,12 @@ tasks {
}

check {
dependsOn(testExperimentalSqs)
dependsOn(testReceiveSpansDisabled)
dependsOn(testing.suites)
dependsOn(testing.suites.named("testExperimentalSqs"))
dependsOn(testing.suites.named("testReceiveSpansDisabled"))
dependsOn(testing.suites.named("testStableSemconv"))
dependsOn(testing.suites.named("s3PresignerTest"))
dependsOn(testing.suites.named("s3CrtTest"))
dependsOn(testing.suites.named("testBedrockRuntime"))
}

withType<Test>().configureEach {
Expand All @@ -214,18 +249,4 @@ tasks {
include("software/amazon/awssdk/global/handlers/execution.interceptors")
}
}

val testStableSemconv by registering(Test::class) {
filter {
excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
}
systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
jvmArgs("-Dotel.semconv-stability.opt-in=database")

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

check {
dependsOn(testStableSemconv)
}
}
Loading