From d454641f7947e004f4feee0efcbd87a114b94bb7 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Tue, 3 May 2016 18:10:03 +0800
Subject: [PATCH] Updates to zipkin 0.16

This important in so far that it allows us to do metrics. The actual
implementation of stream metrics is something we can work on after 1.0
if there's a time crunch.
---
 spring-cloud-sleuth-dependencies/pom.xml           |  2 +-
 spring-cloud-sleuth-samples/pom.xml                |  4 ++--
 .../zipkin/stream/ZipkinMessageListener.java       | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 056c72af9..cb0346447 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/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.15.1</zipkin-java.version>
+		<zipkin-java.version>0.16.1</zipkin-java.version>
 		<zipkin-ui.version>1.39.8</zipkin-ui.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 40cf70380..8297fd3b5 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.15.1</version>
+				<version>0.16.1</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.15.1</version>
+				<version>0.16.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
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 64420eaa9..cd111e4d3 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
@@ -10,6 +10,7 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -37,6 +38,7 @@ import zipkin.Annotation;
 import zipkin.AsyncSpanConsumer;
 import zipkin.BinaryAnnotation;
 import zipkin.BinaryAnnotation.Type;
+import zipkin.CollectorMetrics;
 import zipkin.CollectorSampler;
 import zipkin.Endpoint;
 import zipkin.Span.Builder;
@@ -63,8 +65,9 @@ public class ZipkinMessageListener {
 	/** lazy so transient storage errors don't crash bootstrap */
 	@Lazy
 	@Autowired
-	ZipkinMessageListener(StorageComponent storage, CollectorSampler sampler) {
-		this.consumer = storage.asyncSpanConsumer(sampler);
+	ZipkinMessageListener(StorageComponent storage, CollectorSampler sampler,
+			CollectorMetrics metrics) {
+		this.consumer = storage.asyncSpanConsumer(sampler, metrics);
 	}
 
 	@ServiceActivator(inputChannel = SleuthSink.INPUT)
@@ -145,10 +148,17 @@ public class ZipkinMessageListener {
 		float sampleRate = 1.0f;
 
 		@Bean
+		@ConditionalOnMissingBean
 		CollectorSampler collectorSampler() {
 			return CollectorSampler.create(this.sampleRate);
 		}
 
+		@Bean
+		@ConditionalOnMissingBean
+		CollectorMetrics collectorMetrics() {
+			return CollectorMetrics.NOOP_METRICS;
+		}
+
 		@Bean
 		@ConfigurationProperties(DataSourceProperties.PREFIX)
 		public DataSource dataSource() {