diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 097ab9a..3147571 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,21 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <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" />
+    <list default="true" id="82def982-1f77-496a-a21a-a6ccc7bf68be" name="Changes" comment="Tempo integration for docker">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/docker/docker-compose-observability.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/docker-compose-observability.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker/tempo/tempo.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/tempo/tempo.yml" 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>
@@ -277,7 +268,23 @@
       <option name="project" value="LOCAL" />
       <updated>1741502933986</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="Fluentbit integration for docker">
+      <option name="closed" value="true" />
+      <created>1741573714727</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1741573714727</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Tempo integration for docker">
+      <option name="closed" value="true" />
+      <created>1741585635326</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1741585635326</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -303,7 +310,9 @@
     <MESSAGE value="Tilt config to run all manifest in one go" />
     <MESSAGE value="Prometheus integration" />
     <MESSAGE value="Prometheus integration for kubernetes" />
-    <option name="LAST_COMMIT_MESSAGE" value="Prometheus integration for kubernetes" />
+    <MESSAGE value="Fluentbit integration for docker" />
+    <MESSAGE value="Tempo integration for docker" />
+    <option name="LAST_COMMIT_MESSAGE" value="Tempo integration for docker" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
index 2245f7f..60dbb58 100644
--- 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
index 7100ae8..104614b 100644
--- 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
deleted file mode 100644
index 6fc36a2..0000000
--- a/docker/fluent-bit/parsers.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[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/tempo/tempo.yml b/docker/tempo/tempo.yml
new file mode 100644
index 0000000..6c4b0f9
--- /dev/null
+++ 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
index 87bb924..fba5365 100644
--- 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
index 6f1c38b..2cbf5a1 100644
--- 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
index 7d85ca9..3e16f5c 100644
--- 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
index ee87cdc..772fa2d 100644
--- 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
index 69bd292..55c2699 100644
--- 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
index dc7da7e..38ec9a4 100644
--- 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
index 44dc755..219cb50 100644
--- 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: