diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -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= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -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= diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 67b5281893e..b6546465a2d 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -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= diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 67b5281893e..b6546465a2d 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -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= diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -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= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -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= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 80f1756acc9..0dcc38a038d 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -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= diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -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= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -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= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -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= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 71f626b73f8..2bcff84f999 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -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= diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -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= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -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= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -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= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -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= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -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= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -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= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 5a426d3211b..b9a427f4497 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -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= diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -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= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 875408d16db..874d6cd7afa 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -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= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 80f9e863685..99aec0c7591 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -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" diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index a272f2a20cb..954d459769a 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -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= diff --git a/smoke-tests/apps/Kafka/build.gradle.kts b/smoke-tests/apps/Kafka/build.gradle.kts index b352630e637..c999b9f0346 100644 --- a/smoke-tests/apps/Kafka/build.gradle.kts +++ b/smoke-tests/apps/Kafka/build.gradle.kts @@ -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") } diff --git a/smoke-tests/apps/SpringCloudStream/build.gradle.kts b/smoke-tests/apps/SpringCloudStream/build.gradle.kts index 4831888acf6..59f42a5305d 100644 --- a/smoke-tests/apps/SpringCloudStream/build.gradle.kts +++ b/smoke-tests/apps/SpringCloudStream/build.gradle.kts @@ -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") } diff --git a/smoke-tests/framework/build.gradle.kts b/smoke-tests/framework/build.gradle.kts index 0e66568cabc..c27c1abae29 100644 --- a/smoke-tests/framework/build.gradle.kts +++ b/smoke-tests/framework/build.gradle.kts @@ -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") diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java index 243a5968660..9d5ec06af19 100644 --- a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java +++ b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java @@ -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; @@ -611,7 +610,7 @@ protected Telemetry getTelemetry(int rddCount, Predicate 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; @@ -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) { @@ -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 getMetricPredicate(String name) {