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

---
 pom.xml                                       | 24 +++++--------------
 src/main/resources/application.properties     |  4 ++--
 src/main/resources/logback-spring.xml         | 21 ++++++++++++++++
 .../WEB-INF/jboss-deployment-structure.xml    |  8 +++++++
 4 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 src/main/resources/logback-spring.xml
 create mode 100644 src/main/webapp/WEB-INF/jboss-deployment-structure.xml

diff --git a/pom.xml b/pom.xml
index 0c0aa2e..732e10c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,24 +34,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
 			<version>3.2.2</version>
-			<exclusions>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</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 4fb2ddf..b3e6c24 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -33,8 +33,8 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 
 #If both properties are set, only logging.file.name takes effect.
-logging.file.path=logs/
-logging.file.name=logs/ecd.log
+logging.path=logs/
+logging.file.name=logs/ecd-api.log
 logging.logback.rollingpolicy.max-file-size=2MB
 logging.logback.rollingpolicy.max-history=1
 logging.level.org.springframework=DEBUG
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/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 bc4d37116a5ea518d751e8306335f0c3f771013f Mon Sep 17 00:00:00 2001
From: Ivor D'Souza <ivor2048@outlook.com>
Date: Thu, 31 Oct 2024 01:48:09 +0000
Subject: [PATCH 2/2] fix bot suggestions

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

diff --git a/pom.xml b/pom.xml
index 732e10c..232965b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,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/application.properties b/src/main/resources/application.properties
index b3e6c24..b0ac13a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -35,12 +35,6 @@ logging.level.org.hibernate=INFO
 #If both properties are set, only logging.file.name takes effect.
 logging.path=logs/
 logging.file.name=logs/ecd-api.log
-logging.logback.rollingpolicy.max-file-size=2MB
-logging.logback.rollingpolicy.max-history=1
-logging.level.org.springframework=DEBUG
-
-
-
 
 ## multipart file size
 spring.http.multipart.max-request-size=10MB
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