This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 9208b82d14d zipkin is deprecated 9208b82d14d is described below commit 9208b82d14d459a0ca7e89f62c60a3b479e969d2 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Sep 5 18:38:21 2022 +0200 zipkin is deprecated --- .../camel-zipkin-starter/src/main/docs/zipkin.json | 40 ++++++++++++++++------ .../apache/camel/zipkin/starter/CamelZipkin.java | 1 + .../zipkin/starter/ZipkinAutoConfiguration.java | 1 + .../ZipkinConditionalAutoConfiguration.java | 1 + .../starter/ZipkinConfigurationProperties.java | 1 + 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/components-starter/camel-zipkin-starter/src/main/docs/zipkin.json b/components-starter/camel-zipkin-starter/src/main/docs/zipkin.json index de37ce48951..0361992bfd1 100644 --- a/components-starter/camel-zipkin-starter/src/main/docs/zipkin.json +++ b/components-starter/camel-zipkin-starter/src/main/docs/zipkin.json @@ -11,65 +11,85 @@ "name": "camel.zipkin.client-service-mappings", "type": "java.util.Map<java.lang.String,java.lang.String>", "description": "Sets client service mapping(s) that matches Camel events to the given zipkin service name. The key is the pattern, the value is the service name.", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.endpoint", "type": "java.lang.String", "description": "Sets the POST URL for zipkin's <a href=\"http:\/\/zipkin.io\/zipkin-api\/#\/\">v2 api<\/a>, usually \"http:\/\/zipkinhost:9411\/api\/v2\/spans\"", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.exclude-patterns", "type": "java.util.Set<java.lang.String>", "description": "Sets exclude pattern(s) that will disable tracing with zipkin for Camel messages that matches the pattern.", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.host-name", "type": "java.lang.String", "description": "Sets the hostname if sending spans to a remote zipkin scribe (thrift RPC) collector.", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.include-message-body", "type": "java.lang.Boolean", "description": "Whether to include the Camel message body in the zipkin traces. This is not recommended for production usage, or when having big payloads. You can limit the size by configuring camel.springboot.log-debug-max-chars option.", "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", - "defaultValue": false + "defaultValue": false, + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.include-message-body-streams", "type": "java.lang.Boolean", "description": "Whether to include message bodies that are stream based in the zipkin traces. This is not recommended for production usage, or when having big payloads. You can limit the size by configuring camel.springboot.log-debug-max-chars option.", "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", - "defaultValue": false + "defaultValue": false, + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.port", "type": "java.lang.Integer", "description": "Sets the port if sending spans to a remote zipkin scribe (thrift RPC) collector.", "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", - "defaultValue": 0 + "defaultValue": 0, + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.rate", "type": "java.lang.Float", "description": "Configures a rate that decides how many events should be traced by zipkin. The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f is 10%).", "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", - "defaultValue": 1 + "defaultValue": 1, + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.server-service-mappings", "type": "java.util.Map<java.lang.String,java.lang.String>", "description": "Sets server service mapping(s) that matches Camel events to the given zipkin service name. The key is the pattern, the value is the service name.", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} }, { "name": "camel.zipkin.service-name", "type": "java.lang.String", "description": "To use a global service name that matches all Camel events", - "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties" + "sourceType": "org.apache.camel.zipkin.starter.ZipkinConfigurationProperties", + "deprecated": true, + "deprecation": {} } ], "hints": [] diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java index 18ced481aa9..6a28bddea25 100644 --- a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/CamelZipkin.java @@ -30,5 +30,6 @@ import org.springframework.context.annotation.Import; @Documented @Inherited @Import(ZipkinAutoConfiguration.class) +@Deprecated public @interface CamelZipkin { } diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java index e8bfcc9971c..5d6ffc92503 100644 --- a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinAutoConfiguration.java @@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ZipkinConfigurationProperties.class) @ConditionalOnProperty(value = "camel.zipkin.enabled", matchIfMissing = true) +@Deprecated public class ZipkinAutoConfiguration { @Bean(initMethod = "", destroyMethod = "") diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java index a8b932bf2af..74e2cd8901d 100644 --- a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java @@ -27,5 +27,6 @@ import org.springframework.context.annotation.Import; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "camel.zipkin.enabled") @Import(ZipkinAutoConfiguration.class) +@Deprecated public class ZipkinConditionalAutoConfiguration { } diff --git a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java index b57d4167c56..0d03fa5239c 100644 --- a/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java +++ b/components-starter/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java @@ -22,6 +22,7 @@ import java.util.Set; import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "camel.zipkin") +@Deprecated public class ZipkinConfigurationProperties { /** * Sets the POST URL for zipkin's <a href="http://zipkin.io/zipkin-api/#/">v2 api</a>, usually