From 92c909583cab030663907b605698c816e9982293 Mon Sep 17 00:00:00 2001 From: Tim Ysewyn Date: Tue, 15 Jan 2019 17:21:24 +0100 Subject: [PATCH] No reason to create a `SpanBytesEncoder` bean --- .../sleuth/zipkin2/ZipkinAutoConfiguration.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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 265848817..553c1bab6 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 @@ -82,24 +82,23 @@ public class ZipkinAutoConfiguration { */ public static final String SENDER_BEAN_NAME = "zipkinSender"; - /** - * Accepts a sender so you can plug-in any standard one. Returns a Reporter so you can - * also replace with a standard one. - */ @Bean(REPORTER_BEAN_NAME) - @ConditionalOnMissingBean public Reporter reporter(ReporterMetrics reporterMetrics, - ZipkinProperties zipkin, @Qualifier(SENDER_BEAN_NAME) Sender sender, - BytesEncoder spanBytesEncoder) { + ZipkinProperties zipkin, @Qualifier(SENDER_BEAN_NAME) Sender sender) { return AsyncReporter.builder(sender).queuedMaxSpans(1000) // historical // constraint. Note: // AsyncReporter // supports memory // bounds .messageTimeout(zipkin.getMessageTimeout(), TimeUnit.SECONDS) - .metrics(reporterMetrics).build(spanBytesEncoder); + .metrics(reporterMetrics).build(zipkin.getEncoder()); } + /** + * Deprecated because this is not used in this codebase anymore. Kept for libraries + * which are depending on Zipkin. + * @deprecated + */ @Bean @ConditionalOnMissingBean public BytesEncoder spanBytesEncoder(ZipkinProperties zipkinProperties) {