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

Makes the new queueInstrumentation opt-in

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-02-26 13:53:52 +01:00
parent 4b123747b3
commit 2e902a7fec
8 changed files with 27 additions and 21 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/instrument/reactor/TraceReactorAutoConfiguration.java
View File

@@ -234,7 +234,7 @@ class HookRegisteringBeanDefinitionRegistryPostProcessor
"You have explicitly set the decorate hooks option but you're using an old version of Reactor. Please upgrade to the latest Boot version (at least 2.3.9.RELEASE). Will fall back to the previous reactor instrumentation mode");
}
else {
decorateQueues = decorateQueues != null ? decorateQueues : Boolean.TRUE;
decorateQueues = decorateQueues != null ? decorateQueues : Boolean.FALSE;
}
if (wrapperOnClasspathHooksPropertyTurnedOn(decorateQueues)) {
if (log.isTraceEnabled()) {

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceNoWebEnvironmentTests.java
View File

@@ -49,8 +49,7 @@ public class TraceNoWebEnvironmentTests {
}
catch (Exception e) {
Throwable cause = e.getCause() != null ? e.getCause() : e;
then(cause.getClass())
.isNotEqualTo(NoSuchBeanDefinitionException.class);
then(cause.getClass()).isNotEqualTo(NoSuchBeanDefinitionException.class);
}
}

2
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
View File

@@ -167,7 +167,7 @@ public class WebClientTests {
this.testErrorController.clear();
this.fooController.clear();
}
@Before
public void setup() {
log.info("Starting test");