Skip to content

Commit 0f10a29

Browse files
author
Adrian Cole
committed
Update dependency io.zipkin.reporter2:zipkin-reporter-bom to 3.0.0
Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent d9f9812 commit 0f10a29

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ val DEPENDENCY_BOMS = listOf(
1616
"com.squareup.okio:okio-bom:3.7.0", // applies to transitive dependencies of okhttp
1717
"io.grpc:grpc-bom:1.60.1",
1818
"io.netty:netty-bom:4.1.104.Final",
19-
"io.zipkin.brave:brave-bom:5.17.0",
20-
"io.zipkin.reporter2:zipkin-reporter-bom:2.17.1",
19+
"io.zipkin.brave:brave-bom:5.18.0",
20+
"io.zipkin.reporter2:zipkin-reporter-bom:3.0.0",
2121
"org.assertj:assertj-bom:3.25.1",
2222
"org.junit:junit-bom:5.10.1",
2323
"org.testcontainers:testcontainers-bom:1.19.3",

exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import java.util.function.Supplier;
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
22-
import zipkin2.Callback;
2322
import zipkin2.Span;
24-
import zipkin2.codec.BytesEncoder;
25-
import zipkin2.codec.Encoding;
23+
import zipkin2.reporter.BytesEncoder;
24+
import zipkin2.reporter.Callback;
25+
import zipkin2.reporter.Encoding;
2626
import zipkin2.reporter.Sender;
2727

2828
/**
@@ -39,7 +39,7 @@ public final class ZipkinSpanExporter implements SpanExporter {
3939
private final ThrottlingLogger logger = new ThrottlingLogger(baseLogger);
4040
private final AtomicBoolean isShutdown = new AtomicBoolean();
4141
private final ZipkinSpanExporterBuilder builder;
42-
private final BytesEncoder<Span> encoder;
42+
private final BytesEncoder<zipkin2.Span> encoder;
4343
private final Sender sender;
4444
private final ExporterMetrics exporterMetrics;
4545

exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import java.util.function.Supplier;
1818
import javax.annotation.Nullable;
1919
import zipkin2.Span;
20-
import zipkin2.codec.BytesEncoder;
21-
import zipkin2.codec.SpanBytesEncoder;
20+
import zipkin2.reporter.BytesEncoder;
2221
import zipkin2.reporter.Sender;
22+
import zipkin2.reporter.SpanBytesEncoder;
2323
import zipkin2.reporter.okhttp3.OkHttpSender;
2424

2525
/** Builder class for {@link ZipkinSpanExporter}. */

exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
import org.testcontainers.junit.jupiter.Testcontainers;
4545
import zipkin2.Endpoint;
4646
import zipkin2.Span;
47-
import zipkin2.codec.Encoding;
4847
import zipkin2.codec.SpanBytesDecoder;
49-
import zipkin2.codec.SpanBytesEncoder;
48+
import zipkin2.reporter.Encoding;
49+
import zipkin2.reporter.SpanBytesEncoder;
5050
import zipkin2.reporter.okhttp3.OkHttpSender;
5151

5252
@Testcontainers(disabledWithoutDocker = true)

exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import org.junit.jupiter.api.extension.RegisterExtension;
3030
import org.mockito.Mock;
3131
import org.mockito.junit.jupiter.MockitoExtension;
32-
import zipkin2.Call;
33-
import zipkin2.Callback;
3432
import zipkin2.Span;
35-
import zipkin2.codec.SpanBytesEncoder;
33+
import zipkin2.reporter.Call;
34+
import zipkin2.reporter.Callback;
35+
import zipkin2.reporter.SpanBytesEncoder;
3636
import zipkin2.reporter.Sender;
3737

3838
@ExtendWith(MockitoExtension.class)

0 commit comments

Comments
 (0)