From 3b8b39ea05b907dbb0ae600f11b9681e695404a6 Mon Sep 17 00:00:00 2001
From: kimjaeyeol <godbasic97@gmail.com>
Date: Mon, 6 Dec 2021 17:53:38 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Modify=20Log=20traceId,=20spanId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 .../src/main/resources/logback-spring.xml     | 22 +++++++++++++++----
 8 files changed, 144 insertions(+), 32 deletions(-)

diff --git a/backend/apigateway/src/main/resources/logback-spring.xml b/backend/apigateway/src/main/resources/logback-spring.xml
index 74b3422..1ba9527 100644
--- a/backend/apigateway/src/main/resources/logback-spring.xml
+++ b/backend/apigateway/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/board-service/src/main/resources/logback-spring.xml b/backend/board-service/src/main/resources/logback-spring.xml
index 5d2aec4..9968bdd 100644
--- a/backend/board-service/src/main/resources/logback-spring.xml
+++ b/backend/board-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/config/src/main/resources/logback-spring.xml b/backend/config/src/main/resources/logback-spring.xml
index 28c2059..6a87fe7 100644
--- a/backend/config/src/main/resources/logback-spring.xml
+++ b/backend/config/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/portal-service/src/main/resources/logback-spring.xml b/backend/portal-service/src/main/resources/logback-spring.xml
index cfdd9f0..d1d5089 100644
--- a/backend/portal-service/src/main/resources/logback-spring.xml
+++ b/backend/portal-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/reserve-check-service/src/main/resources/logback-spring.xml b/backend/reserve-check-service/src/main/resources/logback-spring.xml
index 5f1cce1..d2c54de 100644
--- a/backend/reserve-check-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-check-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/reserve-item-service/src/main/resources/logback-spring.xml b/backend/reserve-item-service/src/main/resources/logback-spring.xml
index c70f671..8172157 100644
--- a/backend/reserve-item-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-item-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/reserve-request-service/src/main/resources/logback-spring.xml b/backend/reserve-request-service/src/main/resources/logback-spring.xml
index 6d13950..46779b1 100644
--- a/backend/reserve-request-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-request-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">
diff --git a/backend/user-service/src/main/resources/logback-spring.xml b/backend/user-service/src/main/resources/logback-spring.xml
index eeeb082..6d19236 100644
--- a/backend/user-service/src/main/resources/logback-spring.xml
+++ b/backend/user-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %thread %-5level %logger - %m%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(%-4relative) - [%thread{10}, %X{traceId:-}, %X{spanId:-}] %cyan(%logger{20}): %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -20,9 +20,23 @@
 
         <!-- ELK - Logstash 로 로그를 전송하기 위한 appender -->
         <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>${destination}</destination><!-- native profile => localhost:8088 -->
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                <customFields>{"app.name":"${app_name}"}</customFields>
+            <destination>${destination}</destination>
+            <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+                <providers>
+                    <mdc/>
+                    <context/>
+                    <logLevel/>
+                    <loggerName/>
+                    <pattern>
+                        <pattern>
+                            {"appName": "${app_name}"}
+                        </pattern>
+                    </pattern>
+                    <threadName/>
+                    <message/>
+                    <logstashMarkers/>
+                    <stackTrace/>
+                </providers>
             </encoder>
         </appender>
         <root level="WARN">