From f5be1f67a04adaac282d4c93a820051d94303e6b Mon Sep 17 00:00:00 2001
From: Nasruddin <nasruddin.java@gmail.com>
Date: Mon, 10 Mar 2025 07:58:33 +0530
Subject: [PATCH] Fluentbit integration for docker

---
 .idea/workspace.xml                           | 44 ++++++++++---
 docker/docker-compose-base.yml                | 16 +++++
 docker/docker-compose-infra.yml               | 29 +--------
 docker/docker-compose-observability.yml       | 64 +++++++++++++++++++
 docker/fluent-bit/fluent-bit.conf             | 15 +++++
 docker/fluent-bit/parsers.conf                | 12 ++++
 docker/loki/loki-config.yaml                  | 31 +++++++++
 .../course-composite-service/pom.xml          |  6 +-
 .../composite/course/MetricsController.java   | 23 ++++++-
 .../web/CourseCompositeIntegration.java       |  6 +-
 .../src/main/resources/application.yml        |  5 +-
 .../core/course/domain/CourseService.java     | 14 +++-
 .../core/course/web/CourseController.java     |  9 ++-
 .../src/main/resources/application.yml        |  7 +-
 .../src/main/resources/application.yml        |  6 +-
 15 files changed, 237 insertions(+), 50 deletions(-)
 create mode 100644 docker/docker-compose-observability.yml
 create mode 100644 docker/fluent-bit/fluent-bit.conf
 create mode 100644 docker/fluent-bit/parsers.conf
 create mode 100644 docker/loki/loki-config.yaml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6964f3d..097ab9a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,23 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="82def982-1f77-496a-a21a-a6ccc7bf68be" name="Changes" comment="Prometheus integration">
-      <change afterPath="$PROJECT_DIR$/kubernetes/infrastructure/grafana/grafana.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/kubernetes/infrastructure/prometheus/prometheus.yml" afterDir="false" />
+    <list default="true" id="82def982-1f77-496a-a21a-a6ccc7bf68be" name="Changes" comment="Prometheus integration for kubernetes">
+      <change afterPath="$PROJECT_DIR$/docker/docker-compose-observability.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/fluent-bit/fluent-bit.conf" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/fluent-bit/parsers.conf" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/loki/loki-config.yaml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/resources/logback-spring.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Tiltfile" beforeDir="false" afterPath="$PROJECT_DIR$/Tiltfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker/docker-compose-base.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/docker-compose-base.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker/docker-compose-infra.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/docker-compose-infra.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/review-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/review-service/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -54,7 +66,7 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "Application.CourseCompositeServiceApplication.executor": "Run",
-    "Application.CourseServiceApplication.executor": "Run",
+    "Application.CourseServiceApplication.executor": "Debug",
     "Application.GatewayServiceApplication.executor": "Run",
     "Application.ReviewServiceApplication.executor": "Run",
     "Maven.course-service [compile].executor": "Run",
@@ -85,7 +97,7 @@
       <recent name="$PROJECT_DIR$/microservices/course-service" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.CourseCompositeServiceApplication">
+  <component name="RunManager" selected="Application.CourseServiceApplication">
     <configuration name="CourseCompositeServiceApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="io.javatab.microservices.composite.course.CourseCompositeServiceApplication" />
       <module name="course-composite-service" />
@@ -185,8 +197,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.CourseCompositeServiceApplication" />
         <item itemvalue="Application.CourseServiceApplication" />
+        <item itemvalue="Application.CourseCompositeServiceApplication" />
         <item itemvalue="Application.ReviewServiceApplication" />
         <item itemvalue="Application.GatewayServiceApplication" />
       </list>
@@ -257,7 +269,15 @@
       <option name="project" value="LOCAL" />
       <updated>1741496590754</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Prometheus integration for kubernetes">
+      <option name="closed" value="true" />
+      <created>1741502933986</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1741502933986</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -282,7 +302,8 @@
     <MESSAGE value="Added oAuth with keycloak" />
     <MESSAGE value="Tilt config to run all manifest in one go" />
     <MESSAGE value="Prometheus integration" />
-    <option name="LAST_COMMIT_MESSAGE" value="Prometheus integration" />
+    <MESSAGE value="Prometheus integration for kubernetes" />
+    <option name="LAST_COMMIT_MESSAGE" value="Prometheus integration for kubernetes" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -292,6 +313,11 @@
           <line>67</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java</url>
