diff --git a/pom.xml b/pom.xml index b6f0853ea..6cb7eea72 100644 --- a/pom.xml +++ b/pom.xml @@ -108,17 +108,17 @@ com.github.kristofa - brave-client + brave-core ${brave.version} com.github.kristofa - brave-impl + brave-http ${brave.version} com.github.kristofa - brave-impl-spring + brave-core-spring ${brave.version} @@ -196,7 +196,7 @@ - 2.4.2 + 3.0.0-rc-1 1.1.0.BUILD-SNAPSHOT 1.8.4 1.0-groovy-2.4 diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleMessagingApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleMessagingApplication.java index 546dcf569..ab529b2e0 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleMessagingApplication.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleMessagingApplication.java @@ -29,7 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.github.kristofa.brave.LoggingSpanCollectorImpl; +import com.github.kristofa.brave.LoggingSpanCollector; import com.github.kristofa.brave.SpanCollector; /** @@ -74,7 +74,7 @@ public class SampleMessagingApplication { @Bean @ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false") public SpanCollector spanCollector() { - return new LoggingSpanCollectorImpl(); + return new LoggingSpanCollector(); } } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java index c6c9c1c32..f3a745a9e 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; -import com.github.kristofa.brave.LoggingSpanCollectorImpl; +import com.github.kristofa.brave.LoggingSpanCollector; import com.github.kristofa.brave.SpanCollector; /** @@ -51,7 +51,7 @@ public class SampleRibbonApplication { @Bean @ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false") public SpanCollector spanCollector() { - return new LoggingSpanCollectorImpl(); + return new LoggingSpanCollector(); } } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java index d3c7bba35..25713e633 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; -import com.github.kristofa.brave.LoggingSpanCollectorImpl; +import com.github.kristofa.brave.LoggingSpanCollector; import com.github.kristofa.brave.SpanCollector; /** @@ -51,7 +51,7 @@ public class SampleZipkinApplication { @Bean @ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false") public SpanCollector spanCollector() { - return new LoggingSpanCollectorImpl(); + return new LoggingSpanCollector(); } } diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 8cffeb165..43dc240bf 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -49,15 +49,15 @@ com.github.kristofa - brave-client + brave-core com.github.kristofa - brave-impl + brave-http com.github.kristofa - brave-impl-spring + brave-core-spring com.github.kristofa diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java index c34f5cf9d..43b572b39 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java @@ -16,43 +16,23 @@ package org.springframework.cloud.sleuth.zipkin; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import com.github.kristofa.brave.AnnotationSubmitterConfig; -import com.github.kristofa.brave.ClientTracer; -import com.github.kristofa.brave.ClientTracerConfig; -import com.github.kristofa.brave.EndPointSubmitterConfig; -import com.github.kristofa.brave.FixedSampleRateTraceFilter; -import com.github.kristofa.brave.ServerSpanThreadBinderConfig; -import com.github.kristofa.brave.ServerTracerConfig; import com.github.kristofa.brave.SpanCollector; -import com.github.kristofa.brave.TraceFilter; -import com.github.kristofa.brave.TraceFilters; -import com.github.kristofa.brave.client.ClientRequestInterceptor; -import com.github.kristofa.brave.client.ClientResponseInterceptor; -import com.github.kristofa.brave.client.spanfilter.SpanNameFilter; import com.github.kristofa.brave.zipkin.ZipkinSpanCollector; -import com.google.common.base.Optional; /** * @author Spencer Gibb */ @Configuration @EnableConfigurationProperties -@ConditionalOnClass(ServerTracerConfig.class) +@ConditionalOnClass(ZipkinSpanCollector.class) @ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true) -@Import({ AnnotationSubmitterConfig.class, ClientTracerConfig.class, - EndPointSubmitterConfig.class, ServerSpanThreadBinderConfig.class, - ServerTracerConfig.class }) public class ZipkinAutoConfiguration { @Bean @@ -67,43 +47,10 @@ public class ZipkinAutoConfiguration { return new ZipkinProperties(); } - @Bean - public FixedSampleRateTraceFilter fixedSampleRateTraceFilter() { - return new FixedSampleRateTraceFilter(zipkinProperties().getFixedSampleRate()); - } - - @Bean - @ConditionalOnMissingBean - public TraceFilters traceFilters(List traceFilters) { - return new TraceFilters(traceFilters); - } - @Bean // @ConditionalOnProperty(value = "spring.sleuth.zipkin.braveTracer.enabled", havingValue = "false") public ZipkinSpanListener sleuthTracer(SpanCollector spanCollector) { return new ZipkinSpanListener(spanCollector); } - @Configuration - protected static class InterceptorConfig { - - @Autowired - private ClientTracer clientTracer; - - @Autowired(required = false) - private SpanNameFilter spanNameFilter; - - @Bean - @ConditionalOnMissingBean - public ClientRequestInterceptor clientRequestInterceptor() { - return new ClientRequestInterceptor(this.clientTracer, - Optional.fromNullable(this.spanNameFilter)); - } - - @Bean - @ConditionalOnMissingBean - public ClientResponseInterceptor clientResponseInterceptor() { - return new ClientResponseInterceptor(this.clientTracer); - } - } }