From 2b6559ccd62d23259e8f769df7e5451383ba51ab Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 11 Mar 2026 10:30:34 +0100 Subject: [PATCH] Deprecate ZipkinWithOpenTelemetryTracingAutoConfiguration See gh-49453 --- .../zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java | 2 ++ .../ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java | 1 + 2 files changed, 3 insertions(+) diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/main/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/main/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java index e89c1e8967c..9b4269659d4 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/main/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/main/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java @@ -40,9 +40,11 @@ import org.springframework.context.annotation.Bean; * @author Wick Dynex * @author Phillip Webb * @since 4.0.0 + * @deprecated since 4.0.4 for removal in 4.2.0 */ @AutoConfiguration(afterName = "org.springframework.boot.zipkin.autoconfigure.ZipkinAutoConfiguration") @ConditionalOnClass({ ZipkinSpanExporter.class, Span.class }) +@Deprecated(since = "4.0.4", forRemoval = true) public final class ZipkinWithOpenTelemetryTracingAutoConfiguration { @Bean diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/test/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/test/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java index fce94731ce7..b9333d5288b 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/test/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/test/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java @@ -38,6 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Moritz Halbritter */ +@SuppressWarnings("removal") class ZipkinWithOpenTelemetryTracingAutoConfigurationTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()