From a3af9de4dd96c6b3708c7355492481f4b2b9b8b4 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 14 Jan 2016 22:31:06 +0800 Subject: [PATCH] Makes it possible to supply an https zipkin endpoint --- .../java/integration/IntegrationTestZipkinSpanReporter.java | 2 +- .../src/test/java/integration/ZipkinTests.java | 3 +-- .../cloud/sleuth/zipkin/ZipkinAutoConfiguration.java | 3 +-- .../springframework/cloud/sleuth/zipkin/ZipkinProperties.java | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java index afeadd433..a78d850e0 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java @@ -35,7 +35,7 @@ public class IntegrationTestZipkinSpanReporter implements ZipkinSpanReporter { @Override public void report(Span span) { - log.info(span); + log.debug(span); hashedSpans.add(span); } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java index a8f9df406..f22174b06 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java @@ -91,8 +91,7 @@ public class ZipkinTests extends AbstractIntegrationTest { } private ZipkinSpanReporter getSpanCollector(ZipkinProperties zipkin) { - String url = "http://localhost:" + zipkin.getPort(); - return new HttpZipkinSpanReporter(url, zipkin.getFlushInterval()); + return new HttpZipkinSpanReporter(zipkin.getBaseUrl(), zipkin.getFlushInterval()); } } } 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 6033d0205..0b7813e4d 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 @@ -41,8 +41,7 @@ public class ZipkinAutoConfiguration { @ConditionalOnMissingBean(ZipkinSpanReporter.class) public ZipkinSpanReporter reporter() { ZipkinProperties zipkin = zipkinProperties(); - String url = "http://" + zipkin.getHost() + ":" + zipkin.getPort(); - return new HttpZipkinSpanReporter(url, zipkin.getFlushInterval()); + return new HttpZipkinSpanReporter(zipkin.getBaseUrl(), zipkin.getFlushInterval()); } @Bean diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinProperties.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinProperties.java index efa70c9fd..c879bd1f7 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinProperties.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinProperties.java @@ -28,8 +28,8 @@ import lombok.Data; public class ZipkinProperties { // Sample rate = 1.0 means 100% of requests will get traced. private float fixedSampleRate = 1.0f; - private String host = "localhost"; - private int port = 9411; + /** URL of the zipkin query server instance. */ + private String baseUrl = "http://localhost:9411/"; private boolean enabled = true; private int flushInterval = 1; }