From 3c8b1875190c1c14ce22ef372a0b252c5031af34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Nov 2025 14:29:16 +0000 Subject: [PATCH 1/2] fix(deps): update dependency org.testcontainers:testcontainers-bom to v2 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 2b222ed789b..3ba7055af5c 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -36,7 +36,7 @@ val DEPENDENCY_BOMS = listOf( "io.zipkin.brave:brave-bom:6.3.0", "io.zipkin.reporter2:zipkin-reporter-bom:3.5.1", "org.assertj:assertj-bom:3.27.6", - "org.testcontainers:testcontainers-bom:1.21.3", + "org.testcontainers:testcontainers-bom:2.0.2", "org.snakeyaml:snakeyaml-engine:2.10" ) From 02ee755bfc6de8645cc4231db068f5464e184b90 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Tue, 25 Nov 2025 10:03:12 -0600 Subject: [PATCH 2/2] fix build --- exporters/prometheus/build.gradle.kts | 2 +- exporters/zipkin/build.gradle.kts | 2 +- integration-tests/build.gradle.kts | 2 +- integration-tests/otlp/build.gradle.kts | 2 +- integration-tests/tracecontext/build.gradle.kts | 2 +- .../tracecontext/TraceContextIntegrationTest.java | 1 + perf-harness/build.gradle.kts | 2 +- sdk-extensions/jaeger-remote-sampler/build.gradle.kts | 4 ++-- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/exporters/prometheus/build.gradle.kts b/exporters/prometheus/build.gradle.kts index 492c7085ba7..299e741425e 100644 --- a/exporters/prometheus/build.gradle.kts +++ b/exporters/prometheus/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testImplementation("com.linecorp.armeria:armeria-grpc-protocol") testImplementation("com.fasterxml.jackson.jr:jackson-jr-stree") testImplementation("com.fasterxml.jackson.jr:jackson-jr-objects") - testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") } tasks { diff --git a/exporters/zipkin/build.gradle.kts b/exporters/zipkin/build.gradle.kts index 1636cd7ace8..bee1da945c4 100644 --- a/exporters/zipkin/build.gradle.kts +++ b/exporters/zipkin/build.gradle.kts @@ -22,5 +22,5 @@ dependencies { testImplementation(project(":sdk:testing")) testImplementation("com.linecorp.armeria:armeria") - testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") } diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index 90dae0aaf1a..83d6c2c2ba9 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { testImplementation("com.linecorp.armeria:armeria-junit5") testImplementation("org.junit.jupiter:junit-jupiter-params") - testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") } diff --git a/integration-tests/otlp/build.gradle.kts b/integration-tests/otlp/build.gradle.kts index 5f67edda0e1..977ed7ff73e 100644 --- a/integration-tests/otlp/build.gradle.kts +++ b/integration-tests/otlp/build.gradle.kts @@ -6,7 +6,7 @@ description = "OTLP Exporter Integration Tests" otelJava.moduleName.set("io.opentelemetry.integration.tests.otlp") dependencies { - api("org.testcontainers:junit-jupiter") + api("org.testcontainers:testcontainers-junit-jupiter") implementation(project(":exporters:otlp:all")) implementation(project(":api:incubator")) diff --git a/integration-tests/tracecontext/build.gradle.kts b/integration-tests/tracecontext/build.gradle.kts index 17b01ecddb7..bad01107a42 100644 --- a/integration-tests/tracecontext/build.gradle.kts +++ b/integration-tests/tracecontext/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation("com.linecorp.armeria:armeria") - testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") } tasks { diff --git a/integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java b/integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java index 64b6ef19f37..4b8921b67f7 100644 --- a/integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java +++ b/integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java @@ -35,6 +35,7 @@ class TraceContextIntegrationTest { MountableFile.forHostPath(System.getProperty("io.opentelemetry.testArchive")), "/opt/app.jar"); + @SuppressWarnings("UnusedVariable") @Container private static final GenericContainer testSuiteContainer = new GenericContainer<>( diff --git a/perf-harness/build.gradle.kts b/perf-harness/build.gradle.kts index 1d95259447a..c73ec2ad29c 100644 --- a/perf-harness/build.gradle.kts +++ b/perf-harness/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(project(":exporters:logging")) implementation("eu.rekawek.toxiproxy:toxiproxy-java") - implementation("org.testcontainers:junit-jupiter") + implementation("org.testcontainers:testcontainers-junit-jupiter") runtimeOnly("io.grpc:grpc-netty-shaded") } diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts index bb85cadc39a..871fd46b065 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testImplementation("com.google.protobuf:protobuf-java") testImplementation("com.linecorp.armeria:armeria-junit5") testImplementation("com.linecorp.armeria:armeria-grpc-protocol") - testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") } testing { @@ -44,7 +44,7 @@ testing { implementation("com.google.protobuf:protobuf-java") implementation("com.linecorp.armeria:armeria-junit5") implementation("com.linecorp.armeria:armeria-grpc-protocol") - implementation("org.testcontainers:junit-jupiter") + implementation("org.testcontainers:testcontainers-junit-jupiter") implementation("io.grpc:grpc-netty") implementation("io.grpc:grpc-stub") }