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

Stops wrapping the Reactor's ExecutorService; fixes gh-1786

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-25 14:37:14 +01:00
parent 16a9d3633e
commit f027196b84
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/reactor/TraceReactorAutoConfiguration.java
View File

@@ -42,7 +42,6 @@ import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEven
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
import org.springframework.cloud.sleuth.autoconfig.otel.OtelAutoConfiguration;
import org.springframework.cloud.sleuth.instrument.async.TraceableScheduledExecutorService;
import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
@@ -187,9 +186,6 @@ class HookRegisteringBeanDefinitionRegistryPostProcessor implements BeanDefiniti
else if (property == SleuthReactorProperties.InstrumentationType.MANUAL) {
decorateOnLast(ReactorSleuth.springContextSpanOperator(springContext));
}
Schedulers.setExecutorServiceDecorator(TraceReactorAutoConfiguration.SLEUTH_REACTOR_EXECUTOR_SERVICE_KEY,
(scheduler, scheduledExecutorService) -> new TraceableScheduledExecutorService(springContext,
scheduledExecutorService));
}
private static void decorateOnLast(Function<? super Publisher<Object>, ? extends Publisher<Object>> function) {

8
tests/common/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfigurationTests.java
View File

@@ -120,7 +120,7 @@ public abstract class ZipkinAutoConfigurationTests {
context.getBean(Tracer.class).nextSpan().name("foo").tag("foo", "bar").start().end();
context.getBean(ZipkinAutoConfiguration.REPORTER_BEAN_NAME, AsyncReporter.class).flush();
Awaitility.await().atMost(250, TimeUnit.MILLISECONDS)
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.untilAsserted(() -> then(this.server.getRequestCount()).isGreaterThan(1));
Awaitility.await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
@@ -147,7 +147,7 @@ public abstract class ZipkinAutoConfigurationTests {
"spring.zipkin.encoder=JSON_V1").run(context -> {
context.getBean(Tracer.class).nextSpan().name("foo").tag("foo", "bar").start().end();
Awaitility.await().atMost(250, TimeUnit.MILLISECONDS)
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.untilAsserted(() -> then(this.server.getRequestCount()).isGreaterThan(0));
Awaitility.await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
@@ -209,12 +209,12 @@ public abstract class ZipkinAutoConfigurationTests {
context.getBean(Tracer.class).nextSpan().name("foo").tag("foo", "bar").start().end();
Awaitility.await().atMost(250, TimeUnit.MILLISECONDS)
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.untilAsserted(() -> then(this.server.getRequestCount()).isEqualTo(0));
context.getBean(ZipkinAutoConfiguration.REPORTER_BEAN_NAME, AsyncReporter.class).flush();
MyConfig.MySender sender = context.getBean(MyConfig.MySender.class);
Awaitility.await().atMost(250, TimeUnit.MILLISECONDS)
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.untilAsserted(() -> then(sender.isSpanSent()).isTrue());
});
}