From 763d2d027c35d8fc94c72f8c2909b2e70b013373 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Mon, 25 Jan 2016 10:51:05 +0100
Subject: [PATCH] Updates to latest zipkin, which encourages new http tags

---
 spring-cloud-sleuth-dependencies/pom.xml                    | 2 +-
 spring-cloud-sleuth-samples/pom.xml                         | 4 ++--
 .../docker-compose.yml                                      | 2 +-
 .../spring-cloud-sleuth-sample-zipkin/docker-compose.yml    | 6 +++---
 .../src/main/resources/application.yml                      | 2 +-
 spring-cloud-sleuth-zipkin/docker-compose.yml               | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 22e8795da..1dfdad969 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.3</zipkin-java.version>
+		<zipkin-java.version>0.4.4</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index cc3cfde83..074216089 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -85,13 +85,13 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.4.3</version>
+				<version>0.4.4</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.4.3</version>
+				<version>0.4.4</version>
 				<scope>compile</scope>
 			</dependency>
 		</dependencies>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
index 5f49487a9..5ea977d0a 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
@@ -29,7 +29,7 @@ zipkin:
     - mysql
     - rabbitmq
 web:
-  image: openzipkin/zipkin-web:1.30.0
+  image: openzipkin/zipkin-web:1.30.2
   ports:
     - 8080:8080
   environment:
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 0730337ed..02808575b 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,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.30.0
+  image: openzipkin/zipkin-mysql:1.30.2
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.4.3
+  image: openzipkin/zipkin-java:0.4.4
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.30.0
+  image: openzipkin/zipkin-web:1.30.2
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
index 4bca4d767..a50448633 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
@@ -4,7 +4,7 @@ server:
 spring:
   application:
     # This ends up as the service name in zipkin
-    name: my-boot
+    name: testsleuthzipkin
   zipkin:
     # Uncomment to send to zipkin, replacing 192.168.99.100 with your docker-machine's IP address
     # baseUrl: http://192.168.99.100:9411/
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index 0730337ed..02808575b 100644
--- a/spring-cloud-sleuth-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-zipkin/docker-compose.yml
@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.30.0
+  image: openzipkin/zipkin-mysql:1.30.2
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.4.3
+  image: openzipkin/zipkin-java:0.4.4
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.30.0
+  image: openzipkin/zipkin-web:1.30.2
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http