diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java index dc05aa4d1..ed411d64c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java @@ -46,6 +46,7 @@ public abstract class ReactorSleuth { private ReactorSleuth() { } + private static SpanSubscriptionProvider spanSubscriptionProvider( BeanFactory beanFactory, Scannable scannable, CoreSubscriber sub) { return new SpanSubscriptionProvider(beanFactory, sub, sub.currentContext(), diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java index 055dda68a..ff46b681e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java @@ -17,12 +17,15 @@ package org.springframework.cloud.sleuth.instrument.reactor; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import javax.annotation.PreDestroy; import brave.Tracing; +import reactor.core.publisher.Hooks; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -35,15 +38,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.sleuth.instrument.async.TraceableScheduledExecutorService; import org.springframework.cloud.sleuth.instrument.web.TraceWebFluxAutoConfiguration; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.event.ContextRefreshedEvent; -import reactor.core.publisher.Hooks; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Schedulers; /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration @@ -89,7 +86,8 @@ class HookRegisteringBeanDefinitionRegistryPostProcessor private final ConfigurableApplicationContext context; - HookRegisteringBeanDefinitionRegistryPostProcessor(ConfigurableApplicationContext context) { + HookRegisteringBeanDefinitionRegistryPostProcessor( + ConfigurableApplicationContext context) { this.context = context; } @@ -117,7 +115,8 @@ class HookRegisteringBeanDefinitionRegistryPostProcessor public ScheduledExecutorService decorateExecutorService(String schedulerType, Supplier actual) { return new TraceableScheduledExecutorService( - HookRegisteringBeanDefinitionRegistryPostProcessor.this.context, actual.get()); + HookRegisteringBeanDefinitionRegistryPostProcessor.this.context, + actual.get()); } }; } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java index 168942ea5..5c036be54 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java @@ -276,6 +276,7 @@ public class SleuthSpanCreatorAspectWebFluxTests { public void clear() { this.span = null; } + } @RestController diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/Issue866Configuration.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/Issue866Configuration.java index 5987362d0..ff27ca43c 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/Issue866Configuration.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/Issue866Configuration.java @@ -35,7 +35,8 @@ public class Issue866Configuration { public static TestHook hook; @Bean - HookRegisteringBeanDefinitionRegistryPostProcessor overridingProcessorForTests(ConfigurableApplicationContext context) { + HookRegisteringBeanDefinitionRegistryPostProcessor overridingProcessorForTests( + ConfigurableApplicationContext context) { TestHook hook = new TestHook(context); Issue866Configuration.hook = hook; return hook;