Skip to content

Bump org.testcontainers:testcontainers from 1.21.3 to 2.0.0 #4502

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 6 commits into from
Oct 16, 2025
Merged

Bump org.testcontainers:testcontainers from 1.21.3 to 2.0.0 #4502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
587cf71
Bump org.testcontainers:testcontainers from 1.21.3 to 2.0.0
dependabot[bot] Oct 15, 2025
d33b291
Fix breaking changes from testcontainers 2.0.0 upgrade
trask Oct 15, 2025
34de7a6
./gradlew resolveAndLockAll --write-locks
github-actions[bot] Oct 15, 2025
dad90b6
JUnit 5
trask Oct 15, 2025
ad82fd6
fix
trask Oct 15, 2025
b2c0c94
remove
trask Oct 15, 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
2 changes: 1 addition & 1 deletion agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-for-testing/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-profiler/agent-diagnostics/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ org.junit:junit-bom:5.13.4=runtimeClasspath
org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath
org.slf4j:jcl-over-slf4j:2.0.17=runtimeClasspath
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/agent/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/instrumentation/azure-functions/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/instrumentation/methods/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/instrumentation/micrometer-1.0/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion agent/runtime-attach/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
net.bytebuddy:byte-buddy-agent:1.17.6=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion classic-sdk/core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion classic-sdk/web/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtim
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ val DEPENDENCY_BOMS = listOf(
"com.azure:azure-sdk-bom:1.3.0",
"io.netty:netty-bom:4.2.6.Final",
"org.junit:junit-bom:5.13.4",
"org.testcontainers:testcontainers-bom:1.21.3",
"org.testcontainers:testcontainers-bom:2.0.0",
)

val autoServiceVersion = "1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion etw/java/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath
org.junit:junit-bom:5.13.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
org.testcontainers:testcontainers-bom:2.0.0=runtimeClasspath
empty=
2 changes: 1 addition & 1 deletion smoke-tests/apps/Kafka/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependencies {
implementation("org.springframework.kafka:spring-kafka:2.3.1.RELEASE")
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
implementation("org.apache.httpcomponents:httpclient:4.5.13")
implementation("org.testcontainers:kafka:1.17.3")
implementation("org.testcontainers:testcontainers-kafka")
}
3 changes: 2 additions & 1 deletion smoke-tests/apps/SpringCloudStream/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ dependencies {
implementation("org.springframework.cloud:spring-cloud-starter-stream-kafka:2.2.1.RELEASE")
implementation("org.springframework.kafka:spring-kafka:2.3.1.RELEASE")
implementation("org.springframework:spring-tx:5.2.0.RELEASE")
implementation("org.testcontainers:kafka:1.17.3")
implementation("org.springframework.cloud:spring-cloud-stream-binder-kafka:2.2.1.RELEASE")
implementation("org.testcontainers:testcontainers-kafka")
}
2 changes: 1 addition & 1 deletion smoke-tests/framework/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
implementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")

// this is exposed in SmokeTestExtension API
api("org.testcontainers:testcontainers:1.21.3")
api("org.testcontainers:testcontainers:2.0.0")

implementation("org.awaitility:awaitility:4.3.0")

Expand Down
11 changes: 5 additions & 6 deletions ...amework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;

import com.google.common.base.Stopwatch;
import com.microsoft.applicationinsights.smoketest.fakeingestion.MockedAppInsightsIngestionServer;
Expand Down Expand Up @@ -611,7 +610,7 @@ protected Telemetry getTelemetry(int rddCount, Predicate<RemoteDependencyData> c
telemetry.rdEnvelope = rdList.get(0);
telemetry.rd = (RequestData) ((Data<?>) telemetry.rdEnvelope.getData()).getBaseData();

assertEquals(0, mockedIngestion.getCountForType("EventData"));
assertThat(mockedIngestion.getCountForType("EventData")).isEqualTo(0);

if (rddCount == 0) {
return telemetry;
Expand Down Expand Up @@ -677,7 +676,7 @@ public static void assertParentChild(
boolean topLevelParent) {
String operationId = parentEnvelope.getTags().get("ai.operation.id");
assertThat(operationId).isNotNull();
assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
assertThat(childEnvelope.getTags().get("ai.operation.id")).isEqualTo(operationId);

String operationParentId = parentEnvelope.getTags().get("ai.operation.parentId");
if (topLevelParent) {
Expand All @@ -686,10 +685,10 @@ public static void assertParentChild(
assertThat(operationParentId).isNotNull();
}

assertEquals(parentId, childEnvelope.getTags().get("ai.operation.parentId"));
assertThat(childEnvelope.getTags().get("ai.operation.parentId")).isEqualTo(parentId);

assertEquals(parentOperationName, parentEnvelope.getTags().get("ai.operation.name"));
assertEquals(childOperationName, childEnvelope.getTags().get("ai.operation.name"));
assertThat(parentEnvelope.getTags().get("ai.operation.name")).isEqualTo(parentOperationName);
assertThat(childEnvelope.getTags().get("ai.operation.name")).isEqualTo(childOperationName);
}

public static Predicate<Envelope> getMetricPredicate(String name) {
Expand Down