From 68bf7f7fdf354b0d26cd05db0813cc34db1fee0b Mon Sep 17 00:00:00 2001
From: SriHarsha Ghanta <harshaghanta@gmail.com>
Date: Sun, 12 Jan 2025 21:41:53 +0530
Subject: [PATCH] replaced opentelemetry with spring boot actuator, loki
 logback appender and spring boot tempo integration

---
 .../src/main/resources/logback-spring.xml     | 32 +++++++++++++++++
 .../ordering-backgroundtasks/Dockerfile       |  4 +--
 .../Ordering/ordering-backgroundtasks/pom.xml | 22 ------------
 .../src/main/resources/application.yml        | 36 ++++++++++++++++++-
 .../src/main/resources/logback-spring.xml     | 32 +++++++++++++++++
 src/docker-compose.override.yml               |  3 ++
 src/docker-compose.yml                        | 20 ++++++-----
 7 files changed, 115 insertions(+), 34 deletions(-)
 create mode 100644 src/Services/Ordering/orderapi/src/main/resources/logback-spring.xml
 create mode 100644 src/Services/Ordering/ordering-backgroundtasks/src/main/resources/logback-spring.xml

diff --git a/src/Services/Ordering/orderapi/src/main/resources/logback-spring.xml b/src/Services/Ordering/orderapi/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..066c67e
--- /dev/null
+++ b/src/Services/Ordering/orderapi/src/main/resources/logback-spring.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <springProperty scope="context" name="appName" source="spring.application.name" />
+    
+    <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
+        <http>
+            <url>http://loki:3100/loki/api/v1/push</url>
+        </http>
+        <format>
+            <label>
+                <pattern>application=${appName},host=${HOSTNAME},level=%level</pattern>
+            </label>
+            <message>
+                <pattern>${FILE_LOG_PATTERN}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
+    </appender>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">        
+        <appender-ref ref="LOKI" />
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
+        
diff --git a/src/Services/Ordering/ordering-backgroundtasks/Dockerfile b/src/Services/Ordering/ordering-backgroundtasks/Dockerfile
index 93c7872..70e05c2 100644
--- a/src/Services/Ordering/ordering-backgroundtasks/Dockerfile
+++ b/src/Services/Ordering/ordering-backgroundtasks/Dockerfile
@@ -40,6 +40,6 @@ RUN mvn -f /src/Services/Ordering/ordering-backgroundtasks/pom.xml -s /src/setti
 FROM base AS final
 WORKDIR /app
 COPY --from=build /src/Services/Ordering/ordering-backgroundtasks/target/ordering-backgroundtasks.jar ./ordering-backgroundtasks.jar
-COPY --from=build /src/Services/Ordering/ordering-backgroundtasks/target/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar
 
-ENTRYPOINT ["java", "-javaagent:./opentelemetry-javaagent.jar", "-Dspring.profiles.active=dev", "-jar", "ordering-backgroundtasks.jar"]
\ No newline at end of file
+
+ENTRYPOINT ["java", "-Dspring.profiles.active=dev", "-jar", "ordering-backgroundtasks.jar"]
\ No newline at end of file
diff --git a/src/Services/Ordering/ordering-backgroundtasks/pom.xml b/src/Services/Ordering/ordering-backgroundtasks/pom.xml
index ccedecc..a97f704 100644
--- a/src/Services/Ordering/ordering-backgroundtasks/pom.xml
+++ b/src/Services/Ordering/ordering-backgroundtasks/pom.xml
@@ -21,23 +21,6 @@
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jdbc</artifactId>
@@ -54,11 +37,6 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		
-		<dependency>
-			<groupId>io.opentelemetry.javaagent</groupId>
-			<artifactId>opentelemetry-javaagent</artifactId>
-		</dependency>
-		
 	</dependencies>
 
 	<build>
diff --git a/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/application.yml b/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/application.yml
index 9bb3f6b..202949a 100644
--- a/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/application.yml
+++ b/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/application.yml
@@ -1 +1,35 @@
-spring.profiles.active: dev
\ No newline at end of file
+spring:
+  application:
+    name: ordering-backgroundtasks
+  profiles:
+    active:
+    - dev
+
+#enable management endpoints
+management:
+  metrics:
+    distribution:
+      percentiles-histogram:
+        http:
+          server: 
+            requests: true
+  tracing:
+    sampling:
+      probability: 1.0
+        
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+
+  prometheus:
+    metrics:
+      export:
+        enabled: true
+
+  zipkin:
+    tracing:
+      endpoint: http://tempo:9411/api/v2/spans
diff --git a/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/logback-spring.xml b/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..066c67e
--- /dev/null
+++ b/src/Services/Ordering/ordering-backgroundtasks/src/main/resources/logback-spring.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <springProperty scope="context" name="appName" source="spring.application.name" />
+    
+    <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
+        <http>
+            <url>http://loki:3100/loki/api/v1/push</url>
+        </http>
+        <format>
+            <label>
+                <pattern>application=${appName},host=${HOSTNAME},level=%level</pattern>
+            </label>
+            <message>
+                <pattern>${FILE_LOG_PATTERN}</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
+    </appender>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">        
+        <appender-ref ref="LOKI" />
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
+        
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index b2e276d..58288fe 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -17,5 +17,8 @@ services:
   basketdata:
     ports:
     - "6379:6379"
+  ordering-backgroundtasks:
+    environment:
+      SERVER_SERVLET_CONTEXT_PATH: "/ordering-backgroundtasks"
 
   
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 2b4c232..8d23342 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -122,20 +122,22 @@ services:
     image: ${REGISTRY:-springeshop}/orderingbackgroundtasks:latest
     env_file:
     - .env
-    environment:
-      OTEL_TRACES_EXPORTER: "jaeger"
-      OTEL_SERVICE_NAME: "ordering-backgroundtasks"
-      OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250"
-      OTEL_METRICS_EXPORTER: "prometheus"
-      OTEL_EXPORTER_PROMETHEUS_HOST: "0.0.0.0"
-      OTEL_EXPORTER_PROMETHEUS_PORT: "9464"
-      OTEL_LOGS_EXPORTER: "otlp"
-      OTEL_EXPORTER_OTLP_LOGS_ENDPOINT: "http://collector:4317"
+    # environment:
+    #   OTEL_TRACES_EXPORTER: "jaeger"
+    #   OTEL_SERVICE_NAME: "ordering-backgroundtasks"
+    #   OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250"
+    #   OTEL_METRICS_EXPORTER: "prometheus"
+    #   OTEL_EXPORTER_PROMETHEUS_HOST: "0.0.0.0"
+    #   OTEL_EXPORTER_PROMETHEUS_PORT: "9464"
+    #   OTEL_LOGS_EXPORTER: "otlp"
+    #   OTEL_EXPORTER_OTLP_LOGS_ENDPOINT: "http://collector:4317"
     depends_on:
       db:
         condition: service_healthy
       eventbus:
         condition: service_healthy
+    ports:
+    - 8084:8080
     networks:
       - simpbridgenetwork
   webspa: