open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2024-10-02 08:15:35 +03:00 committed by GitHub
parent 467a2729bb
commit 8245d8e9e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmark-overhead/build.gradle.kts
View File

@ -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")

2
dependencyManagement/build.gradle.kts
View File

@ -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"
)

2
examples/distro/smoke-tests/build.gradle
View File

@ -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")

2
examples/extension/build.gradle
View File

@ -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")

6
instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java
View File

@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
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<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;

6
instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java
View File

@ -51,10 +51,10 @@ import org.junit.jupiter.api.BeforeEach;
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 @@ public abstract class AbstractOpenTelemetryMetricsReporterTest {
}
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());

6
instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java
View File

@ -43,9 +43,9 @@ import org.junit.jupiter.api.BeforeAll;
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();

6
instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy
View File

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

6
instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java
View File

@ -41,9 +41,9 @@ import org.junit.jupiter.api.BeforeAll;
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();

6
instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java
View File

@ -30,8 +30,8 @@ import org.springframework.context.ConfigurableApplicationContext;
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();
}

6
instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java
View File

@ -41,9 +41,9 @@ import org.junit.jupiter.api.BeforeAll;
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();

6
smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java
View File

@ -17,8 +17,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
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();
}