+          <line>35</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
index e5e8d3c..2245f7f 100644
--- a/docker/docker-compose-base.yml
+++ b/docker/docker-compose-base.yml
@@ -4,6 +4,10 @@ services:
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: 127.0.0.1:24224
     networks:
       - shared-network
     #depends_on:
@@ -15,6 +19,10 @@ services:
     mem_limit: 512m
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: 127.0.0.1:24224
     networks:
       - shared-network
     #depends_on:
@@ -28,6 +36,10 @@ services:
       - "8080:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: 127.0.0.1:24224
     networks:
       - shared-network
 
@@ -38,6 +50,10 @@ services:
       - "9000:9000"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+    logging:
+      driver: fluentd
+      options:
+        fluentd-address: 127.0.0.1:24224
     networks:
       - shared-network
 
diff --git a/docker/docker-compose-infra.yml b/docker/docker-compose-infra.yml
index d328dc0..2f617ee 100644
--- a/docker/docker-compose-infra.yml
+++ b/docker/docker-compose-infra.yml
@@ -43,35 +43,10 @@ services:
     networks:
       - shared-network
 
-  prometheus:
-    image: prom/prometheus:latest
-    volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-      - prometheus-data:/prometheus
-    command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--storage.tsdb.path=/prometheus'
-    ports:
-      - "9090:9090"
-    networks:
-      - shared-network
-
-  grafana:
-    image: grafana/grafana:latest
-    volumes:
-      - grafana-data:/var/lib/grafana
-    ports:
-      - "3000:3000"
-    environment:
-      - GF_SECURITY_ADMIN_PASSWORD=admin
-    depends_on:
-      - prometheus
-    networks:
-      - shared-network
-
 networks:
   shared-network:
     driver: bridge
 volumes:
   prometheus-data:
