Skip to content

Commit 2713950

Browse files
dlsrb6342marcingrzejszczak
authored andcommitted
Fixes gh-1417 Remove ConditionalOnProperty for supporting yaml (#1418)
1 parent facce03 commit 2713950

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class SleuthTagPropagationAutoConfiguration {
4141
protected static class TagPropagationConfiguration {
4242

4343
@Bean
44-
@ConditionalOnProperty("spring.sleuth.propagation.tag.whitelisted-keys")
4544
public FinishedSpanHandler finishedSpanHandler(SleuthProperties sleuthProperties,
4645
SleuthTagPropagationProperties tagPropagationProperties) {
4746
return new TagPropagationFinishedSpanHandler(sleuthProperties,

spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ public class SleuthTagPropagationAutoConfigurationTests {
3131
AutoConfigurations.of(SleuthTagPropagationAutoConfiguration.class));
3232

3333
@Test
34-
public void shouldNotCreateHandler() {
35-
this.contextRunner.run((context) -> {
36-
assertThat(context).doesNotHaveBean(TagPropagationFinishedSpanHandler.class);
34+
public void shouldCreateHandlerByDefault() {
35+
this.contextRunner
36+
.withUserConfiguration(TraceAutoConfiguration.class).run((context) -> {
37+
assertThat(context).hasSingleBean(TagPropagationFinishedSpanHandler.class);
3738
});
3839
}
3940

@@ -60,4 +61,14 @@ public void shouldCreateHandler() {
6061
});
6162
}
6263

64+
@Test
65+
public void shouldCreateHandlerWithYml() {
66+
this.contextRunner
67+
.withPropertyValues(
68+
"spring.profiles.active=tag-propagation")
69+
.withUserConfiguration(TraceAutoConfiguration.class).run((context) -> {
70+
assertThat(context)
71+
.hasSingleBean(TagPropagationFinishedSpanHandler.class);
72+
});
73+
}
6374
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
spring.sleuth.propagation.tag.whitelisted-keys:
2+
- foo
3+
- bar

0 commit comments

Comments
 (0)