From 4dbb2f89ece9462f8bbc4a7a2cb88d21bc6b0785 Mon Sep 17 00:00:00 2001 From: Ingyu Hwang Date: Mon, 5 Aug 2019 16:47:21 +0900 Subject: [PATCH] Fixes gh-1417 Remove ConditionalOnProperty for supporting yaml (#1418) --- .../SleuthTagPropagationAutoConfiguration.java | 1 - ...uthTagPropagationAutoConfigurationTests.java | 17 ++++++++++++++--- .../resources/application-tag-propagation.yml | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 spring-cloud-sleuth-core/src/test/resources/application-tag-propagation.yml diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java index 500369c13..2cc7c9456 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java @@ -42,7 +42,6 @@ public class SleuthTagPropagationAutoConfiguration { protected static class TagPropagationConfiguration { @Bean - @ConditionalOnProperty("spring.sleuth.propagation.tag.whitelisted-keys") public FinishedSpanHandler finishedSpanHandler(SleuthProperties sleuthProperties, SleuthTagPropagationProperties tagPropagationProperties) { return new TagPropagationFinishedSpanHandler(sleuthProperties, diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java index 1dd57826b..8314c2c15 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java @@ -31,9 +31,10 @@ public class SleuthTagPropagationAutoConfigurationTests { AutoConfigurations.of(SleuthTagPropagationAutoConfiguration.class)); @Test - public void shouldNotCreateHandler() { - this.contextRunner.run((context) -> { - assertThat(context).doesNotHaveBean(TagPropagationFinishedSpanHandler.class); + public void shouldCreateHandlerByDefault() { + this.contextRunner + .withUserConfiguration(TraceAutoConfiguration.class).run((context) -> { + assertThat(context).hasSingleBean(TagPropagationFinishedSpanHandler.class); }); } @@ -60,4 +61,14 @@ public class SleuthTagPropagationAutoConfigurationTests { }); } + @Test + public void shouldCreateHandlerWithYml() { + this.contextRunner + .withPropertyValues( + "spring.profiles.active=tag-propagation") + .withUserConfiguration(TraceAutoConfiguration.class).run((context) -> { + assertThat(context) + .hasSingleBean(TagPropagationFinishedSpanHandler.class); + }); + } } diff --git a/spring-cloud-sleuth-core/src/test/resources/application-tag-propagation.yml b/spring-cloud-sleuth-core/src/test/resources/application-tag-propagation.yml new file mode 100644 index 000000000..fbaa54030 --- /dev/null +++ b/spring-cloud-sleuth-core/src/test/resources/application-tag-propagation.yml @@ -0,0 +1,3 @@ +spring.sleuth.propagation.tag.whitelisted-keys: + - foo + - bar \ No newline at end of file