diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java index e620c2349..3da93c116 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java @@ -37,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest( // WebEnvironment.NONE will not read a Yaml profile webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "spring.config.use-legacy-processing=true" }, classes = TraceAutoConfigurationWithDisabledSleuthTests.Config.class) @ActiveProfiles("disabled") @ExtendWith(OutputCaptureExtension.class) diff --git a/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml b/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml deleted file mode 100644 index 19d33f4a3..000000000 --- a/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - sleuth: - enabled: false diff --git a/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml b/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml index 00f987504..c92cb91a0 100644 --- a/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml +++ b/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml @@ -1,3 +1,5 @@ spring: application: name: disabledapplication + sleuth: + enabled: false