From 4bd484fb214f65736efd6e8903cfb308e700ec88 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 19 Feb 2016 10:10:11 +0100 Subject: [PATCH] Moved turning on of autoproxy to properties --- .../cloud/sleuth/autoconfig/TraceAutoConfiguration.java | 2 -- .../cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java | 3 +++ 2 files 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 90c1916d7..8895f1c06 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 @@ -39,14 +39,12 @@ import org.springframework.cloud.sleuth.trace.DefaultTracer; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * @author Spencer Gibb */ @Configuration @ConditionalOnProperty(value="spring.sleuth.enabled", matchIfMissing=true) -@EnableAspectJAutoProxy(proxyTargetClass = true) @EnableConfigurationProperties public class TraceAutoConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java index 6e7aae951..e2692405f 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceEnvironmentPostProcessor.java @@ -27,6 +27,8 @@ import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; /** + * Adds a default logging pattern level that prints trace infotmation + * * @author Dave Syer * */ @@ -42,6 +44,7 @@ public class TraceEnvironmentPostProcessor implements EnvironmentPostProcessor { // traces in logs without having to configure it. map.put("logging.pattern.level", "%clr(%5p) %clr([${spring.application.name:},%X{X-Trace-Id:-},%X{X-Span-Id:-},%X{X-Span-Export:-}]){yellow}"); + map.put("spring.aop.proxyTargetClass", "true"); addOrReplace(environment.getPropertySources(), map); }