Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
Comparing source compatibility of opentelemetry-exporter-zipkin-1.59.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.58.0.jar
No changes.
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.exporter.zipkin.ZipkinSpanExporter (not serializable)
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+++ NEW ANNOTATION: java.lang.Deprecated
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder (not serializable)
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+++ NEW ANNOTATION: java.lang.Deprecated
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@
* This class was based on the <a
* href="https://github.com/census-instrumentation/opencensus-java/tree/c960b19889de5e4a7b25f90919d28b066590d4f0/exporters/trace/zipkin">OpenCensus
* zipkin exporter</a> code.
*
* @deprecated Zipkin exporter is deprecated in OpenTelemetry spec (see the <a
* href="https://github.com/open-telemetry/opentelemetry-specification/pull/4715">PR</a>).
* Expect this artifact to no longer be published in approximately 6 months (mid 2026).
*/
@Deprecated
public final class ZipkinSpanExporter implements SpanExporter {

public static final Logger baseLogger = Logger.getLogger(ZipkinSpanExporter.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@
import zipkin2.reporter.SpanBytesEncoder;
import zipkin2.reporter.okhttp3.OkHttpSender;

/** Builder class for {@link ZipkinSpanExporter}. */
/**
* Builder class for {@link ZipkinSpanExporter}.
*
* @deprecated Zipkin exporter is deprecated in OpenTelemetry spec (see the <a
* href="https://github.com/open-telemetry/opentelemetry-specification/pull/4715">PR</a>).
* Expect this artifact to no longer be published in approximately 6 months (mid 2026).
*/
@Deprecated
public final class ZipkinSpanExporterBuilder {
private BytesEncoder<Span> encoder = SpanBytesEncoder.JSON_V2;
private Supplier<InetAddress> localIpAddressSupplier = LocalInetAddressSupplier.getInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@

package io.opentelemetry.exporter.zipkin.internal;

import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import java.time.Duration;

/**
* {@link SpanExporter} SPI implementation for {@link ZipkinSpanExporter}.
* {@link SpanExporter} SPI implementation for {@link
* io.opentelemetry.exporter.zipkin.ZipkinSpanExporter}.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
@SuppressWarnings("deprecation")
public class ZipkinSpanExporterProvider implements ConfigurableSpanExporterProvider {
@Override
public String getName() {
Expand All @@ -26,7 +26,8 @@ public String getName() {

@Override
public SpanExporter createExporter(ConfigProperties config) {
ZipkinSpanExporterBuilder builder = ZipkinSpanExporter.builder();
io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder builder =
io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.builder();

String endpoint = config.getString("otel.exporter.zipkin.endpoint");
if (endpoint != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import zipkin2.reporter.SpanBytesEncoder;
import zipkin2.reporter.okhttp3.OkHttpSender;

@SuppressWarnings("deprecation") // testing deprecated code
@Testcontainers(disabledWithoutDocker = true)
class ZipkinSpanExporterEndToEndHttpTest {
private static final WebClient client = WebClient.of();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import zipkin2.reporter.SpanBytesEncoder;

@ExtendWith(MockitoExtension.class)
@SuppressWarnings("deprecation") // testing deprecated code
class ZipkinSpanExporterTest {

@Mock private BytesMessageSender mockSender;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;

@SuppressWarnings("deprecation") // testing deprecated code
class ZipkinSpanExporterProviderTest {

private static final ZipkinSpanExporterProvider provider = new ZipkinSpanExporterProvider();
Expand All @@ -28,7 +28,8 @@ void getName() {
void createExporter_Default() {
try (SpanExporter spanExporter =
provider.createExporter(DefaultConfigProperties.createFromMap(Collections.emptyMap()))) {
assertThat(spanExporter).isInstanceOf(ZipkinSpanExporter.class);
assertThat(spanExporter)
.isInstanceOf(io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.class);
assertThat(spanExporter)
.extracting("sender")
.extracting("delegate")
Expand All @@ -50,7 +51,8 @@ void createExporter_WithConfiguration() {

try (SpanExporter spanExporter =
provider.createExporter(DefaultConfigProperties.createFromMap(config))) {
assertThat(spanExporter).isInstanceOf(ZipkinSpanExporter.class);
assertThat(spanExporter)
.isInstanceOf(io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.class);
assertThat(spanExporter)
.extracting("sender")
.extracting("delegate")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
import io.opentelemetry.exporter.otlp.internal.OtlpSpanExporterProvider;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.internal.testing.CleanupExtension;
import io.opentelemetry.sdk.autoconfigure.internal.NamedSpiManager;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
Expand All @@ -37,6 +36,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // testing deprecated code
class ConfigurableSpanExporterTest {

@RegisterExtension CleanupExtension cleanup = new CleanupExtension();
Expand Down Expand Up @@ -168,7 +168,9 @@ void configureSpanProcessors_batchSpanProcessor() {
TracerProviderConfiguration.configureSpanProcessors(
DefaultConfigProperties.createFromMap(
Collections.singletonMap("otel.traces.exporter", exporterName)),
ImmutableMap.of(exporterName, ZipkinSpanExporter.builder().build()),
ImmutableMap.of(
exporterName,
io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.builder().build()),
MeterProvider.noop(),
closeables);
cleanup.addCloseables(closeables);
Expand All @@ -189,7 +191,7 @@ void configureSpanProcessors_multipleExporters() {
"otlp",
OtlpGrpcSpanExporter.builder().build(),
"zipkin",
ZipkinSpanExporter.builder().build()),
io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.builder().build()),
MeterProvider.noop(),
closeables);
cleanup.addCloseables(closeables);
Expand All @@ -212,7 +214,8 @@ void configureSpanProcessors_multipleExporters() {
spanExporters -> {
assertThat(spanExporters.length).isEqualTo(2);
assertThat(spanExporters)
.hasAtLeastOneElementOfType(ZipkinSpanExporter.class)
.hasAtLeastOneElementOfType(
io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.class)
.hasAtLeastOneElementOfType(OtlpGrpcSpanExporter.class);
});
});
Expand All @@ -231,7 +234,7 @@ void configureSpanProcessors_multipleExportersWithLogging() {
"logging",
LoggingSpanExporter.create(),
"zipkin",
ZipkinSpanExporter.builder().build()),
io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.builder().build()),
MeterProvider.noop(),
closeables);
cleanup.addCloseables(closeables);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.sdk.autoconfigure.internal.NamedSpiManager;
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand All @@ -22,6 +21,7 @@
import java.util.Collections;
import org.junit.jupiter.api.Test;

@SuppressWarnings("deprecation") // testing deprecated code
class SpanExporterConfigurationTest {

private final SpiHelper spiHelper =
Expand All @@ -42,7 +42,7 @@ void configureExporter_KnownSpiExportersOnClasspath() {
assertThat(SpanExporterConfiguration.configureExporter("otlp", spiExportersManager))
.isInstanceOf(OtlpGrpcSpanExporter.class);
assertThat(SpanExporterConfiguration.configureExporter("zipkin", spiExportersManager))
.isInstanceOf(ZipkinSpanExporter.class);
.isInstanceOf(io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.class);
}

@Test
Expand Down
Loading