From d8b0771929a9fddf6bdfc2c541c086a425f240b7 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 31 Mar 2023 11:25:38 +0300 Subject: [PATCH] Use the same kafka docker image in all kafka tests (#8187) currently we use `confluentinc/cp-kafka:5.4.3` and `confluentinc/cp-kafka:6.1.9` --- .../internal/AbstractOpenTelemetryMetricsReporterTest.java | 2 +- .../instrumentation/kafka/internal/KafkaClientBaseTest.java | 2 +- .../javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy | 2 +- .../spring/autoconfigure/kafka/KafkaIntegrationTest.java | 2 +- .../java/io/opentelemetry/testing/AbstractSpringKafkaTest.java | 2 +- .../vertx/kafka/v3_6/AbstractVertxKafkaTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 79741f4d24..6069f337a0 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 @@ -77,7 +77,7 @@ public abstract class AbstractOpenTelemetryMetricsReporterTest { } kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) 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 febf6c21e5..bc37560748 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 @@ -64,7 +64,7 @@ public abstract class KafkaClientBaseTest { @BeforeAll void setupClass() throws ExecutionException, InterruptedException, TimeoutException { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) 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 573ea2b76c..d625531d1d 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 @@ -44,7 +44,7 @@ class KafkaStreamsBaseTest extends AgentInstrumentationSpecification { static CountDownLatch consumerReady = new CountDownLatch(1) def setupSpec() { - kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java index b8a366656e..3decd7a88f 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java @@ -46,7 +46,7 @@ class KafkaIntegrationTest { @BeforeAll static void setUpKafka() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.1.9")) + new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); 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 ac5ff81eb4..16d1fba123 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 @@ -46,7 +46,7 @@ public abstract class AbstractSpringKafkaTest { @BeforeAll static void setUpKafka() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) .withStartupTimeout(Duration.ofMinutes(1)); 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 1f373c9a39..b5ca57e92f 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 @@ -60,7 +60,7 @@ public abstract class AbstractVertxKafkaTest { @BeforeAll static void setUpAll() { kafka = - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") .withLogConsumer(new Slf4jLogConsumer(logger)) .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))