-  grafana-data:
\ No newline at end of file
+  grafana-data:
+  loki-data:
\ No newline at end of file
diff --git a/docker/docker-compose-observability.yml b/docker/docker-compose-observability.yml
new file mode 100644
index 0000000..7100ae8
--- /dev/null
+++ b/docker/docker-compose-observability.yml
@@ -0,0 +1,64 @@
+services:
+  prometheus:
+    image: prom/prometheus:latest
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus-data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+    ports:
+      - "9090:9090"
+    networks:
+      - shared-network
+
+  grafana:
+    image: grafana/grafana:latest
+    volumes:
+      - grafana-data:/var/lib/grafana
+    ports:
+      - "3000:3000"
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+    depends_on:
+      - prometheus
+    networks:
+      - shared-network
+
+  loki:
+    image: grafana/loki:3.0.0
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    volumes:
+      - ./loki/loki-config.yaml:/etc/loki/local-config.yaml
+      - loki-data:/loki
+    networks:
+      - shared-network
+
+  fluent-bit:
+    image: grafana/fluent-bit-plugin-loki:2.9.8
+    container_name: fluent-bit
+    ports:
+      - "24224:24224"
+    environment:
+      - LOKI_URL=http://loki:3100/loki/api/v1/push
+    volumes:
+      - ./fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
+    networks:
+      - shared-network
+  tempo:
+    image: grafana/tempo:1.5.0
+    command: -config.file /etc/tempo-config.yml
+    ports:
+      - "4317:4317"
+    volumes:
+      - ./tempo/tempo.yml:/etc/tempo-config.yml
+
+networks:
+  shared-network:
+    driver: bridge
+volumes:
+  prometheus-data:
+  grafana-data:
+  loki-data:
\ No newline at end of file
diff --git a/docker/fluent-bit/fluent-bit.conf b/docker/fluent-bit/fluent-bit.conf
new file mode 100644
index 0000000..8593f12
--- /dev/null
+++ b/docker/fluent-bit/fluent-bit.conf
@@ -0,0 +1,15 @@
+[INPUT]
+    Name        forward
+    Listen      0.0.0.0
+    Port        24224
+[Output]
+    Name        grafana-loki
+    Match       *
+    Url         http://loki:3100/loki/api/v1/push
+    RemoveKeys  source,container_id
+    Labels      {job="fluent-bit"}
+    LabelKeys   container_name
+    BatchWait   1s
+    BatchSize   1001024
+    LineFormat  json
+    LogLevel    info
\ No newline at end of file
diff --git a/docker/fluent-bit/parsers.conf b/docker/fluent-bit/parsers.conf
new file mode 100644
index 0000000..6fc36a2
--- /dev/null
+++ b/docker/fluent-bit/parsers.conf
@@ -0,0 +1,12 @@
+[PARSER]
+    Name         logback_parser
+    Format       regex
+    Regex        ^(?<time>[^ ]+ [^ ]+) \[(?<thread>[^\]]+)\] (?<level>[^ ]+) (?<logger>[^ ]+) - (?<message>.*)$
+
+#(?<time>[^ ]+ [^ ]+)	Captures timestamp (2025-03-09 12:29:12.769)
+#\[(?<thread>[^\]]+)\]	Captures thread name (parallel-1)
+#\[(?<trace_id>[^\]]+)\]	Captures traceId (abc123)
+#\[(?<span_id>[^\]]+)\]	Captures spanId (def456)
+#(?<level>[^ ]+)	Captures log level (INFO)
+#(?<logger>[^ ]+)	Captures logger class (com.example.ClassName)
+#(?<message>.*)$	Captures log message (Log message here)
diff --git a/docker/loki/loki-config.yaml b/docker/loki/loki-config.yaml
new file mode 100644
index 0000000..c13e756
--- /dev/null
+++ b/docker/loki/loki-config.yaml
@@ -0,0 +1,31 @@
+auth_enabled: false
+server:
+  http_listen_port: 3100
+ingester:
+  lifecycler:
+    address: 0.0.0.0
+    ring:
+      kvstore:
+        store: inmemory
+      replication_factor: 1
+  chunk_idle_period: 5m
+  wal:
+    enabled: true
+    dir: /loki/wal
+schema_config:
+  configs:
+    - from: 2025-03-01
+      store: tsdb
+      object_store: filesystem
+      schema: v13
+      index:
+        prefix: index_
+        period: 24h
+storage_config:
+  tsdb_shipper:
+    active_index_directory: /loki/tsdb-index
+    cache_location: /loki/tsdb-cache
+  filesystem:
+    directory: /loki/chunks
+compactor:
+  working_directory: /loki/compactor
\ No newline at end of file
diff --git a/microservices/course-composite-service/pom.xml b/microservices/course-composite-service/pom.xml
index 12460a1..87bb924 100644
--- a/microservices/course-composite-service/pom.xml
+++ b/microservices/course-composite-service/pom.xml
@@ -65,7 +65,11 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
-
+		<!-- Logback Classic for Logging -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java
index 9126c34..76942b7 100644
--- a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java
+++ b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/MetricsController.java
@@ -4,17 +4,25 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
 import jakarta.annotation.PostConstruct;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
 
 
 import java.util.Random;
 
+
+/*
+* Just for manual test for metrics and errors which doesn't sit under security
+* */
 @RestController
 @RequestMapping("/api/metrics")
 public class MetricsController {
-
+    private final Logger logger = LoggerFactory.getLogger(MetricsController.class);
     private final MeterRegistry meterRegistry;
     private Counter requestCounter;
     private Timer requestTimer;
@@ -41,6 +49,8 @@ public void init() {
 
     @GetMapping("/hello")
     public String hello() {
+        logger.info("Hello endpoint called");
+        logger.warn("This is a warning log");
         // Record request count
         requestCounter.increment();
 
@@ -56,4 +66,15 @@ public String hello() {
             }
         });
     }
+
+    @GetMapping("/runtime-error")
+    public String error() {
+        logger.error("An error occurred", new RuntimeException("Test exception"));
+        return "Error logged";
+    }
+
+    @GetMapping("/error")
+    public String triggerError() {
+        throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Something went wrong!");
+    }
 }
