From ab44f141e43eb9a40344ccf42b3bacdeb9b8f295 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 21 Jan 2019 10:59:27 +0100 Subject: [PATCH] Polish --- ...inBackwardsCompatibilityAutoConfiguration.java | 15 +++++++++++++-- .../src/main/resources/META-INF/spring.factories | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java index 176530e08..7ced611b7 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java @@ -105,6 +105,17 @@ class ZipkinBackwardsCompatibilityAutoConfiguration { return new InMemoryReporterMetrics(); } + /** + * Old approach: + * - one sender + * - one reporter + * + * This auto configuration verifies if we have the old approach. In which + * case we define the missing beans. + * + * In case of having more senders and more reporters, we don't need to + * use the backward compatiblity bean setup. + */ static class BackwardsCompatibilityCondition extends SpringBootCondition implements ConfigurationCondition { @@ -126,9 +137,9 @@ class ZipkinBackwardsCompatibilityAutoConfiguration { // Previously we supported 1 Sender bean at a time // which could be overridden by another auto-configuration. // Now we support both the overridden bean and our default zipkinSender bean. - if (foundSenders < 2) { + if (foundSenders > 1) { return ConditionOutcome.noMatch( - "We don't support backwards compatibility for more than 2 Sender beans"); + "We don't support backwards compatibility for more than 1 Sender beans"); } int foundReporters = listableBeanFactory .getBeanNamesForType(Reporter.class).length; diff --git a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories b/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories index d9fa3ceb7..1a3da5a25 100644 --- a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.cloud.sleuth.zipkin2.ZipkinAutoConfiguration,\ - org.springframework.cloud.sleuth.zipkin2.ZipkinBackwardsCompatibilityAutoConfiguration \ No newline at end of file +org.springframework.cloud.sleuth.zipkin2.ZipkinBackwardsCompatibilityAutoConfiguration \ No newline at end of file