From 1ec1562e14c915c5a4c5051ac621583083b8da96 Mon Sep 17 00:00:00 2001
From: akobor <adam.kobor@makery.co>
Date: Tue, 11 Aug 2020 18:29:45 +0200
Subject: [PATCH] Use structured log format in production by default

---
 src/main/resources/logback.xml | 36 +++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8001398..fdb7baf 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,20 +1,28 @@
 <configuration>
     <variable name="communicationLogLevel" value="${HTTP_COMMUNICATION_LOG_LEVEL:-INFO}"/>
-
+    <!--    GCP's structured log format-->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <if condition='property("LOG_FORMAT").equals("JSON")'>
-            <then>
-                <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
-            </then>
-            <else>
-                <withJansi>true</withJansi>
-                <encoder>
-                    <pattern>
-                        %cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n
-                    </pattern>
-                </encoder>
-            </else>
-        </if>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <timestamp>
+                    <fieldName>timestamp</fieldName>
+                </timestamp>
+                <loggerName/>
+                <logLevel>
+                    <fieldName>severity</fieldName>
+                </logLevel>
+                <message/>
+                <stackHash/>
+                <stackTrace>
+                    <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                        <maxDepthPerThrowable>30</maxDepthPerThrowable>
+                        <maxLength>2048</maxLength>
+                        <shortenedClassNameLength>20</shortenedClassNameLength>
+                        <rootCauseFirst>true</rootCauseFirst>
+                    </throwableConverter>
+                </stackTrace>
+            </providers>
+        </encoder>
     </appender>
 
     <logger name="org.jooq" level="ERROR"/>