From c872557906367d6e9f000e2a2a858bafd9522a7b Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 5 Nov 2025 12:44:01 +0100 Subject: [PATCH] Rename management.zipkin.tracing It's now 'management.tracing.export.zipkin' Closes gh-47958 --- .../reference/pages/actuator/tracing.adoc | 4 +-- .../autoconfigure/ZipkinProperties.java | 2 +- ...itional-spring-configuration-metadata.json | 28 +++++++++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc index 931e1c70356..a77a5f1d29e 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc @@ -124,7 +124,7 @@ Tracing with OpenTelemetry and reporting to Zipkin requires the following depend * `io.micrometer:micrometer-tracing-bridge-otel` - bridges the Micrometer Observation API to OpenTelemetry. * `io.opentelemetry:opentelemetry-exporter-zipkin` - reports traces to Zipkin. -Use the `management.zipkin.tracing.*` configuration properties to configure reporting to Zipkin. +Use the `management.tracing.export.zipkin.*` configuration properties to configure reporting to Zipkin. @@ -152,7 +152,7 @@ Tracing with OpenZipkin Brave and reporting to Zipkin requires the following dep * `io.micrometer:micrometer-tracing-bridge-brave` - bridges the Micrometer Observation API to Brave. * `io.zipkin.reporter2:zipkin-reporter-brave` - reports traces to Zipkin. -Use the `management.zipkin.tracing.*` configuration properties to configure reporting to Zipkin. +Use the `management.tracing.export.zipkin.*` configuration properties to configure reporting to Zipkin. diff --git a/module/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java b/module/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java index d9e3b0bee4f..0f887c2d8a1 100644 --- a/module/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java +++ b/module/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/autoconfigure/ZipkinProperties.java @@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Moritz Halbritter * @since 4.0.0 */ -@ConfigurationProperties("management.zipkin.tracing") +@ConfigurationProperties("management.tracing.export.zipkin") public class ZipkinProperties { /** diff --git a/module/spring-boot-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json index bb197d579a8..7fde18760f9 100644 --- a/module/spring-boot-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,11 +1,33 @@ { "groups": [], "properties": [ + { + "name": "management.zipkin.tracing.connect-timeout", + "deprecation": { + "replacement": "management.tracing.export.zipkin.connect-timeout", + "level": "error" + } + }, { "name": "management.zipkin.tracing.encoding", - "defaultValue": [ - "JSON" - ] + "deprecation": { + "replacement": "management.tracing.export.zipkin.encoding", + "level": "error" + } + }, + { + "name": "management.zipkin.tracing.endpoint", + "deprecation": { + "replacement": "management.tracing.export.zipkin.endpoint", + "level": "error" + } + }, + { + "name": "management.zipkin.tracing.read-timeout", + "deprecation": { + "replacement": "management.tracing.export.zipkin.read-timeout", + "level": "error" + } } ], "hints": []