Skip to content

fix(deps): update testcontainers-java monorepo to v1.20.2 (patch) #12370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2024
Merged

fix(deps): update testcontainers-java monorepo to v1.20.2 (patch) #12370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7340ee1
fix(deps): update testcontainers-java monorepo to v1.20.2
renovate[bot] Oct 1, 2024
0219992
fix deptecation warnings
laurit Oct 1, 2024
0df02ca
change kafka image
laurit Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmark-overhead/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/distro/smoke-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions ...java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -37,8 +37,8 @@ class CassandraTest extends AbstractHttpServerUsingTest<ConfigurableApplicationC
private ConfigurableApplicationContext appContext;

@Container
private static final CassandraContainer<?> 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;

Expand Down
6 changes: 3 additions & 3 deletions ...pentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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());
Expand Down
6 changes: 3 additions & 3 deletions ...ng/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions ...umentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()

Expand Down
6 changes: 3 additions & 3 deletions .../opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions ...ing-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions ...a/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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();
}
Expand Down
Loading