From 6da8b91bcde67a8fafe2467220b90e4afe3d7665 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 16 Sep 2019 15:20:00 +0200
Subject: [PATCH] Renamed the bean, fixes gh-1444

---
 .../web/TraceWebServletAutoConfiguration.java | 58 +++++++++----------
 ...SleuthTagPropagationAutoConfiguration.java |  3 +-
 2 files changed, 31 insertions(+), 30 deletions(-)

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 72467f9eb..dacce8854 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
@@ -122,39 +122,39 @@ public class TraceWebServletAutoConfiguration {
 
 	}
 
-	private static final class LazyTracingFilter implements Filter {
+}
 
-		private final BeanFactory beanFactory;
+final class LazyTracingFilter implements Filter {
 
-		private Filter tracingFilter;
+	private final BeanFactory beanFactory;
 
-		private LazyTracingFilter(BeanFactory beanFactory) {
-			this.beanFactory = beanFactory;
+	private Filter tracingFilter;
+
+	LazyTracingFilter(BeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		tracingFilter().init(filterConfig);
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		tracingFilter().doFilter(request, response, chain);
+	}
+
+	@Override
+	public void destroy() {
+		tracingFilter().destroy();
+	}
+
+	private Filter tracingFilter() {
+		if (this.tracingFilter == null) {
+			this.tracingFilter = this.beanFactory.getBean(TracingFilter.class);
 		}
-
-		@Override
-		public void init(FilterConfig filterConfig) throws ServletException {
-			tracingFilter().init(filterConfig);
-		}
-
-		@Override
-		public void doFilter(ServletRequest request, ServletResponse response,
-				FilterChain chain) throws IOException, ServletException {
-			tracingFilter().doFilter(request, response, chain);
-		}
-
-		@Override
-		public void destroy() {
-			tracingFilter().destroy();
-		}
-
-		private Filter tracingFilter() {
-			if (this.tracingFilter == null) {
-				this.tracingFilter = this.beanFactory.getBean(TracingFilter.class);
-			}
-			return this.tracingFilter;
-		}
-
+		return this.tracingFilter;
 	}
 
 }
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 7bad1c58e..e0aeb1af4 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
@@ -41,7 +41,8 @@ public class SleuthTagPropagationAutoConfiguration {
 	protected static class TagPropagationConfiguration {
 
 		@Bean
-		public FinishedSpanHandler finishedSpanHandler(SleuthProperties sleuthProperties,
+		public FinishedSpanHandler sleuthFinishedSpanHandler(
+				SleuthProperties sleuthProperties,
 				SleuthTagPropagationProperties tagPropagationProperties) {
 			return new TagPropagationFinishedSpanHandler(sleuthProperties,
 					tagPropagationProperties);