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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-09-16 15:20:34 +02:00
parent d4baa732be 6da8b91bcd
commit 3859f48099
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java
View File

@@ -115,39 +115,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;
}
}

3
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java
View File

@@ -42,7 +42,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);