Merge pull request #31 from Nasruddin/revamp

Nasruddin · web-flow · commit 2af6cde17a42 · 2025-03-10T15:27:02.000+05:30
Observability - Loki, Tempo, Prometheus with Grafana added
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
@@ -4,6 +4,12 @@ services:
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - JAVA_TOOL_OPTIONS="-javaagent:/application/BOOT-INF/lib/opentelemetry-javaagent-2.13.3.jar" #maven will place jar in BOOT-INF as per dep mentioned in pom. This will instruct the JVM to run the OpenTelemetry Java agent from the path.
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_METRICS_EXPORTER=none
+      - OTEL_LOGS_EXPORTER=none
+      - OTEL_METRIC_EXPORT_INTERVAL=15000
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://tempo:4318
     logging:
       driver: fluentd
       options:
@@ -19,6 +25,12 @@ services:
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - JAVA_TOOL_OPTIONS="-javaagent:/application/BOOT-INF/lib/opentelemetry-javaagent-2.13.3.jar" #maven will place jar in BOOT-INF as per dep mentioned in pom. This will instruct the JVM to run the OpenTelemetry Java agent from the path.
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_METRICS_EXPORTER=none
+      - OTEL_LOGS_EXPORTER=none
+      - OTEL_METRIC_EXPORT_INTERVAL=15000
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://tempo:4318
     logging:
       driver: fluentd
       options:
@@ -36,6 +48,14 @@ services:
       - "8080:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - JAVA_TOOL_OPTIONS="-javaagent:/application/BOOT-INF/lib/opentelemetry-javaagent-2.13.3.jar" #maven will place jar in BOOT-INF as per dep mentioned in pom. This will instruct the JVM to run the OpenTelemetry Java agent from the path.
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_METRICS_EXPORTER=none
+      - OTEL_LOGS_EXPORTER=none
+      - OTEL_METRIC_EXPORT_INTERVAL=15000
+      - OTEL_INSTRUMENTATION_SPRING_WEB_EXCLUDE_PATTERNS=/actuator/prometheus
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://tempo:4318
+
     logging:
       driver: fluentd
       options:
@@ -50,6 +70,12 @@ services:
       - "9000:9000"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - JAVA_TOOL_OPTIONS="-javaagent:/application/BOOT-INF/lib/opentelemetry-javaagent-2.13.3.jar" #maven will place jar in BOOT-INF as per dep mentioned in pom. This will instruct the JVM to run the OpenTelemetry Java agent from the path.
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_METRICS_EXPORTER=none
+      - OTEL_LOGS_EXPORTER=none
+      - OTEL_METRIC_EXPORT_INTERVAL=15000
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://tempo:4318
     logging:
       driver: fluentd
       options:
diff --git a/docker/docker-compose-observability.yml b/docker/docker-compose-observability.yml
@@ -48,12 +48,16 @@ services:
     networks:
       - shared-network
   tempo:
-    image: grafana/tempo:1.5.0
+    image: grafana/tempo:latest
     command: -config.file /etc/tempo-config.yml
     ports:
-      - "4317:4317"
+      - "4317:4317" # OTLP gRPC
+      - "4318:4318" # OTLP HTTP
+      - "3200:3200" # Tempo HTTP server (for querying)
     volumes:
       - ./tempo/tempo.yml:/etc/tempo-config.yml
+    networks:
+      - shared-network
 
 networks:
   shared-network:
diff --git a/docker/fluent-bit/parsers.conf b/docker/fluent-bit/parsers.conf
diff --git a/docker/tempo/tempo.yml b/docker/tempo/tempo.yml
@@ -0,0 +1,21 @@
+server:
+  http_listen_address: 0.0.0.0
+  http_listen_port: 3200
+
+distributor:
+  receivers:
+    otlp:
+      protocols:
+        grpc:
+          endpoint: 0.0.0.0:4317
+        http:
+          endpoint: 0.0.0.0:4318
+
+storage:
+  trace:
+    backend: local
+    local:
+      path: /tmp/tempo/blocks
+
+usage_report:
+  reporting_enabled: false
diff --git a/microservices/course-composite-service/pom.xml b/microservices/course-composite-service/pom.xml
@@ -71,6 +71,12 @@
 			<artifactId>logback-classic</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.opentelemetry.javaagent</groupId>
+			<artifactId>opentelemetry-javaagent</artifactId>
+			<version>2.13.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregateController.java b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregateController.java
@@ -29,7 +29,7 @@ public CourseAggregateController(CourseCompositeIntegration integration) {
 
     @GetMapping("/{id}/with-details")
     public Mono<CourseAggregate> getCourses(@PathVariable Long id, @AuthenticationPrincipal Jwt jwt) {
-        logger.info("Fetching course and review details for course id : {}", id);
+        logger.info("Fetching course and review details for course id ===> {}", id);
         return integration.getCourseDetails(id, jwt);
     }
 }
diff --git a/microservices/course-composite-service/src/main/resources/application.yml b/microservices/course-composite-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ logging:
     root: INFO
     io.javatab.microservices.composite.course: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-N/A}] [%X{spanId:-N/A}] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{trace_id:-N/A}] [%X{span_id:-N/A}] %-5level %logger{36} - %msg%n"
 
 
   # Security related properties
diff --git a/microservices/course-service/pom.xml b/microservices/course-service/pom.xml
@@ -86,6 +86,11 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.opentelemetry.javaagent</groupId>
+			<artifactId>opentelemetry-javaagent</artifactId>
+			<version>2.13.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/microservices/course-service/src/main/resources/application.yml b/microservices/course-service/src/main/resources/application.yml
@@ -32,7 +32,7 @@ logging:
     root: INFO
     io.javatab.microservices.core.course: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-N/A}] [%X{spanId:-N/A}] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{trace_id:-N/A}] [%X{span_id:-N/A}] %-5level %logger{36} - %msg%n"
 
 management:
   endpoints:
diff --git a/microservices/review-service/pom.xml b/microservices/review-service/pom.xml
@@ -78,6 +78,11 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.opentelemetry.javaagent</groupId>
+			<artifactId>opentelemetry-javaagent</artifactId>
+			<version>2.13.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/microservices/review-service/src/main/resources/application.yml b/microservices/review-service/src/main/resources/application.yml
@@ -25,7 +25,7 @@ logging:
     root: INFO
     io.javatab.microservices.composite.review: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-N/A}] [%X{spanId:-N/A}] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{trace_id:-N/A}] [%X{span_id:-N/A}] %-5level %logger{36} - %msg%n"
 management:
   endpoints:
     web:

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public CourseAggregateController(CourseCompositeIntegration integration) {`
`29`	`29`
`30`	`30`	`@GetMapping("/{id}/with-details")`
`31`	`31`	`public Mono<CourseAggregate> getCourses(@PathVariable Long id, @AuthenticationPrincipal Jwt jwt) {`
`32`		`- logger.info("Fetching course and review details for course id : {}", id);`
	`32`	`+ logger.info("Fetching course and review details for course id ===> {}", id);`
`33`	`33`	`return integration.getCourseDetails(id, jwt);`
`34`	`34`	`}`
`35`	`35`	`}`