Updated the docs

Author: marcingrzejszczak

spring-cloud-sleuth-samples/README.adoc

@@ -35,9 +35,10 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/master
 
 Instead of POSTing trace data directly to a Zipkin server, you can export them over https://raw.githubusercontent.com/spring-cloud/spring-cloud-stream[Spring Cloud Stream].
 
-1. Build the Zipkin Stream sample with Maven and run it via its `docker-compose.yml` (which also starts the required middleware and the Zipkin UI).
+1. Run the RabbitMQ middleware for Zipkin (you can use `docker-compose.yml`).
+2. Build the Zipkin Stream sample with Maven and run it.
 7. Run the `spring-cloud-sleuth-sample-stream` app and interact with it in a browser, just like the vanilla sample. If you are using a VM to run docker you might need to tunnel port 5672 to localhost, or change the `spring.rabbbitmq.host`.
-9. Go to `http://localhost:9411` for Zipkin's UI (if you are using boot2docker the host will be different)
+9. Go to `http://localhost:9411` for Zipkin's UI
 
 The UI should look more or less like this:
 

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/README.md

@@ -1,30 +1,15 @@
 # Running a Zipkin Server
 
-There are 3 parts to Zipkin: the instrumented client apps, the backend database and the Zipkin server. The database for this implementation is MySQL.
-
-## Zipkin Services
-
-Run this app using the docker-compose provided.
-
-```
-$ docker-compose build zipkin
-$ docker-compose up
-...
-```
-
-and test it
-
-```
-$ curl localhost:9411/api/v1/services
-["zipkin-query"]
-```
-
-The app might fail to start if mysql is not available when it needs it. If that happens you can just start it separately: just keep running `docker-compose up` until it works.
+There are 3 parts to Zipkin: 
 
+- the instrumented client apps
+- the backend database 
+- the Zipkin server
 
 ## Instrumenting Apps
 
-Depend on [Spring Cloud Sleuth Stream](https://github.com/spring-cloud-spring-cloud-sleuth) and the rabbit binder (`spring-cloud-starter-stream-rabbit`).
+Depend on [Spring Cloud Sleuth Stream](https://github.com/spring-cloud-spring-cloud-sleuth) and the 
+rabbit binder (`spring-cloud-starter-stream-rabbit`).
 
 Once the apps start publishing spans they will appear in the span store as well.
 
@@ -33,5 +18,5 @@ Once the apps start publishing spans they will appear in the span store as well.
 You can run this app in an IDE and still use docker-compose to create the middleware:
 
 ```
-$ docker-compose up rabbitmq mysql
+$ docker-compose up rabbitmq
 ```

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

@@ -0,0 +1,7 @@
+rabbitmq:
+  image: rabbitmq:management
+  expose:
+    - 5672
+  ports:
+    - 5672:5672
+    - 15672:15672