diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 9b86c0aa5..026246588 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -16,7 +16,7 @@ val DEPENDENCY_BOMS = listOf( "org.junit:junit-bom:5.11.1", "io.grpc:grpc-bom:1.68.0", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", - "org.testcontainers:testcontainers-bom:1.20.1" + "org.testcontainers:testcontainers-bom:1.20.2" ) val autoServiceVersion = "1.1.1" @@ -62,7 +62,7 @@ val DEPENDENCIES = listOf( "org.junit-pioneer:junit-pioneer:1.9.1", "org.skyscreamer:jsonassert:1.5.3", "org.apache.kafka:kafka-clients:3.8.0", - "org.testcontainers:kafka:1.20.1", + "org.testcontainers:kafka:1.20.2", "com.lmax:disruptor:3.4.4", "org.jctools:jctools-core:4.0.5", "tools.profiler:async-profiler:3.0", diff --git a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java index 9e7f5cf55..55fac85c9 100644 --- a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java +++ b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java @@ -38,17 +38,18 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.rnorth.ducttape.unreliables.Unreliables; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.utility.DockerImageName; @Testcontainers(disabledWithoutDocker = true) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class KafkaSpanExporterIntegrationTest { private static final DockerImageName KAFKA_TEST_IMAGE = - DockerImageName.parse("confluentinc/cp-kafka:6.2.1"); + DockerImageName.parse("confluentinc/cp-kafka:7.4.0") + .asCompatibleSubstituteFor("apache/kafka"); private static final String TOPIC = "span_topic"; - private KafkaContainer kafka; + private ConfluentKafkaContainer kafka; private KafkaConsumer consumer; private SpanDataSerializer spanDataSerializer; private ImmutableMap producerConfig; @@ -57,7 +58,7 @@ class KafkaSpanExporterIntegrationTest { @BeforeAll void setUp() throws Exception { spanDataSerializer = new SpanDataSerializer(); - kafka = new KafkaContainer(KAFKA_TEST_IMAGE); + kafka = new ConfluentKafkaContainer(KAFKA_TEST_IMAGE); kafka.start(); init(kafka.getBootstrapServers());