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

Reimplemented renovate fixes and change testcontainers image (#1527)

This commit is contained in:
Vincent Free 2024-10-31 00:59:55 +01:00 committed by GitHub
parent 8ae2a4bc33
commit 2a9da21970
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dependencyManagement/build.gradle.kts
View File

@ -16,7 +16,7 @@ val DEPENDENCY_BOMS = listOf(
"org.junit:junit-bom:5.11.3", "org.junit:junit-bom:5.11.3",
"io.grpc:grpc-bom:1.68.1", "io.grpc:grpc-bom:1.68.1",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", "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" val autoServiceVersion = "1.1.1"
@ -64,7 +64,7 @@ val DEPENDENCIES = listOf(
"org.junit-pioneer:junit-pioneer:1.9.1", "org.junit-pioneer:junit-pioneer:1.9.1",
"org.skyscreamer:jsonassert:1.5.3", "org.skyscreamer:jsonassert:1.5.3",
"org.apache.kafka:kafka-clients:3.8.1", "org.apache.kafka:kafka-clients:3.8.1",
"org.testcontainers:kafka:1.20.1", "org.testcontainers:kafka:1.20.2",
"com.lmax:disruptor:3.4.4", "com.lmax:disruptor:3.4.4",
"org.jctools:jctools-core:4.0.5", "org.jctools:jctools-core:4.0.5",
"tools.profiler:async-profiler:3.0", "tools.profiler:async-profiler:3.0",

4
kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java
View File

@ -38,15 +38,15 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.rnorth.ducttape.unreliables.Unreliables; import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.containers.KafkaContainer;
import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.kafka.KafkaContainer;
import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.DockerImageName;
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
@TestInstance(TestInstance.Lifecycle.PER_CLASS) @TestInstance(TestInstance.Lifecycle.PER_CLASS)
class KafkaSpanExporterIntegrationTest { class KafkaSpanExporterIntegrationTest {
private static final DockerImageName KAFKA_TEST_IMAGE = private static final DockerImageName KAFKA_TEST_IMAGE =
DockerImageName.parse("confluentinc/cp-kafka:6.2.1"); DockerImageName.parse("apache/kafka:3.8.1");
private static final String TOPIC = "span_topic"; private static final String TOPIC = "span_topic";
private KafkaContainer kafka; private KafkaContainer kafka;
private KafkaConsumer<String, ExportTraceServiceRequest> consumer; private KafkaConsumer<String, ExportTraceServiceRequest> consumer;