\ No newline at end of file
diff --git a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java
index 1a7d763..d1e244d 100644
--- a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java
+++ b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java
@@ -31,11 +31,11 @@ public CourseCompositeIntegration(
     }
 
     public Mono<CourseAggregate> getCourseDetails(Long id, Jwt jwt) {
-        logger.info("JWT ===> {}", jwt.getTokenValue());
+        logger.debug("JWT ===> {}", jwt.getTokenValue());
         String courseUrl = courseServiceUrl + "/api/courses/" + id;
         String reviewUrl = reviewServiceUrl + "/api/reviews?course=" + id;
-        logger.info("Course URL ===> {}", courseUrl);
-        logger.info("Review URL ===> {}", reviewUrl);
+        logger.debug("Course URL ===> {}", courseUrl);
+        logger.debug("Review URL ===> {}", reviewUrl);
         Mono<Course> courseMono = webClient.get()
                 .uri(courseUrl)
                 .header("Authorization", "Bearer " + jwt.getTokenValue())
diff --git a/microservices/course-composite-service/src/main/resources/application.yml b/microservices/course-composite-service/src/main/resources/application.yml
index 840f2f8..7d85ca9 100644
--- a/microservices/course-composite-service/src/main/resources/application.yml
+++ b/microservices/course-composite-service/src/main/resources/application.yml
@@ -14,8 +14,11 @@ logging:
   level:
     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"
 
-# Security related properties
+
+  # Security related properties
   security:
     oauth2:
       resourceserver:
diff --git a/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java b/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java
index 23d32a1..af903a9 100644
--- a/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java
+++ b/microservices/course-service/src/main/java/io/javatab/microservices/core/course/domain/CourseService.java
@@ -1,10 +1,14 @@
 package io.javatab.microservices.core.course.domain;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class CourseService {
 
+    private final Logger logger = LoggerFactory.getLogger(CourseService.class);
+
     private final CourseRepository courseRepository;
 
     public CourseService(CourseRepository courseRepository) {
@@ -26,10 +30,18 @@ public Course viewCourseDetailsById(Long id) {
     }
 
     public Course addCourse(Course course) {
+
+        logger.info("Checking if course '{}' already exists...", course.getTitle());
+
         if (courseRepository.existsByTitle(course.getTitle())) {
+            logger.warn("Course '{}' already exists! Throwing exception.", course.getTitle());
             throw new CourseAlreadyExitsException(course.getTitle());
         }
-        return courseRepository.save(course);
+
+        Course savedCourse = courseRepository.save(course);
+        logger.info("Course '{}' saved successfully with ID: {}", savedCourse.getTitle(), savedCourse.getId());
+
+        return savedCourse;
     }
 
     public void removeCourse(Long id) {
diff --git a/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java b/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java
index 9c979b6..1d1df2f 100644
--- a/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java
+++ b/microservices/course-service/src/main/java/io/javatab/microservices/core/course/web/CourseController.java
@@ -50,7 +50,14 @@ public Course getById(@PathVariable Long id) {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public Course post(@Valid @RequestBody Course course) {
-        return courseService.addCourse(course);
+        logger.info("Received request to create course: {}", course.getTitle());
+        Course savedCourse = courseService.addCourse(course);
+        if (savedCourse.getId() == null) {
+            logger.error("Course was not saved correctly! ID is null.");
+            throw new IllegalStateException("Failed to save course, ID is null!");
+        }
+        logger.info("Course created successfully with ID: {}", savedCourse.getId());
+        return savedCourse;
     }
 
     @DeleteMapping("/{id}")
diff --git a/microservices/course-service/src/main/resources/application.yml b/microservices/course-service/src/main/resources/application.yml
index 623c416..69bd292 100644
--- a/microservices/course-service/src/main/resources/application.yml
+++ b/microservices/course-service/src/main/resources/application.yml
@@ -29,10 +29,11 @@ spring:
           jwk-set-uri: ${KEYCLOAK_JWK_SET_URI:http://localhost:8081/realms/course-management-realm/protocol/openid-connect/certs}
 logging:
   level:
-    org.springframework: INFO
-    com.javatab: DEBUG
+    root: INFO
+    io.javatab.microservices.core.course: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-N/A}] [%X{spanId:-N/A}] %-5level %logger{36} - %msg%n"
+
 management:
   endpoints:
     web:
diff --git a/microservices/review-service/src/main/resources/application.yml b/microservices/review-service/src/main/resources/application.yml
index 3eecd03..44dc755 100644
--- a/microservices/review-service/src/main/resources/application.yml
+++ b/microservices/review-service/src/main/resources/application.yml
@@ -22,10 +22,10 @@ spring:
           jwk-set-uri: ${KEYCLOAK_JWK_SET_URI:http://localhost:8081/realms/course-management-realm/protocol/openid-connect/certs}
 logging:
   level:
-    org.springframework: INFO
-    com.javatab: DEBUG
+    root: INFO
+    io.javatab.microservices.composite.review: DEBUG
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-N/A}] [%X{spanId:-N/A}] %-5level %logger{36} - %msg%n"
 management:
   endpoints:
     web: