sleuth -> micrometer tracing + zipkin (#9)

migrating to(from sleuth) micrometer tracing with zipkin

Author: gtiwari333

README.md

@@ -11,7 +11,7 @@
 
 MicroService:
 
-[//]: # (- Spring Micrometer based tracing)
+[//]: # (- Spring micrometer based tracing with zipkin)
 - Exposing and implementing Open Feign clients
 - Spring Cloud Contract (WIP)
 
@@ -62,6 +62,7 @@ Misc:
 - Approval/flagging api - message based
 - Nested comment
 - Cache implemented
+- Zipkin tracing 
 - Websocket implemented to show article/comment review status/notifications..
 
 Future: do more stuff
@@ -70,7 +71,6 @@ Future: do more stuff
 - Docker-compose deploy/kubernetes 
 - Visitors log - IP, browser, etc
 - Centralized error reporting
-- Visual Tracing   
 - Geo-Spatial query for visitors
 - Grafana Dashboard, @Timed and more ...
 - logback LevelChangePropagator integration

config/docker-compose.yml

@@ -31,6 +31,13 @@ services:
             - 8025:8025  # use this to access from browser
         networks:
             - seedappnet
+    zipkin:
+        image: 'openzipkin/zipkin'
+        container_name: zipkin
+        ports:
+            - 9411:9411
+        networks:
+            - seedappnet
 volumes:
     esdata1:
         driver: local

content-checker/content-checker-service/pom.xml

@@ -25,6 +25,19 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <!-- tracing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.zipkin.reporter2</groupId>
+            <artifactId>zipkin-reporter-brave</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-artemis</artifactId>

content-checker/content-checker-service/src/main/resources/application.yml

@@ -12,3 +12,19 @@ server:
 
 jms:
     content-checkerrequest-queue: jms-content-checker-requestqueue
+logging:
+    level:
+        web: INFO
+        ROOT: WARN
+        gt: DEBUG
+
+management:
+    tracing:
+        sampling:
+            probability: 1.0
+    zipkin:
+        tracing:
+            endpoint: http://localhost:9411/api/v2/spans
+    health:
+        jms:
+            enabled: true

email/email-service/pom.xml

@@ -39,6 +39,19 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
+        <!-- tracing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.zipkin.reporter2</groupId>
+            <artifactId>zipkin-reporter-brave</artifactId>
+        </dependency>
         <!-- processors/code generators -->
         <dependency>
             <groupId>org.projectlombok</groupId>

email/email-service/src/main/resources/application.yml

@@ -15,7 +15,18 @@ spring:
 server:
     port: 8085
 
-logging.level:
-    org.springframework.web: WARN
-    ROOT: WARN
-    gt: WARN
+logging:
+    level:
+        org.springframework.web: INFO
+        ROOT: WARN
+        gt: DEBUG
+
+management:
+    tracing:
+        sampling:
+            probability: 1.0
+    zipkin:
+        tracing:
+            endpoint: http://localhost:9411/api/v2/spans
+
+

main-app/main-webapp/pom.xml

@@ -76,10 +76,24 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.cloud</groupId>-->
-        <!--            <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-        <!--        </dependency>-->
+        <!-- tracing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.zipkin.reporter2</groupId>
+            <artifactId>zipkin-reporter-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-micrometer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-artemis</artifactId>
@@ -239,6 +253,10 @@
             <groupId>com.github.gavlyukovskiy</groupId>
             <artifactId>datasource-proxy-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.ttddyy.observation</groupId>
+            <artifactId>datasource-micrometer-spring-boot</artifactId>
+        </dependency>
 
         <!-- spock deps -->
         <dependency>

main-app/main-webapp/src/main/java/gt/app/MainApplication.java

@@ -1,11 +1,13 @@
 package gt.app;
 
+import brave.sampler.Sampler;
 import gt.app.config.AppProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -38,5 +40,9 @@ public static void main(String[] args) throws UnknownHostException {
             Arrays.toString(env.getActiveProfiles())
         );
     }
-
+    //Force sample
+    @Bean
+    public Sampler defaultSampler() {
+        return Sampler.ALWAYS_SAMPLE;
+    }
 }

main-app/main-webapp/src/main/java/gt/app/config/AppHibernatePropertiesCustomizer.java

@@ -1,13 +1,13 @@
 package gt.app.config.logging;
 
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.Interceptor;
+import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 @Slf4j
-public class HibernateStatInterceptor implements Interceptor, Serializable {
+public class HibernateStatementStatInterceptor implements StatementInspector, Serializable {
 
     @Serial
     private static final long serialVersionUID = -7875557911815131906L;
@@ -25,13 +25,13 @@ public void clearCounter() {
         queryCount.remove();
     }
 
-//    @Override
-//    public String onPrepareStatement(String sql) {
-//        Long count = queryCount.get();
-//        if (count != null) {
-//            queryCount.set(count + 1);
-//        }
-//
-//        return super.onPrepareStatement(sql);
-//    }
+    @Override
+    public String inspect(String sql) {
+        Long count = queryCount.get();
+        if (count != null) {
+            queryCount.set(count + 1);
+        }
+
+        return null;
+    }
 }