fix(deps): update testcontainers-java monorepo to v2 (major) (#14985)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <[email protected]>
Co-authored-by: Lauri Tulmin <[email protected]>

Author: 3 people

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,9 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))
 
-  testImplementation("org.testcontainers:testcontainers:1.21.3")
-  testImplementation("org.testcontainers:postgresql:1.21.3")
+  testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.0"))
+  testImplementation("org.testcontainers:testcontainers:2.0.0")
+  testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:5.2.1")

dependencyManagement/build.gradle.kts

@@ -32,7 +32,7 @@ val DEPENDENCY_BOMS = listOf(
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:1.21.3"
+  "org.testcontainers:testcontainers-bom:2.0.0"
 )
 
 val autoServiceVersion = "1.1.1"

examples/distro/smoke-tests/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.21.3")
+  testImplementation("org.testcontainers:testcontainers:2.0.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.2.1")

examples/extension/build.gradle

@@ -98,7 +98,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.19.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:1.21.3")
+  testImplementation("org.testcontainers:testcontainers:2.0.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.2.1")

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
   testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
 
   // needed for SNS
-  testImplementation("org.testcontainers:localstack")
+  testImplementation("org.testcontainers:testcontainers-localstack")
 
   // needed by S3
   testImplementation("javax.xml.bind:jaxb-api:2.3.1")

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsConnector.java

@@ -32,8 +32,8 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.localstack.LocalStackContainer;
 import org.testcontainers.utility.DockerImageName;
 
 class AwsConnector {
@@ -45,10 +45,7 @@ class AwsConnector {
   AwsConnector() {
     localStack =
         new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.0.2"))
-            .withServices(
-                LocalStackContainer.Service.SQS,
-                LocalStackContainer.Service.SNS,
-                LocalStackContainer.Service.S3)
+            .withServices("sqs", "sns", "s3")
             .withEnv("DEBUG", "1")
             .withEnv("SQS_PROVIDER", "elasticmq")
             .withStartupTimeout(Duration.ofMinutes(2));
@@ -61,30 +58,27 @@ class AwsConnector {
 
     sqsClient =
         AmazonSQSAsyncClient.asyncBuilder()
-            .withEndpointConfiguration(
-                getEndpointConfiguration(localStack, LocalStackContainer.Service.SQS))
+            .withEndpointConfiguration(getEndpointConfiguration(localStack))
             .withCredentials(credentialsProvider)
             .build();
 
     s3Client =
         AmazonS3Client.builder()
-            .withEndpointConfiguration(
-                getEndpointConfiguration(localStack, LocalStackContainer.Service.S3))
+            .withEndpointConfiguration(getEndpointConfiguration(localStack))
             .withCredentials(credentialsProvider)
             .build();
 
     snsClient =
         AmazonSNSAsyncClient.asyncBuilder()
-            .withEndpointConfiguration(
-                getEndpointConfiguration(localStack, LocalStackContainer.Service.SNS))
+            .withEndpointConfiguration(getEndpointConfiguration(localStack))
             .withCredentials(credentialsProvider)
             .build();
   }
 
   static AwsClientBuilder.EndpointConfiguration getEndpointConfiguration(
-      LocalStackContainer localStack, LocalStackContainer.Service service) {
+      LocalStackContainer localStack) {
     return new AwsClientBuilder.EndpointConfiguration(
-        localStack.getEndpointOverride(service).toString(), localStack.getRegion());
+        localStack.getEndpoint().toString(), localStack.getRegion());
   }
 
   String createQueue(String queueName) {

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -148,7 +148,7 @@ testing {
         implementation("software.amazon.awssdk:s3:" + if (latestDepTest) "latest.release" else "2.27.21")
         implementation("software.amazon.awssdk.crt:aws-crt:" + if (latestDepTest) "latest.release" else "0.30.11")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
-        implementation("org.testcontainers:localstack")
+        implementation("org.testcontainers:testcontainers-localstack")
       }
     }
 

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/s3CrtTest/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/S3CrtClientTest.java

@@ -14,8 +14,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.localstack.LocalStackContainer;
 import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
@@ -35,7 +35,7 @@ class S3CrtClientTest {
   static void setUp() {
     localStack =
         new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.0.2"))
-            .withServices(LocalStackContainer.Service.S3)
+            .withServices("s3")
             .withEnv("DEBUG", "1")
             .withStartupTimeout(Duration.ofMinutes(2));
     localStack.start();
@@ -47,7 +47,7 @@ static void setUp() {
 
     s3Client =
         S3AsyncClient.crtBuilder()
-            .endpointOverride(localStack.getEndpointOverride(LocalStackContainer.Service.S3))
+            .endpointOverride(localStack.getEndpoint())
             .credentialsProvider(credentialsProvider)
             .region(Region.of(localStack.getRegion()))
             .build();

instrumentation/camel-2.20/javaagent/build.gradle.kts

@@ -50,9 +50,9 @@ dependencies {
   testImplementation("javax.xml.bind:jaxb-api:2.3.1")
   testImplementation("org.elasticmq:elasticmq-rest-sqs_2.13")
 
-  testImplementation("org.testcontainers:cassandra")
+  testImplementation("org.testcontainers:testcontainers-cassandra")
   testImplementation("org.testcontainers:testcontainers")
-  testImplementation("org.testcontainers:junit-jupiter")
+  testImplementation("org.testcontainers:testcontainers-junit-jupiter")
   testImplementation("com.datastax.oss:java-driver-core:4.16.0") {
     exclude(group = "io.dropwizard.metrics", module = "metrics-core")
   }

instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 
   library("com.couchbase.client:java-client:3.1.6")
 
-  testImplementation("org.testcontainers:couchbase")
+  testImplementation("org.testcontainers:testcontainers-couchbase")
 
   latestDepTestLibrary("com.couchbase.client:java-client:3.1.+") // see couchbase-3.2 module
 }