From 449d2f2aa5f0ea34cbcd395abf22c864e134ac42 Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Mon, 2 Jan 2017 13:41:13 +0100
Subject: [PATCH 1/3] added some basic spring zipkin

---
 docker-compose-zipkin.yml                 | 51 +++++++++++++++++++++++
 pom.xml                                   |  7 ++++
 src/main/resources/application.properties |  3 ++
 3 files changed, 61 insertions(+)
 create mode 100644 docker-compose-zipkin.yml

diff --git a/docker-compose-zipkin.yml b/docker-compose-zipkin.yml
new file mode 100644
index 0000000..619ff1a
--- /dev/null
+++ b/docker-compose-zipkin.yml
@@ -0,0 +1,51 @@
+version: '2'
+
+services:
+  orders:
+    image: orderstest
+    hostname: orders
+    restart: always
+    cap_drop:
+      - all
+    cap_add:
+      - NET_BIND_SERVICE
+    read_only: true
+    tmpfs:
+      - /tmp:rw,noexec,nosuid
+    environment:
+      - reschedule=on-node-failure
+      - ZIPKIN=zipkin
+    ports:
+      - "8082:80"
+  orders-db:
+    image: mongo
+    hostname: orders-db
+    restart: always
+    cap_drop:
+      - all
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+    read_only: true
+    tmpfs:
+      - /tmp:rw,noexec,nosuid
+    environment:
+      - reschedule=on-node-failure
+  zipkin:
+    image: openzipkin/zipkin 
+    hostname: zipkin
+    restart: always
+    cap_drop:
+      - all
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+    read_only: true
+    tmpfs:
+      - /tmp:rw,noexec,nosuid
+    environment:
+      - reschedule=on-node-failure
+    ports:
+      - "9411:9411"
diff --git a/pom.xml b/pom.xml
index 63dab62..7948a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+	<dependency>
+	    <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+            <version>1.1.0.RELEASE</version>
+	</dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
@@ -66,6 +71,8 @@
             <version>0.8.4</version>
             <scope>test</scope>
         </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2dea02e..b6289f6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,6 @@
 server.port=${port:8082}
 spring.data.mongodb.uri=mongodb://${db:orders-db}:27017/data
 endpoints.health.enabled=false
+spring.zipkin.baseUrl=http://${zipkin:test}:9411/
+spring.sleuth.sampler.percentage=1.0
+spring.application.name=orders

From 3980cf562fb7c0f79fab8ce2a435868cac9ad4eb Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Mon, 2 Jan 2017 13:42:00 +0100
Subject: [PATCH 2/3] fixed image name

---
 docker-compose-zipkin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-zipkin.yml b/docker-compose-zipkin.yml
index 619ff1a..5dea7d9 100644
--- a/docker-compose-zipkin.yml
+++ b/docker-compose-zipkin.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   orders:
-    image: orderstest
+    image: weaveworksdemos/orders
     hostname: orders
     restart: always
     cap_drop:

From a7c332f29a67cc93b556b07f2cda939bb888ae6b Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Mon, 2 Jan 2017 13:45:05 +0100
Subject: [PATCH 3/3] fixed default for zipkin address

---
 src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b6289f6..ccb69d4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 server.port=${port:8082}
 spring.data.mongodb.uri=mongodb://${db:orders-db}:27017/data
 endpoints.health.enabled=false
-spring.zipkin.baseUrl=http://${zipkin:test}:9411/
+spring.zipkin.baseUrl=http://${zipkin:zipkin}:9411/
 spring.sleuth.sampler.percentage=1.0
 spring.application.name=orders