From 34f61908fde002ce8415c3fbefb2a70567746cd4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 24 Oct 2019 13:42:00 +0200 Subject: [PATCH] Update auto-configuration to use `@Configuration(proxyBeanMethods=false)` fixes gh-1245 --- .../SleuthAnnotationAutoConfiguration.java | 2 +- .../autoconfig/TraceAutoConfiguration.java | 41 +++++++++++-------- .../async/AsyncAutoConfiguration.java | 2 +- .../async/AsyncCustomAutoConfiguration.java | 2 +- .../async/AsyncDefaultAutoConfiguration.java | 4 +- .../SleuthHystrixAutoConfiguration.java | 2 +- .../SleuthKafkaStreamsConfiguration.java | 2 +- .../TraceMessagingAutoConfiguration.java | 10 ++--- ...aceSpringIntegrationAutoConfiguration.java | 2 +- ...TraceSpringMessagingAutoConfiguration.java | 2 +- .../TraceWebSocketAutoConfiguration.java | 2 +- .../OpentracingAutoConfiguration.java | 2 +- .../quartz/TraceQuartzAutoConfiguration.java | 13 ++++-- .../TraceReactorAutoConfiguration.java | 4 +- .../redis/TraceRedisAutoConfiguration.java | 4 +- .../rpc/TraceRpcAutoConfiguration.java | 2 +- .../rxjava/RxJavaAutoConfiguration.java | 2 +- .../TraceSchedulingAutoConfiguration.java | 2 +- .../web/TraceHttpAutoConfiguration.java | 2 +- .../web/TraceWebAutoConfiguration.java | 8 ++-- .../web/TraceWebFluxAutoConfiguration.java | 2 +- .../instrument/web/TraceWebMvcConfigurer.java | 2 +- .../web/TraceWebServletAutoConfiguration.java | 4 +- .../TraceWebAsyncClientAutoConfiguration.java | 6 +-- .../TraceWebClientAutoConfiguration.java | 18 ++++---- .../TraceFeignClientAutoConfiguration.java | 6 +-- .../zuul/TraceZuulAutoConfiguration.java | 2 +- .../log/SleuthLogAutoConfiguration.java | 4 +- ...SleuthTagPropagationAutoConfiguration.java | 4 +- .../sampler/SamplerAutoConfiguration.java | 6 +-- .../zipkin2/ZipkinAutoConfiguration.java | 6 +-- ...ckwardsCompatibilityAutoConfiguration.java | 2 +- .../ZipkinActiveMqSenderConfiguration.java | 4 +- .../ZipkinKafkaSenderConfiguration.java | 4 +- .../ZipkinRabbitSenderConfiguration.java | 2 +- ...ZipkinRestTemplateSenderConfiguration.java | 10 ++--- 36 files changed, 104 insertions(+), 88 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationAutoConfiguration.java index 09b8d1765..61503133b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Role; * @author Marcin Grzejszczak * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @ConditionalOnBean(Tracing.class) @ConditionalOnProperty(name = "spring.sleuth.annotation.enabled", matchIfMissing = true) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java index 884c80a84..e19352069 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java @@ -68,7 +68,7 @@ import org.springframework.util.StringUtils; * @author Tim Ysewyn * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.enabled", matchIfMissing = true) @EnableConfigurationProperties(SleuthProperties.class) public class TraceAutoConfiguration { @@ -108,14 +108,18 @@ public class TraceAutoConfiguration { @ConditionalOnMissingBean // NOTE: stable bean name as might be used outside sleuth Tracing tracing(@LocalServiceName String serviceName, Propagation.Factory factory, - CurrentTraceContext currentTraceContext, Sampler sampler, ErrorParser errorParser, - SleuthProperties sleuthProperties, @Nullable List> spanReporters) { - Tracing.Builder builder = Tracing.newBuilder().sampler(sampler).errorParser(errorParser) - .localServiceName(StringUtils.isEmpty(serviceName) ? DEFAULT_SERVICE_NAME : serviceName) + CurrentTraceContext currentTraceContext, Sampler sampler, + ErrorParser errorParser, SleuthProperties sleuthProperties, + @Nullable List> spanReporters) { + Tracing.Builder builder = Tracing.newBuilder().sampler(sampler) + .errorParser(errorParser) + .localServiceName(StringUtils.isEmpty(serviceName) ? DEFAULT_SERVICE_NAME + : serviceName) .propagationFactory(factory).currentTraceContext(currentTraceContext) .spanReporter(new CompositeReporter(this.spanAdjusters, spanReporters != null ? spanReporters : Collections.emptyList())) - .traceId128Bit(sleuthProperties.isTraceId128()).supportsJoin(sleuthProperties.isSupportsJoin()); + .traceId128Bit(sleuthProperties.isTraceId128()) + .supportsJoin(sleuthProperties.isSupportsJoin()); for (FinishedSpanHandler finishedSpanHandlerFactory : this.finishedSpanHandlers) { builder.addFinishedSpanHandler(finishedSpanHandlerFactory); } @@ -146,7 +150,8 @@ public class TraceAutoConfiguration { @Bean @ConditionalOnMissingBean Propagation.Factory sleuthPropagation(SleuthProperties sleuthProperties) { - if (sleuthProperties.getBaggageKeys().isEmpty() && sleuthProperties.getPropagationKeys().isEmpty() + if (sleuthProperties.getBaggageKeys().isEmpty() + && sleuthProperties.getPropagationKeys().isEmpty() && extraFieldCustomizers.isEmpty()) { return B3Propagation.FACTORY; } @@ -155,7 +160,8 @@ public class TraceAutoConfiguration { factoryBuilder = this.extraFieldPropagationFactoryBuilder; } else { - factoryBuilder = ExtraFieldPropagation.newFactoryBuilder(B3Propagation.FACTORY); + factoryBuilder = ExtraFieldPropagation + .newFactoryBuilder(B3Propagation.FACTORY); } if (!sleuthProperties.getBaggageKeys().isEmpty()) { factoryBuilder = factoryBuilder @@ -224,9 +230,11 @@ public class TraceAutoConfiguration { private final Reporter spanReporter; - private CompositeReporter(List spanAdjusters, List> spanReporters) { + private CompositeReporter(List spanAdjusters, + List> spanReporters) { this.spanAdjusters = spanAdjusters; - this.spanReporter = spanReporters.size() == 1 ? spanReporters.get(0) : new ListReporter(spanReporters); + this.spanReporter = spanReporters.size() == 1 ? spanReporters.get(0) + : new ListReporter(spanReporters); } @Override @@ -240,8 +248,8 @@ public class TraceAutoConfiguration { @Override public String toString() { - return "CompositeReporter{" + "spanAdjusters=" + this.spanAdjusters + ", spanReporters=" + this.spanReporter - + '}'; + return "CompositeReporter{" + "spanAdjusters=" + this.spanAdjusters + + ", spanReporters=" + this.spanReporter + '}'; } private static final class ListReporter implements Reporter { @@ -259,7 +267,8 @@ public class TraceAutoConfiguration { spanReporter.report(span); } catch (Exception ex) { - log.warn("Exception occurred while trying to report the span " + span, ex); + log.warn("Exception occurred while trying to report the span " + + span, ex); } } } @@ -273,7 +282,7 @@ public class TraceAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("io.micrometer.core.instrument.MeterRegistry") static class TraceMetricsInMemoryConfiguration { @@ -285,11 +294,11 @@ public class TraceAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MeterRegistry.class) static class TraceMetricsMicrometerConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReporterMetrics.class) static class NoReporterMetricsBeanConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncAutoConfiguration.java index 411900ff0..3b70b1e94 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * @author Jesus Alonso * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.scheduled.enabled", matchIfMissing = true) @EnableConfigurationProperties({ SleuthAsyncProperties.class, SleuthSchedulingProperties.class }) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncCustomAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncCustomAutoConfiguration.java index 3bd7664f1..4a3904998 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncCustomAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncCustomAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.scheduling.annotation.AsyncConfigurer; * @author Dave Syer * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(AsyncConfigurer.class) @AutoConfigureBefore(AsyncDefaultAutoConfiguration.class) @ConditionalOnProperty(value = "spring.sleuth.async.enabled", matchIfMissing = true) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncDefaultAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncDefaultAutoConfiguration.java index 61d89f5a0..41ef32689 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncDefaultAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/AsyncDefaultAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.scheduling.annotation.AsyncConfigurerSupport; * @see LazyTraceExecutor * @see TraceAsyncAspect */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ SleuthAsyncProperties.class, SleuthSchedulingProperties.class }) @ConditionalOnProperty(value = "spring.sleuth.async.enabled", matchIfMissing = true) @@ -76,7 +76,7 @@ public class AsyncDefaultAutoConfiguration { /** * Wrapper for the async executor. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(AsyncConfigurer.class) @ConditionalOnProperty(value = "spring.sleuth.async.configurer.enabled", matchIfMissing = true) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java index d7764fcd0..e370694f5 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @see SleuthHystrixConcurrencyStrategy * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(TraceAutoConfiguration.class) @ConditionalOnClass(HystrixCommand.class) @ConditionalOnBean(Tracing.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthKafkaStreamsConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthKafkaStreamsConfiguration.java index cf6022b72..0e46f3721 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthKafkaStreamsConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/SleuthKafkaStreamsConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.kafka.config.StreamsBuilderFactoryBean; * * @author Tim te Beek */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(Tracing.class) @AutoConfigureAfter({ TraceAutoConfiguration.class }) @OnMessagingEnabled diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java index fe7835dfa..2852e4107 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java @@ -81,7 +81,7 @@ import org.springframework.util.ReflectionUtils; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(Tracing.class) @AutoConfigureAfter({ TraceAutoConfiguration.class, TraceSpringMessagingAutoConfiguration.class }) @@ -89,7 +89,7 @@ import org.springframework.util.ReflectionUtils; @EnableConfigurationProperties(SleuthMessagingProperties.class) public class TraceMessagingAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.messaging.rabbit.enabled", matchIfMissing = true) @ConditionalOnClass(RabbitTemplate.class) @@ -115,7 +115,7 @@ public class TraceMessagingAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.messaging.kafka.enabled", matchIfMissing = true) @ConditionalOnClass(ProducerFactory.class) @@ -154,7 +154,7 @@ public class TraceMessagingAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.messaging.jms.enabled", matchIfMissing = true) @ConditionalOnClass(JmsListenerConfigurer.class) @@ -199,7 +199,7 @@ public class TraceMessagingAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.messaging.sqs.enabled", matchIfMissing = true) @ConditionalOnClass(QueueMessageHandler.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringIntegrationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringIntegrationAutoConfiguration.java index cadf8677a..92c4277ee 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringIntegrationAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringIntegrationAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.messaging.support.MessageHeaderAccessor; * @since 1.0.0 * @see TracingChannelInterceptor */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(GlobalChannelInterceptor.class) @ConditionalOnBean(Tracing.class) @AutoConfigureAfter({ TraceAutoConfiguration.class, diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringMessagingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringMessagingAutoConfiguration.java index 20ff81445..122111cf6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringMessagingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringMessagingAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.support.MessageHeaderAccessor; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(MessageHeaderAccessor.class) @OnMessagingEnabled @EnableConfigurationProperties(SleuthMessagingProperties.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java index dd08d8f42..a46019110 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry; * @since 1.0.0 * @see AbstractWebSocketMessageBrokerConfigurer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(DelegatingWebSocketMessageBrokerConfiguration.class) @ConditionalOnBean(Tracing.class) @ConditionalOnProperty(value = "spring.sleuth.integration.websockets.enabled", diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java index e3e2b3569..db5a633d6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.opentracing.enabled", matchIfMissing = true) @ConditionalOnBean(Tracing.class) @ConditionalOnClass(Tracer.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/quartz/TraceQuartzAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/quartz/TraceQuartzAutoConfiguration.java index 460009871..58263b87d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/quartz/TraceQuartzAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/quartz/TraceQuartzAutoConfiguration.java @@ -19,7 +19,9 @@ package org.springframework.cloud.sleuth.instrument.quartz; import brave.Tracing; import org.quartz.Scheduler; +import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -35,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Branden Cash * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean({ Tracing.class, Scheduler.class }) @AutoConfigureAfter({ TraceAutoConfiguration.class, QuartzAutoConfiguration.class }) @ConditionalOnProperty(value = "spring.sleuth.quartz.enabled", matchIfMissing = true) @@ -50,6 +52,9 @@ public class TraceQuartzAutoConfiguration implements InitializingBean { this.tracing = tracing; } + @Autowired + BeanFactory beanFactory; + @Bean public TracingJobListener tracingJobListener() { return new TracingJobListener(tracing); @@ -57,8 +62,10 @@ public class TraceQuartzAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - scheduler.getListenerManager().addTriggerListener(tracingJobListener()); - scheduler.getListenerManager().addJobListener(tracingJobListener()); + TracingJobListener tracingJobListener = beanFactory + .getBean(TracingJobListener.class); + scheduler.getListenerManager().addTriggerListener(tracingJobListener); + scheduler.getListenerManager().addJobListener(tracingJobListener); } } 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 af5751e0f..0e028c878 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 @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.reactor.enabled", matchIfMissing = true) @ConditionalOnClass(Mono.class) @AutoConfigureAfter(TraceWebFluxAutoConfiguration.class) @@ -57,7 +57,7 @@ public class TraceReactorAutoConfiguration { static final String SLEUTH_REACTOR_EXECUTOR_SERVICE_KEY = "sleuth"; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(Tracing.class) static class TraceReactorConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisAutoConfiguration.java index 996a3e595..e986cc234 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/redis/TraceRedisAutoConfiguration.java @@ -37,13 +37,13 @@ import org.springframework.context.annotation.Configuration; * @author Chao Chang * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @OnRedisEnabled @ConditionalOnBean({ Tracing.class, ClientResources.class }) @AutoConfigureAfter({ TraceAutoConfiguration.class }) public class TraceRedisAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) static class LettuceConfig { @Bean diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java index 24efddb9c..d9a9feb63 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.lang.Nullable; * * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.sleuth.rpc.enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnBean(Tracing.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/RxJavaAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/RxJavaAutoConfiguration.java index 82c63b933..f721b83f4 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/RxJavaAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/RxJavaAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Shivang Shah * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(TraceAutoConfiguration.class) @ConditionalOnBean(Tracing.class) @ConditionalOnClass(RxJavaSchedulersHook.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java index fefccadbe..45765ce35 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * @since 1.0.0 * @see TraceSchedulingAspect */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy @ConditionalOnProperty(value = "spring.sleuth.scheduled.enabled", matchIfMissing = true) @ConditionalOnBean(Tracing.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java index 0bbff7249..3d85b8cfe 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java @@ -47,7 +47,7 @@ import org.springframework.lang.Nullable; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(TraceWebAutoConfiguration.class) @ConditionalOnProperty(name = "spring.sleuth.http.enabled", havingValue = "true", matchIfMissing = true) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 98ac71ac6..3e56cf99a 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; * @author Tim Ysewyn * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.web.enabled", matchIfMissing = true) @ConditionalOnBean(Tracing.class) @AutoConfigureAfter(TraceAutoConfiguration.class) @@ -80,7 +80,7 @@ public class TraceWebAutoConfiguration { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ManagementServerProperties.class) @ConditionalOnProperty(value = "spring.sleuth.web.ignoreAutoConfiguredSkipPatterns", havingValue = "false", matchIfMissing = true) @@ -111,7 +111,7 @@ public class TraceWebAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ServerProperties.class, EndpointsSupplier.class, ExposableWebEndpoint.class }) @ConditionalOnBean(ServerProperties.class) @@ -197,7 +197,7 @@ public class TraceWebAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DefaultSkipPatternConfig { private static String combinedPattern(String skipPattern, diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxAutoConfiguration.java index 577cc84fa..3a78d34bc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.web.enabled", matchIfMissing = true) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnBean(Tracing.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java index 185e9bf59..dff8d7b0e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java @@ -31,7 +31,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Marcin Grzejszczak * @since 1.0.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(SpanCustomizingAsyncHandlerInterceptor.class) class TraceWebMvcConfigurer implements WebMvcConfigurer { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java index 6d4129a6c..d39a71a69 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Spencer Gibb * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.web.enabled", matchIfMissing = true) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnBean(HttpTracing.class) @@ -108,7 +108,7 @@ public class TraceWebServletAutoConfiguration { * Nested config that configures Web MVC if it's present (without adding a runtime * dependency to it). */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebMvcConfigurer.class) @Import(TraceWebMvcConfigurer.class) protected static class TraceWebMvcAutoConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java index e62c0c9d1..c7dad35fe 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.web.client.AsyncRestTemplate; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @SleuthWebClientEnabled @ConditionalOnProperty(value = "spring.sleuth.web.async.client.enabled", matchIfMissing = true) @@ -54,7 +54,7 @@ import org.springframework.web.client.AsyncRestTemplate; @AutoConfigureAfter(TraceWebServletAutoConfiguration.class) public class TraceWebAsyncClientAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(AsyncRestTemplate.class) static class AsyncRestTemplateConfig { @@ -65,7 +65,7 @@ public class TraceWebAsyncClientAutoConfiguration { .create(httpTracing); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TraceInterceptorConfiguration { @Autowired(required = false) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java index 3028c6f90..b1004285f 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java @@ -62,14 +62,14 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @SleuthWebClientEnabled @ConditionalOnBean(HttpTracing.class) @AutoConfigureAfter(TraceWebServletAutoConfiguration.class) @AutoConfigureBefore(HttpClientConfiguration.class) public class TraceWebClientAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestTemplate.class) static class RestTemplateConfig { @@ -80,7 +80,7 @@ public class TraceWebClientAutoConfiguration { .create(httpTracing); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TraceInterceptorConfiguration { @Autowired @@ -103,7 +103,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpClientBuilder.class) static class HttpClientBuilderConfig { @@ -115,7 +115,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpAsyncClientBuilder.class) static class HttpAsyncClientBuilderConfig { @@ -127,7 +127,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) static class WebClientConfig { @@ -139,7 +139,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpHeadersFilter.class) static class HttpHeadersFilterConfig { @@ -155,7 +155,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpClient.class) static class NettyConfiguration { @@ -167,7 +167,7 @@ public class TraceWebClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ UserInfoRestTemplateCustomizer.class, OAuth2RestTemplate.class }) protected static class TraceOAuthConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java index c1c5ed248..d65cc10d0 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Scope; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.feign.enabled", matchIfMissing = true) @ConditionalOnClass({ Client.class, FeignContext.class }) @ConditionalOnBean(HttpTracing.class) @@ -80,7 +80,7 @@ public class TraceFeignClientAutoConfiguration { return new TraceFeignAspect(beanFactory); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.sleuth.feign.processor.enabled", matchIfMissing = true) protected static class FeignBeanPostProcessorConfiguration { @@ -93,7 +93,7 @@ public class TraceFeignClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(OkHttpClient.class) protected static class OkHttpClientFeignBeanPostProcessorConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java index 70bc66699..736b33d22 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Dave Syer * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.zuul.enabled", matchIfMissing = true) @ConditionalOnWebApplication @ConditionalOnClass(ZuulFilter.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java index 61aa77f81..b6a63ceb7 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.enabled", matchIfMissing = true) @AutoConfigureBefore(TraceAutoConfiguration.class) public class SleuthLogAutoConfiguration { @@ -46,7 +46,7 @@ public class SleuthLogAutoConfiguration { /** * Configuration for Slfj4. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MDC.class) @EnableConfigurationProperties(SleuthSlf4jProperties.class) protected static class Slf4jConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java index 2ad51e170..da8bb98f3 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java @@ -30,12 +30,12 @@ import org.springframework.context.annotation.Configuration; * @author Taras Danylchuk * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.enabled", matchIfMissing = true) @AutoConfigureBefore(TraceAutoConfiguration.class) public class SleuthTagPropagationAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.propagation.tag.enabled", matchIfMissing = true) @EnableConfigurationProperties(SleuthTagPropagationProperties.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerAutoConfiguration.java index 8870d3b2d..a94472e1b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/SamplerAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.enabled", matchIfMissing = true) @EnableConfigurationProperties(SamplerProperties.class) public class SamplerAutoConfiguration { @@ -45,7 +45,7 @@ public class SamplerAutoConfiguration { return new RateLimitingSampler(config); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean( type = "org.springframework.cloud.context.scope.refresh.RefreshScope") protected static class RefreshScopedSamplerConfiguration { @@ -59,7 +59,7 @@ public class SamplerAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean( type = "org.springframework.cloud.context.scope.refresh.RefreshScope") protected static class NonRefreshScopeSamplerConfiguration { diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java index 353fb17a5..df57d7894 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java @@ -67,7 +67,7 @@ import org.springframework.web.client.RestTemplate; * @see ZipkinRestTemplateCustomizer * @see DefaultZipkinRestTemplateCustomizer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ZipkinProperties.class) @ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true) @@ -142,7 +142,7 @@ public class ZipkinAutoConfiguration { return new DefaultZipkinRestTemplateCustomizer(zipkinProperties); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(EndpointLocator.class) @ConditionalOnProperty(value = "spring.zipkin.locator.discovery.enabled", havingValue = "false", matchIfMissing = true) @@ -168,7 +168,7 @@ public class ZipkinAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Registration.class) @ConditionalOnMissingBean(EndpointLocator.class) @ConditionalOnProperty(value = "spring.zipkin.locator.discovery.enabled", diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java index 22bd0d28c..e58326656 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.util.Assert; * @see ZipkinAutoConfiguration * @deprecated left for backward compatibility */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true) @AutoConfigureBefore(ZipkinAutoConfiguration.class) diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinActiveMqSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinActiveMqSenderConfiguration.java index f33cfc325..4f4426a17 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinActiveMqSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinActiveMqSenderConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ActiveMQConnectionFactory.class) @ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME) @Conditional(ZipkinSenderCondition.class) @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; @AutoConfigureAfter(ActiveMQAutoConfiguration.class) class ZipkinActiveMqSenderConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(ActiveMQConnectionFactory.class) static class ZipkinActiveMqSenderBeanConfiguration { diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java index f4b500360..4cb4576d1 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java @@ -34,14 +34,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ByteArraySerializer.class) @ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME) @Conditional(ZipkinSenderCondition.class) @ConditionalOnProperty(value = "spring.zipkin.sender.type", havingValue = "kafka") class ZipkinKafkaSenderConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(KafkaProperties.class) static class ZipkinKafkaSenderBeanConfiguration { diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRabbitSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRabbitSenderConfiguration.java index 26b3e7b7c..f30c627c5 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRabbitSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRabbitSenderConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(CachingConnectionFactory.class) @ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME) @Conditional(ZipkinSenderCondition.class) diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java index 764060bd2..c00f5a9ec 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME) @Conditional(ZipkinSenderCondition.class) @EnableConfigurationProperties(ZipkinSenderProperties.class) @@ -125,7 +125,7 @@ class ZipkinRestTemplateSenderConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.cloud.client.loadbalancer.LoadBalancerClient") static class DefaultZipkinUrlExtractorConfiguration { @@ -140,11 +140,11 @@ class ZipkinRestTemplateSenderConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LoadBalancerClient.class) static class DiscoveryClientZipkinUrlExtractorConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "true", matchIfMissing = true) static class ZipkinClientLoadBalancedConfiguration { @@ -162,7 +162,7 @@ class ZipkinRestTemplateSenderConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "false") static class ZipkinClientNoOpConfiguration {