From c9cdb7e4c34204e0d53aad9d511aba62f96f83d4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 22 Apr 2016 11:35:16 +0200 Subject: [PATCH] Added missing conditionals --- .../cloud/sleuth/stream/SleuthStreamAutoConfiguration.java | 1 + .../cloud/sleuth/zipkin/ZipkinAutoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/SleuthStreamAutoConfiguration.java b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/SleuthStreamAutoConfiguration.java index 2414c2539..c5e748e9b 100644 --- a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/SleuthStreamAutoConfiguration.java +++ b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/SleuthStreamAutoConfiguration.java @@ -71,6 +71,7 @@ public class SleuthStreamAutoConfiguration { } @Bean + @ConditionalOnMissingBean public StreamSpanReporter sleuthStreamSpanReporter(HostLocator endpointLocator, SpanMetricReporter spanMetricReporter) { return new StreamSpanReporter(endpointLocator, spanMetricReporter); diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java index f0eb488de..f6c95285a 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration; public class ZipkinAutoConfiguration { @Bean - @ConditionalOnMissingBean(ZipkinSpanReporter.class) + @ConditionalOnMissingBean public ZipkinSpanReporter reporter(SpanMetricReporter spanMetricReporter, ZipkinProperties zipkin) { return new HttpZipkinSpanReporter(zipkin.getBaseUrl(), zipkin.getFlushInterval(), zipkin.getCompression().isEnabled(), spanMetricReporter);