diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts index 27ff22e0c243..9f25b90a1221 100644 --- a/benchmark-overhead/build.gradle.kts +++ b/benchmark-overhead/build.gradle.kts @@ -18,8 +18,8 @@ repositories { dependencies { implementation(enforcedPlatform("org.junit:junit-bom:5.11.1")) - testImplementation("org.testcontainers:testcontainers:1.20.1") - testImplementation("org.testcontainers:postgresql:1.20.1") + testImplementation("org.testcontainers:testcontainers:1.20.2") + testImplementation("org.testcontainers:postgresql:1.20.2") testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 8a2f7273a32e..35e558cd8f23 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -34,7 +34,7 @@ val DEPENDENCY_BOMS = listOf( "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}", "org.junit:junit-bom:5.11.1", - "org.testcontainers:testcontainers-bom:1.20.1", + "org.testcontainers:testcontainers-bom:1.20.2", "org.spockframework:spock-bom:2.4-M4-groovy-4.0" ) diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle index 618cec7c44a3..eb1da48cf741 100644 --- a/examples/distro/smoke-tests/build.gradle +++ b/examples/distro/smoke-tests/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - testImplementation("org.testcontainers:testcontainers:1.20.1") + testImplementation("org.testcontainers:testcontainers:1.20.2") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0") testImplementation("com.google.protobuf:protobuf-java-util:3.25.5") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 62b0560ff849..5bad860926e9 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.17.0' //All dependencies below are only for tests - testImplementation("org.testcontainers:testcontainers:1.20.1") + testImplementation("org.testcontainers:testcontainers:1.20.2") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0") testImplementation("com.google.protobuf:protobuf-java-util:3.25.5") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java index 4e21f1bff32d..61e59850cfb7 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; -import org.testcontainers.containers.CassandraContainer; +import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -37,8 +37,8 @@ class CassandraTest extends AbstractHttpServerUsingTest cassandra = - new CassandraContainer<>("cassandra:3.11.2").withExposedPorts(9042); + private static final CassandraContainer cassandra = + new CassandraContainer("cassandra:3.11.2").withExposedPorts(9042); private static String host; diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java index 141498e7836f..d1c94f2532a5 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java @@ -51,10 +51,10 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @SuppressWarnings("OtelInternalJavadoc") @@ -86,10 +86,10 @@ void beforeAll() { } kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); producer = new KafkaProducer<>(producerConfig()); diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java index 078b3fc310f0..119aa628ae98 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java @@ -43,9 +43,9 @@ import org.junit.jupiter.api.TestInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; @SuppressWarnings("OtelInternalJavadoc") @@ -66,10 +66,10 @@ public abstract class KafkaClientBaseTest { @BeforeAll void setupClass() throws ExecutionException, InterruptedException, TimeoutException { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy index ef3cff670b01..96b1827d03f0 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy @@ -18,9 +18,9 @@ import org.apache.kafka.common.serialization.StringDeserializer import org.apache.kafka.common.serialization.StringSerializer import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.testcontainers.containers.KafkaContainer import org.testcontainers.containers.output.Slf4jLogConsumer import org.testcontainers.containers.wait.strategy.Wait +import org.testcontainers.kafka.KafkaContainer import org.testcontainers.utility.DockerImageName import spock.lang.Shared @@ -44,10 +44,10 @@ class KafkaStreamsBaseTest extends AgentInstrumentationSpecification { static CountDownLatch consumerReady = new CountDownLatch(1) def setupSpec() { - kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + kafka = new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)) kafka.start() diff --git a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java index cefb87a770c1..9e11434830bb 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java +++ b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java @@ -41,9 +41,9 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; import reactor.core.Disposable; import reactor.core.publisher.Flux; @@ -69,10 +69,10 @@ public abstract class AbstractReactorKafkaTest { @BeforeAll static void setUpAll() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java index bbc3bc9384ac..da397730c92c 100644 --- a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java @@ -30,8 +30,8 @@ import org.springframework.kafka.core.KafkaOperations; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.util.concurrent.ListenableFuture; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; public abstract class AbstractSpringKafkaTest { @@ -46,9 +46,9 @@ public abstract class AbstractSpringKafkaTest { @BeforeAll static void setUpKafka() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); } diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java index 59d3b0bbe28f..fd88db245bf8 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java @@ -41,9 +41,9 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; public abstract class AbstractVertxKafkaTest { @@ -61,10 +61,10 @@ public abstract class AbstractVertxKafkaTest { @BeforeAll static void setUpAll() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java index 73a801d96365..2441e61d2cb1 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java @@ -17,8 +17,8 @@ import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.kafka.core.KafkaTemplate; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.kafka.KafkaContainer; import org.testcontainers.utility.DockerImageName; /** Spring has a test container integration, but that doesn't work for Spring Boot 2 */ @@ -30,9 +30,9 @@ public class AbstractJvmKafkaSpringStarterSmokeTest extends AbstractKafkaSpringS @BeforeAll static void setUpKafka() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0")) + new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) + .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); kafka.start(); }