From bd7c25f3414d04aea84d8742e366b6589c20c28f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 7 Aug 2020 12:15:57 +0200 Subject: [PATCH] Something has changed with bootstrap config --- .../TraceAutoConfigurationWithDisabledSleuthTests.java | 1 - .../src/test/resources/application-disabled.yml | 3 +++ .../src/test/resources/bootstrap-disabled.yml | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 spring-cloud-sleuth-core/src/test/resources/application-disabled.yml 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 43384c73f..8fc43d109 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 @@ -41,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat; classes = TraceAutoConfigurationWithDisabledSleuthTests.Config.class) @ActiveProfiles("disabled") @ExtendWith(OutputCaptureExtension.class) -@DirtiesContext public class TraceAutoConfigurationWithDisabledSleuthTests { private static final Log log = LogFactory diff --git a/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml b/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml new file mode 100644 index 000000000..19d33f4a3 --- /dev/null +++ b/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml @@ -0,0 +1,3 @@ +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 a2d1a7bc3..72d915911 100644 --- a/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml +++ b/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml @@ -1,5 +1,3 @@ spring: application: name: foo - sleuth: - enabled: false