From 5dcf8572a30799d209a4a0fd30c1741bb91852aa Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 27 Dec 2017 09:41:45 +0100 Subject: [PATCH] Added back @RefreshScope to ZipkinAutoConfig; fixes #814 --- .../cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java index ea2c5fe65..2c64bb7f4 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.commons.util.InetUtils; -//import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.sleuth.Sampler; import org.springframework.cloud.sleuth.SpanAdjuster; import org.springframework.cloud.sleuth.SpanReporter; @@ -99,12 +99,10 @@ public class ZipkinAutoConfiguration { } @Configuration - // Commented out as running tests results in - // Invocation of init method failed; nested exception is java.lang.ArrayStoreException: sun.reflect.annotation.TypeNotPresentExceptionProxy - //@ConditionalOnClass(RefreshScope.class) + @ConditionalOnClass(RefreshScope.class) protected static class RefreshScopedPercentageBasedSamplerConfiguration { @Bean - //@RefreshScope + @RefreshScope @ConditionalOnMissingBean public Sampler defaultTraceSampler(SamplerProperties config) { return new PercentageBasedSampler(config);