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

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-01-29 11:18:59 +01:00
parent 17181c36af 68f107c2b6
commit 93adede43a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
View File

@@ -39,13 +39,16 @@ public class TraceReactorAutoConfiguration {
@Configuration
@ConditionalOnBean(Tracing.class)
static class TraceReactorConfiguration {
private static final String SLEUTH_TRACE_REACTOR_KEY = TraceReactorConfiguration.class.getName();
@Autowired Tracing tracing;
@Autowired BeanFactory beanFactory;
@Autowired LastOperatorWrapper lastOperatorWrapper;
@Bean
@ConditionalOnNotWebApplication LastOperatorWrapper spanOperator() {
return tracer -> Hooks.onLastOperator(ReactorSleuth.spanOperator(tracer));
return tracer -> Hooks.onLastOperator(SLEUTH_TRACE_REACTOR_KEY, ReactorSleuth.spanOperator(tracer));
}
@Bean

1
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
View File

@@ -210,7 +210,6 @@ public class SpanSubscriberTests {
}
@AfterClass
@BeforeClass
public static void cleanup() {
Hooks.resetOnLastOperator();
Schedulers.resetFactory();