From 927871267ca2e421271695da36fdc023409e0351 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 28 Oct 2017 16:57:22 +0800 Subject: [PATCH] Re-enables sampling --- .../zipkin2/ZipkinAutoConfiguration.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/spring-cloud-sleuth-zipkin2/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin2/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java index 6cae9ad43..ea2c5fe65 100644 --- a/spring-cloud-sleuth-zipkin2/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin2/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java @@ -98,16 +98,18 @@ public class ZipkinAutoConfiguration { return new DefaultZipkinRestTemplateCustomizer(zipkinProperties); } -// @Configuration -// @ConditionalOnClass(RefreshScope.class) -// protected static class RefreshScopedPercentageBasedSamplerConfiguration { -// @Bean -// @RefreshScope -// @ConditionalOnMissingBean -// public Sampler defaultTraceSampler(SamplerProperties config) { -// return new PercentageBasedSampler(config); -// } -// } + @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) + protected static class RefreshScopedPercentageBasedSamplerConfiguration { + @Bean + //@RefreshScope + @ConditionalOnMissingBean + public Sampler defaultTraceSampler(SamplerProperties config) { + return new PercentageBasedSampler(config); + } + } @Configuration @ConditionalOnMissingClass("org.springframework.cloud.context.config.annotation.RefreshScope")