From 06ed49b4b4ff65f8a70e1c9130dd21d5910cc317 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 13 Apr 2018 09:03:19 +0200 Subject: [PATCH] Added a stable name for Tracer; fixes gh-939 --- .../cloud/sleuth/autoconfig/TraceAutoConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 4825e05bf..f265cd1f3 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 @@ -56,6 +56,8 @@ import zipkin2.reporter.Reporter; @EnableConfigurationProperties({ TraceKeys.class, SleuthProperties.class }) public class TraceAutoConfiguration { + public static final String TRACER_BEAN_NAME = "tracer"; + @Autowired(required = false) List spanAdjusters = new ArrayList<>(); @Bean @@ -91,9 +93,8 @@ public class TraceAutoConfiguration { }; } - @Bean + @Bean(name = TRACER_BEAN_NAME) @ConditionalOnMissingBean - // NOTE: stable bean name as might be used outside sleuth Tracer tracer(Tracing tracing) { return tracing.tracer(); }