From 425123df869e94ed57a2fdb9cced50e206228970 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Thu, 14 Jan 2016 11:06:19 +0800
Subject: [PATCH] Updates to zipkin-java 0.4.1, particularly docker images

Zipkin 0.4.1 obviates some duplication of configuration. It is also the
first version that's published as a docker image.

By switching to the published image of zipkin-java, we can be more
consistent, as `spring-cloud-sleuth-zipkin-stream` is derived from that,
not the scala query service.
---
 spring-cloud-sleuth-dependencies/pom.xml               |  2 +-
 spring-cloud-sleuth-samples/pom.xml                    |  4 ++--
 .../src/main/resources/application.yml                 | 10 +---------
 .../docker-compose.yml                                 |  4 ++--
 .../src/test/resources/application.yml                 |  7 -------
 spring-cloud-sleuth-zipkin/docker-compose.yml          |  4 ++--
 6 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 spring-cloud-sleuth-zipkin-stream/src/test/resources/application.yml

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 8805fdcf3..67dae0a5c 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -17,7 +17,7 @@
 		<brave.version>3.4.0</brave.version>
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin-java.version>0.4.0</zipkin-java.version>
+		<zipkin-java.version>0.4.1</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index e45f783fe..b48c37083 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -85,13 +85,13 @@
 			<dependency>
 				<groupId>io.zipkin</groupId>
 				<artifactId>zipkin-java-core</artifactId>
-				<version>0.4.0</version>
+				<version>0.4.1</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin</groupId>
 				<artifactId>zipkin-java-server</artifactId>
-				<version>0.4.0</version>
+				<version>0.4.1</version>
 				<scope>compile</scope>
 			</dependency>
 		</dependencies>
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 4f9aaa5f0..4470ec94f 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
@@ -7,14 +7,6 @@ spring:
   datasource:
     initialize: false
 
-zipkin:
-  collector:
-    sample-rate: 1.0 # percentage to traces to retain
-  query:
-    lookback: 86400000 # 7 days in millis
-  store:
-    type: mem # default is inMemory
-
 ---
 spring:
   profiles: mysql
@@ -30,4 +22,4 @@ spring:
     enabled: false
 zipkin:
   store:
-    type: mysql # default is inMemory
+    type: mysql # default is mem (in-memory)
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 5375fd21c..caaff374c 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
@@ -3,16 +3,16 @@ mysql:
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-query:1.30.0
+  image: openzipkin/zipkin-java:0.4.1
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
     - STORAGE_TYPE=mysql
+    # - JAVA_OPTS=your jvm params here
   expose:
     - 9411
   ports:
     - 9411:9411
-    - 9901:9901
   links:
     - mysql:storage
 web:
diff --git a/spring-cloud-sleuth-zipkin-stream/src/test/resources/application.yml b/spring-cloud-sleuth-zipkin-stream/src/test/resources/application.yml
deleted file mode 100644
index 159f475df..000000000
--- a/spring-cloud-sleuth-zipkin-stream/src/test/resources/application.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-zipkin:
-  collector:
-    sample-rate: 1.0 # percentage to traces to retain
-  query:
-    lookback: 86400000 # 7 days in millis
-  store:
-    type: mem # default is inMemory
\ No newline at end of file
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index 5375fd21c..caaff374c 100644
--- a/spring-cloud-sleuth-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-zipkin/docker-compose.yml
@@ -3,16 +3,16 @@ mysql:
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-query:1.30.0
+  image: openzipkin/zipkin-java:0.4.1
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
     - STORAGE_TYPE=mysql
+    # - JAVA_OPTS=your jvm params here
   expose:
     - 9411
   ports:
     - 9411:9411
-    - 9901:9901
   links:
     - mysql:storage
 web: