diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-zipkin.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-zipkin.txt index 7c3f307df8e..07952e04955 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-zipkin.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-zipkin.txt @@ -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. \ No newline at end of file +=== 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 diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java index afd7bce4286..9a3306e1a35 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java @@ -32,7 +32,12 @@ * This class was based on the OpenCensus * zipkin exporter code. + * + * @deprecated Zipkin exporter is deprecated in OpenTelemetry spec (see the PR). + * 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()); diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java index 8244905de8d..a5714912590 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java @@ -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 PR). + * Expect this artifact to no longer be published in approximately 6 months (mid 2026). + */ +@Deprecated public final class ZipkinSpanExporterBuilder { private BytesEncoder encoder = SpanBytesEncoder.JSON_V2; private Supplier localIpAddressSupplier = LocalInetAddressSupplier.getInstance(); diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProvider.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProvider.java index cbd55d386dc..f73446e6e40 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProvider.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProvider.java @@ -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}. * *

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() { @@ -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) { diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java index 4ad9bdfb106..38fb9ee078e 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java @@ -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(); diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java index 759cfae782b..463b81fc953 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java @@ -41,6 +41,7 @@ import zipkin2.reporter.SpanBytesEncoder; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") // testing deprecated code class ZipkinSpanExporterTest { @Mock private BytesMessageSender mockSender; diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProviderTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProviderTest.java index 289fa1f7709..814d2d967fc 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProviderTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProviderTest.java @@ -7,7 +7,6 @@ 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; @@ -15,6 +14,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; +@SuppressWarnings("deprecation") // testing deprecated code class ZipkinSpanExporterProviderTest { private static final ZipkinSpanExporterProvider provider = new ZipkinSpanExporterProvider(); @@ -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") @@ -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") diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java index d2c66386092..69a86641084 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java @@ -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; @@ -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(); @@ -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); @@ -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); @@ -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); }); }); @@ -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); diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/SpanExporterConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/SpanExporterConfigurationTest.java index 64e4a55e91a..4d94edb48cc 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/SpanExporterConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/SpanExporterConfigurationTest.java @@ -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; @@ -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 = @@ -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