diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/src/test/resources/application.yml b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/src/test/resources/application.yml index 7d3456888..31770c728 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/src/test/resources/application.yml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/src/test/resources/application.yml @@ -1,5 +1,5 @@ logging.level.org.springframework.cloud: DEBUG logging.level.com.netflix.discovery.InstanceInfoReplicator: ERROR -logging.level.org.springframework.cloud.sleuth.brave.instrument.web.client.feign: TRACE +logging.level.org.springframework.cloud.sleuth.instrument.web.client.feign: TRACE spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration, org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/src/test/resources/application.yml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/src/test/resources/application.yml index f5756fce9..b1f8a8d34 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/src/test/resources/application.yml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/src/test/resources/application.yml @@ -1,5 +1,5 @@ logging.level.org.springframework.cloud: DEBUG logging.level.com.netflix.discovery.InstanceInfoReplicator: ERROR -logging.level.org.springframework.cloud.sleuth.brave.instrument.web.client.feign: TRACE +logging.level.org.springframework.cloud.sleuth.instrument.web.client.feign: TRACE spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration, org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration, org.springframework.cloud.gateway.config.GatewayAutoConfiguration, org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration, org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/src/test/resources/application.yml b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/src/test/resources/application.yml index caf171df7..b1f8a8d34 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/src/test/resources/application.yml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/src/test/resources/application.yml @@ -1,5 +1,5 @@ logging.level.org.springframework.cloud: DEBUG logging.level.com.netflix.discovery.InstanceInfoReplicator: ERROR -logging.level.org.springframework.cloud.sleuth.brave.instrument.web.client.feign: TRACE +logging.level.org.springframework.cloud.sleuth.instrument.web.client.feign: TRACE -spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration, org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration, org.springframework.cloud.gateway.config.GatewayAutoConfiguration, org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration, org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration \ No newline at end of file +spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration, org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration, org.springframework.cloud.gateway.config.GatewayAutoConfiguration, org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration, org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceCustomHandlerParserPostHandleWebIntegrationTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceCustomHandlerParserPostHandleWebIntegrationTests.java index 942ff6661..5c025d5c1 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceCustomHandlerParserPostHandleWebIntegrationTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceCustomHandlerParserPostHandleWebIntegrationTests.java @@ -81,7 +81,7 @@ public abstract class TraceCustomHandlerParserPostHandleWebIntegrationTests { @EnableAutoConfiguration( // spring boot test will otherwise instrument the client and server with the // same bean factory which isn't expected - excludeName = "org.springframework.cloud.sleuth.brave.instrument.web.client.TraceWebClientAutoConfiguration") + excludeName = "org.springframework.cloud.sleuth.autoconfig.instrument.web.client.TraceWebClientAutoConfiguration") @Configuration(proxyBeanMethods = false) static class TestConfig {