From e9b27e6a49276c90f5c74a75cfb65bb9840ce421 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 21 Sep 2015 19:56:56 +0200 Subject: [PATCH] Removed ConditionalOnMissingBean. Fixes #42 --- .../cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java | 3 --- 1 file changed, 3 deletions(-) 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 8807662e2..5ac4f41bf 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 @@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.embedded.FilterRegistrationBean; @@ -57,13 +56,11 @@ public class TraceWebAutoConfiguration { private Trace trace; @Bean - @ConditionalOnMissingBean public TraceWebAspect traceWebAspect() { return new TraceWebAspect(this.trace); } @Bean - @ConditionalOnMissingBean public FilterRegistrationBean traceWebFilter(ApplicationEventPublisher publisher) { Pattern pattern = StringUtils.hasText(this.skipPattern) ? Pattern.compile(this.skipPattern) : TraceFilter.DEFAULT_SKIP_PATTERN;