Merge pull request #221 from spring-cloud/0.9.2

Updates to zipkin 0.9.3, which fixes a UI recursion bug

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.1</zipkin-java.version>
+		<zipkin-java.version>0.9.3</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-sleuth-samples/pom.xml

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

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml

@@ -21,19 +21,11 @@ zipkin:
     - MYSQL_HOST=mysql
     - RABBIT_HOST=rabbitmq
     # - JAVA_OPTS=your jvm params here
-  expose:
-    - 9411
   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
     - rabbitmq
-web:
-  image: openzipkin/zipkin-web:1.30.2
-  ports:
-    - 8080:8080
-  environment:
-    - TRANSPORT_TYPE=http
-    - WEB_LOG_LEVEL=DEBUG
-  links:
-    - zipkin:query

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

@@ -35,6 +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>
 		<java.version>1.8</java.version>
 		<sonar.skip>true</sonar.skip>
 	</properties>
@@ -53,6 +54,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.zipkin</groupId>
+			<artifactId>zipkin-ui</artifactId>
+			<version>${zipkin-ui.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jmx</artifactId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml

@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.38.0
+  image: openzipkin/zipkin-mysql:1.38.1
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.9.1
+  image: openzipkin/zipkin-java:0.9.3
   environment:
     - STORAGE_TYPE=mysql
   ports:

spring-cloud-sleuth-zipkin/docker-compose.yml

@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.38.0
+  image: openzipkin/zipkin-mysql:1.38.1
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.9.1
+  image: openzipkin/zipkin-java:0.9.3
   environment:
     - STORAGE_TYPE=mysql
   ports: