From 8382a823e55d672297bb1cb28065bc2016c5fc69 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 31 Mar 2016 19:31:45 +0800 Subject: [PATCH] Updates to zipkin 0.10.4 This updates to the latest release. Beyond bug fixes, there are some notable changes: * storage: writes are now via AsyncSpanConsumer * storage: added elasticsearch * zipkin-ui: constrains start time to look for traces * zipkin-ui: assets set cache headers, increasing responsiveness * core: debug logging available for zipkin.internal.DependencyLinker --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 4 ++-- .../pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/test/resources/application-test.yml | 4 ++-- .../docker-compose.yml | 11 +++++++---- .../zipkin/stream/ZipkinMessageListener.java | 14 ++++++-------- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 88f94e306..94eb61963 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -318,7 +318,7 @@ spring: sleuth: enabled: false zipkin: - store: + storage: type: mysql ---- diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index d2da70691..ccfdec00d 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -16,7 +16,7 @@ 1.1.0.BUILD-SNAPSHOT 1.8.4 - 0.9.3 + 0.10.4 diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 7da692f44..152be8ea5 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -58,12 +58,12 @@ io.zipkin.java zipkin - 0.9.3 + 0.10.4 io.zipkin.java zipkin-server - 0.9.3 + 0.10.4 diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml index 82fd0ff3e..47d138b7d 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml @@ -35,7 +35,7 @@ springio UTF-8 - 1.38.1 + 1.39.0 1.8 true diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml index 4470ec94f..f8ada4242 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml @@ -21,5 +21,5 @@ spring: sleuth: enabled: false zipkin: - store: + storage: type: mysql # default is mem (in-memory) diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml index 53f96d4a8..55d8fa962 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml @@ -1,3 +1,3 @@ zipkin: - store: - type: mem # default is inMemory \ No newline at end of file + storage: + type: mem # default is inMemory diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml index ce943f6c8..c08ce888e 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml @@ -1,15 +1,18 @@ -mysql: - image: openzipkin/zipkin-mysql:1.38.1 +storage: + image: openzipkin/zipkin-mysql:1.39.0 + container_name: mysql ports: - 3306:3306 query: - image: openzipkin/zipkin-java:0.9.3 + image: openzipkin/zipkin-java:0.10.4 environment: - STORAGE_TYPE=mysql + - MYSQL_HOST=mysql + - MYSQL_PORT=3306 ports: # Historical port used for the Zipkin HTTP Api - 9411:9411 # Zipkin UI used to be on a separate process listening on port 8080 - 8080:9411 links: - - mysql:storage + - storage diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java index 429445eb8..d398ddeb4 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java +++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java @@ -37,14 +37,12 @@ import zipkin.BinaryAnnotation; import zipkin.BinaryAnnotation.Type; import zipkin.Endpoint; import zipkin.Sampler; -import zipkin.SamplingSpanStoreConsumer; import zipkin.Span.Builder; -import zipkin.SpanConsumer; -import zipkin.SpanStore; +import zipkin.async.AsyncSpanConsumer; /** * A message listener that is turned on if Sleuth Stream is disabled. - * Asynchronously stores the received spans in a {@link SpanStore}. + * Asynchronously stores the received spans using {@link AsyncSpanConsumer}. * * @author Dave Syer * @since 1.0.0 @@ -58,17 +56,17 @@ public class ZipkinMessageListener { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory .getLog(ZipkinMessageListener.class); static final String UNKNOWN_PROCESS_ID = "unknown"; - final SpanConsumer consumer; + final AsyncSpanConsumer consumer; @Autowired - ZipkinMessageListener(SpanStore spanStore, Sampler sampler) { - this.consumer = SamplingSpanStoreConsumer.create(sampler, spanStore); + ZipkinMessageListener(AsyncSpanConsumer consumer) { + this.consumer = consumer; } @ServiceActivator(inputChannel = SleuthSink.INPUT) public void sink(Spans input) { List converted = ConvertToZipkinSpanList.convert(input); - this.consumer.accept(converted); + this.consumer.accept(converted, AsyncSpanConsumer.NOOP_CALLBACK); } /**