Enhanced distributed tracing microservices-patterns#74

lionMonkey · Jan 29, 2020 · 35ebbed · 35ebbed
1 parent bd223e6
commit 35ebbed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/buildSrc/src/main/groovy/FtgoServicePlugin.groovy b/buildSrc/src/main/groovy/FtgoServicePlugin.groovy
@@ -25,7 +25,7 @@ class FtgoServicePlugin implements Plugin<Project> {
         project.dependencies {
             compile 'org.springframework.cloud:spring-cloud-starter-sleuth'
             compile 'org.springframework.cloud:spring-cloud-starter-zipkin'
-            compile 'io.zipkin.brave:brave-bom:4.17.1'
+            compile "io.zipkin.brave:brave-bom:4.17.1"
 
             compile "io.eventuate.tram.core:eventuate-tram-spring-cloud-sleuth-integration:${project.ext.eventuateTramVersion}"
         }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -133,6 +133,9 @@ services:
         EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
         JAVA_OPTS: -Xmx192m
         EVENTUATE_DATABASE_SCHEMA: ftgo_kitchen_service
+        SPRING_SLEUTH_ENABLED: "true"
+        SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
+        SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
   ftgo-restaurant-service:
       build: ./ftgo-restaurant-service
       ports:
@@ -151,6 +154,9 @@ services:
         EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
         JAVA_OPTS: -Xmx192m
         EVENTUATE_DATABASE_SCHEMA: ftgo_restaurant_service
+        SPRING_SLEUTH_ENABLED: "true"
+        SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
+        SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
   ftgo-accounting-service:
         build: ./ftgo-accounting-service
         ports:
@@ -169,6 +175,9 @@ services:
           EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
           JAVA_OPTS: -Xmx192m
           EVENTUATE_DATABASE_SCHEMA: ftgo_accounting_service
+          SPRING_SLEUTH_ENABLED: "true"
+          SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
+          SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
   ftgo-delivery-service:
     build: ./ftgo-delivery-service
     ports:
@@ -208,6 +217,9 @@ services:
           AWS_DYNAMODB_ENDPOINT_URL: http://dynamodblocal:8000
           AWS_REGION: ${AWS_REGION:-us-west-2}
           JAVA_OPTS: -Xmx192m
+          SPRING_SLEUTH_ENABLED: "true"
+          SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
+          SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
   ftgo-api-gateway:
     build: ./ftgo-api-gateway
     ports:

diff --git a/ftgo-api-gateway/build.gradle b/ftgo-api-gateway/build.gradle
@@ -47,9 +47,9 @@ dependencies {
     compile 'org.springframework.cloud:spring-cloud-starter-gateway'
     compile "org.apache.commons:commons-lang3:3.6"
 
-    // compile 'org.springframework.cloud:spring-cloud-starter-sleuth'
-    //compile 'org.springframework.cloud:spring-cloud-starter-zipkin'
-    // compile 'io.zipkin.brave:brave-bom:4.17.1'
+    compile 'org.springframework.cloud:spring-cloud-starter-sleuth'
+    compile 'org.springframework.cloud:spring-cloud-starter-zipkin'
+    compile "io.zipkin.brave:brave-bom:4.17.1"
 
     compile "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
     compile "org.springframework.boot:spring-boot-starter-actuator"

diff --git a/ftgo-api-gateway/src/main/resources/application.properties b/ftgo-api-gateway/src/main/resources/application.properties
@@ -7,6 +7,5 @@ logging.level.com.github.tomakehurst.wiremock=TRACE
 management.endpoints.web.exposure.include=health,prometheus
 
 spring.sleuth.sampler.probability=1.0
-spring.sleuth.web.skipPattern=(^health.*)
 
 # routes
diff --git a/ftgo-end-to-end-tests/build.gradle b/ftgo-end-to-end-tests/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 }
 
 dockerCompose {
-
+    projectName = null
 }
 
 test.dependsOn(composeUp)