CIRC-1645 Update logging configuration

folio-org · Jan 17, 2023 · 8aa1937 · 8aa1937
1 parent c571e20
commit 8aa1937
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -39,6 +39,7 @@
 <!-- OPTIONAL
 - [ ] Use GitHub checklists. When solved, check the box and explain the answer.
 -->
+- [ ] Check logging
 
 ## Learning
 <!-- OPTIONAL

diff --git a/src/main/resources/log4j2-json.properties b/src/main/resources/log4j2-json.properties
@@ -0,0 +1,39 @@
+status = error
+name = PropertiesConfig
+packages = org.folio.okapi.common.logging
+
+filters = threshold
+
+filter.threshold.type = ThresholdFilter
+filter.threshold.level = info
+
+appenders = console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = JSONLayout
+appender.console.layout.compact = true
+appender.console.layout.eventEol = true
+appender.console.layout.stacktraceAsString = true
+appender.console.layout.includeTimeMillis = true
+
+## Folio fields
+appender.console.layout.requestId.type = KeyValuePair
+appender.console.layout.requestId.key = requestId
+appender.console.layout.requestId.value = $${FolioLoggingContext:requestid}
+
+appender.console.layout.tenantId.type = KeyValuePair
+appender.console.layout.tenantId.key = tenantId
+appender.console.layout.tenantId.value = $${FolioLoggingContext:tenantid}
+
+appender.console.layout.userId.type = KeyValuePair
+appender.console.layout.userId.key = userId
+appender.console.layout.userId.value = $${FolioLoggingContext:userid}
+
+appender.console.layout.moduleId.type = KeyValuePair
+appender.console.layout.moduleId.key = moduleId
+appender.console.layout.moduleId.value = $${FolioLoggingContext:moduleid}
+
+rootLogger.level = info
+rootLogger.appenderRefs = info
+rootLogger.appenderRef.stdout.ref = STDOUT
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
@@ -1,5 +1,6 @@
 status = error
 name = PropertiesConfig
+packages = org.folio.okapi.common.logging
 
 filters = threshold
 
@@ -11,7 +12,7 @@ appenders = console
 appender.console.type = Console
 appender.console.name = STDOUT
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-20.20C{1} %m%n
+appender.console.layout.pattern = %d{HH:mm:ss} [$${FolioLoggingContext:requestid}] [$${FolioLoggingContext:tenantid}] [$${FolioLoggingContext:userid}] [$${FolioLoggingContext:moduleid}] %-5p %-20.20C{1} %.-10240m%n
 
 rootLogger.level = info
 rootLogger.appenderRefs = info

diff --git a/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties
@@ -0,0 +1,19 @@
+status = error
+name = PropertiesConfig
+packages = org.folio.okapi.common.logging
+
+filters = threshold
+
+filter.threshold.type = ThresholdFilter
+filter.threshold.level = info
+
+appenders = console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{HH:mm:ss} [$${FolioLoggingContext:requestid}] [$${FolioLoggingContext:tenantid}] [$${FolioLoggingContext:userid}] [$${FolioLoggingContext:moduleid}] %-5p %-20.20C{1} %.-10240m%n
+
+rootLogger.level = info
+rootLogger.appenderRefs = info
+rootLogger.appenderRef.stdout.ref = STDOUT