From 714802ca1d6cde64df46d77c4579ae547d6d8684 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 May 2018 10:23:19 +0200 Subject: [PATCH] Fixed the kafka sender condition. fixes gh-985 --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 3 --- .../zipkin2/sender/ZipkinKafkaSenderConfiguration.java | 2 +- .../additional-spring-configuration-metadata.json | 8 -------- .../sleuth/zipkin2/ZipkinAutoConfigurationTests.java | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 spring-cloud-sleuth-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index f387028a2..fdf308789 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -887,9 +887,6 @@ The following example shows setting the sender type for `web`: spring.zipkin.sender.type: web ---- -IMPORTANT: If you have Kafka on the classpath, you need to set -`spring.zipkin.kafka.enabled` to `true` apart from setting the sender type. - To customize the `RestTemplate` that sends spans to Zipkin via HTTP, you can register the `ZipkinRestTemplateCustomizer` bean. diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java index 406246459..b625e7ef8 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java @@ -36,7 +36,7 @@ import zipkin2.reporter.kafka11.KafkaSender; @ConditionalOnBean(KafkaProperties.class) @ConditionalOnMissingBean(Sender.class) @Conditional(ZipkinSenderCondition.class) -@ConditionalOnProperty(value = "spring.zipkin.kafka.enabled", havingValue = "true") +@ConditionalOnProperty(value = "spring.zipkin.sender.type", havingValue = "kafka") class ZipkinKafkaSenderConfiguration { @Value("${spring.zipkin.kafka.topic:zipkin}") private String topic; diff --git a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json deleted file mode 100644 index 8ccc93e35..000000000 --- a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ /dev/null @@ -1,8 +0,0 @@ -{"properties": [ - { - "name": "spring.zipkin.kafka.enabled", - "type": "java.lang.Boolean", - "description": "Should Kafka Zipkin sender be enabled. With Kafka on the classpath you have to set this value to true to send spans to Zipkin via Kafka.", - "defaultValue": false - } -]} \ No newline at end of file diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java index c650a84a8..055a1c0f8 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java @@ -125,7 +125,7 @@ public class ZipkinAutoConfigurationTests { public void overrideKafkaTopic() throws Exception { context = new AnnotationConfigApplicationContext(); addEnvironment(context, "spring.zipkin.kafka.topic:zipkin2", - "spring.zipkin.kafka.enabled:true"); + "spring.zipkin.sender.type:kafka"); context.register( PropertyPlaceholderAutoConfiguration.class, KafkaAutoConfiguration.class,