Skip to content

Reimplemented renovate fixes and change testcontainers image #1527

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 2 commits into from
Oct 30, 2024
Merged

Reimplemented renovate fixes and change testcontainers image #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56552da
Reimplemented renovate fixes and change testcontainers image to apach…
vincentfree Oct 30, 2024
6362f6d
Reimplemented renovate fixes and change testcontainers image to apach…
vincentfree Oct 30, 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 dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ val DEPENDENCY_BOMS = listOf(
"org.junit:junit-bom:5.11.3",
"io.grpc:grpc-bom:1.68.1",
"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"
Expand Down Expand Up @@ -64,7 +64,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.1",
"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",
Expand Down
4 changes: 2 additions & 2 deletions ...porter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
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.KafkaContainer;
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("apache/kafka:3.8.1");
private static final String TOPIC = "span_topic";
private KafkaContainer kafka;
private KafkaConsumer<String, ExportTraceServiceRequest> consumer;
Expand Down
Loading