SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made the feature opt-in

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-12-17 10:54:19 +01:00
parent 321f5c6b2d
commit 7c04ee4c7f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
public class SleuthTagPropagationAutoConfiguration {
@Configuration
@ConditionalOnProperty(value = "spring.sleuth.propagation.tag.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.propagation.tag.enabled")
@EnableConfigurationProperties(SleuthTagPropagationProperties.class)
protected static class TagPropagationConfiguration {

9
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTest.java → spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java
View File

@@ -23,7 +23,7 @@ import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
public class SleuthTagPropagationAutoConfigurationTest {
public class SleuthTagPropagationAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SleuthTagPropagationAutoConfiguration.class));
@@ -37,10 +37,8 @@ public class SleuthTagPropagationAutoConfigurationTest {
}
@Test
public void shouldNotCreateHandlerByDisablingIt() {
public void shouldNotCreateHandlerByDefault() {
this.contextRunner
.withPropertyValues("spring.sleuth.propagation.tag.whitelisted-keys=some-key")
.withPropertyValues("spring.sleuth.propagation.tag.enabled=false")
.withUserConfiguration(TraceAutoConfiguration.class)
.run((context) -> {
assertThat(context).doesNotHaveBean(TagPropagationFinishedSpanHandler.class);
@@ -48,8 +46,9 @@ public class SleuthTagPropagationAutoConfigurationTest {
}
@Test
public void shouldCreateHandler() {
public void shouldCreateHandlerWhenEnabled() {
this.contextRunner
.withPropertyValues("spring.sleuth.propagation.tag.enabled=true")
.withPropertyValues("spring.sleuth.propagation.tag.whitelisted-keys=some-key")
.withUserConfiguration(TraceAutoConfiguration.class)
.run((context) -> {