From 4eb9a641137e2d4c5fb7d3959d518335f59fbf3c Mon Sep 17 00:00:00 2001 From: single-wolf Date: Wed, 20 Jan 2021 22:25:26 +0800 Subject: [PATCH] Fix to prevent override a implicit AsyncTaskExecutor (#313) --- .../spring/cloud/async/DefaultAsyncAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/DefaultAsyncAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/DefaultAsyncAutoConfiguration.java index 3f341bc2..5a049a80 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/DefaultAsyncAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/DefaultAsyncAutoConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; import org.springframework.core.task.SimpleAsyncTaskExecutor; +import org.springframework.core.task.TaskExecutor; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.AsyncConfigurerSupport; import org.springframework.scheduling.annotation.EnableAsync; @@ -47,7 +48,7 @@ public class DefaultAsyncAutoConfiguration { private Tracer tracer; @Configuration - @ConditionalOnMissingBean(AsyncConfigurer.class) + @ConditionalOnMissingBean({AsyncConfigurer.class, TaskExecutor.class, Executor.class}) static class DefaultTracedAsyncConfigurerSupport extends AsyncConfigurerSupport { @Autowired