From 07c8609b17e31296b4a2664999c00d8c5aa8bdc5 Mon Sep 17 00:00:00 2001
From: Ivor D'Souza <ivor2048@outlook.com>
Date: Sun, 27 Oct 2024 18:01:48 +0000
Subject: [PATCH 1/2] feat(elk-stack-setup): add ecs logging for elastic setup

---
 pom.xml                                       | 12 +++----
 src/main/resources/application.properties     |  3 ++
 src/main/resources/logback-spring.xml         | 21 ++++++++++++
 src/main/resources/logback.xml                | 32 -------------------
 .../WEB-INF/jboss-deployment-structure.xml    |  8 +++++
 5 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 src/main/resources/logback-spring.xml
 delete mode 100644 src/main/resources/logback.xml
 create mode 100644 src/main/webapp/WEB-INF/jboss-deployment-structure.xml

diff --git a/pom.xml b/pom.xml
index 9a3aa8a..600829e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
+		</dependency>
+
+		<dependency> 
+			<groupId>co.elastic.logging</groupId> 
+			<artifactId>logback-ecs-encoder</artifactId> 
+			<version>0.4.0</version> 
 		</dependency>
 
 		<dependency>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 461e6a1..becbeae 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -48,3 +48,6 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
+
+logging.path=logs/
+logging.file.name=logs/helpline1097-api.log
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..232d479
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,21 @@
+<configuration>
+    <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/my-api}"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <appender name="ECS_JSON_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE}.json</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE}.json.%d{yyyy-MM-dd}.gz</fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>0</maxHistory>
+            <totalSizeCap>10MB</totalSizeCap>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+        </rollingPolicy>
+        <encoder class="co.elastic.logging.logback.EcsEncoder"/>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="ECS_JSON_FILE"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index 78302a2..0000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<configuration>
-
-    <property name="HOME_LOG" value="logs/app.log"/>
-
-    <appender name="FILE-ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${HOME_LOG}</file>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <!-- each archived file, size max 10MB -->
-            <maxFileSize>1MB</maxFileSize>
-            <!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
-            <totalSizeCap>20GB</totalSizeCap>
-            <!-- 60 days to keep -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <encoder>
-            <pattern>%d %-5p [%X{sessionId}] [%X{userId}] %C{1}.%M:%L] %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="com.iemr" level="debug" additivity="false">
-        <appender-ref ref="FILE-ROLLING"/>
-    </logger>
-
-    <root level="error">
-        <appender-ref ref="FILE-ROLLING"/>
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..545b679
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,8 @@
+<jboss-deployment-structure>
+    <deployment>
+        <exclusions>
+            <module name="org.slf4j" />
+            <module name="org.slf4j.impl" />
+        </exclusions>
+    </deployment>
+</jboss-deployment-structure>
\ No newline at end of file

From a4f459fc9f1f0d6a73ba7814ca3486a3bc0ee3a9 Mon Sep 17 00:00:00 2001
From: Ivor D'Souza <ivor2048@outlook.com>
Date: Thu, 31 Oct 2024 01:49:23 +0000
Subject: [PATCH 2/2] fix bot suggestions

---
 pom.xml                               |  2 +-
 src/main/resources/logback-spring.xml | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 600829e..a144db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<dependency> 
 			<groupId>co.elastic.logging</groupId> 
 			<artifactId>logback-ecs-encoder</artifactId> 
-			<version>0.4.0</version> 
+			<version>1.3.2</version> 
 		</dependency>
 
 		<dependency>
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 232d479..50aecbc 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,21 +1,27 @@
 <configuration>
-    <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/my-api}"/>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <property name="LOG_FILE"
+        value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/my-api}" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
     <appender name="ECS_JSON_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_FILE}.json</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_FILE}.json.%d{yyyy-MM-dd}.gz</fileNamePattern>
-            <maxFileSize>10MB</maxFileSize>
+            <maxFileSize>100MB</maxFileSize>
             <maxHistory>0</maxHistory>
-            <totalSizeCap>10MB</totalSizeCap>
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
-        <encoder class="co.elastic.logging.logback.EcsEncoder"/>
+        <encoder class="co.elastic.logging.logback.EcsEncoder" />
+    </appender>
+    <appender name="ASYNC_ECS" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="ECS_JSON_FILE" />
+        <queueSize>512</queueSize>
+        <discardingThreshold>0</discardingThreshold>
+        <includeCallerData>false</includeCallerData>
     </appender>
 
     <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="ECS_JSON_FILE"/>
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="ASYNC_ECS" />
     </root>
 </configuration>
\ No newline at end of file