Merge pull request #241 from spring-cloud/zipkin-0.10.4

Updates to zipkin 0.10.4

docs/src/main/asciidoc/spring-cloud-sleuth.adoc

@@ -318,7 +318,7 @@ spring:
   sleuth:
     enabled: false
 zipkin:
-  store:
+  storage:
     type: mysql
 ----
 

spring-cloud-sleuth-dependencies/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin-java.version>0.9.3</zipkin-java.version>
+		<zipkin-java.version>0.10.4</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-sleuth-samples/pom.xml

@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.9.3</version>
+				<version>0.10.4</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.9.3</version>
+				<version>0.10.4</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml

@@ -35,7 +35,7 @@
 	<properties>
 		<docker.image.prefix>springio</docker.image.prefix>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<zipkin-ui.version>1.38.1</zipkin-ui.version>
+		<zipkin-ui.version>1.39.0</zipkin-ui.version>
 		<java.version>1.8</java.version>
 		<sonar.skip>true</sonar.skip>
 	</properties>

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)

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
+  storage:
+    type: mem # default is inMemory

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

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<zipkin.Span> converted = ConvertToZipkinSpanList.convert(input);
-		this.consumer.accept(converted);
+		this.consumer.accept(converted, AsyncSpanConsumer.NOOP_CALLBACK);
 	}
 
 	/**