SPARK-25281 Add logstash json logs

LibertyGlobal · Nov 27, 2020 · 378401a · 378401a
1 parent bdd6990
commit 378401a
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 1 deletion.
diff --git a/LICENSE-THIRD-PARTY.txt b/LICENSE-THIRD-PARTY.txt
@@ -1,5 +1,5 @@
 
-Lists of 154 third-party dependencies.
+Lists of 155 third-party dependencies.
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.2.3 - http://logback.qos.ch/logback-classic)
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.2.3 - http://logback.qos.ch/logback-core)
      (The Apache License, Version 2.0) spock-reports (com.athaydes:spock-reports:1.7.1 - https://github.com/renatoathaydes/spock-reports)
@@ -56,6 +56,7 @@ Lists of 154 third-party dependencies.
      (Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.10.14 - https://bytebuddy.net/byte-buddy)
      (Apache License, Version 2.0) Byte Buddy agent (net.bytebuddy:byte-buddy-agent:1.10.14 - https://bytebuddy.net/byte-buddy-agent)
      (Apache License v2.0) (LGPL, version 2.1) Java Native Access (net.java.dev.jna:jna:5.2.0 - https://github.com/java-native-access/jna)
+     (Apache License, Version 2.0) (MIT License) Logstash Logback Encoder (net.logstash.logback:logstash-logback-encoder:6.4 - https://github.com/logstash/logstash-logback-encoder)
      (The Apache Software License, Version 2.0) ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
      (The Apache Software License, Version 2.0) JSON Small and Fast Parser (net.minidev:json-smart:2.3 - http://www.minidev.net/)
      (Apache License, Version 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.20 - https://commons.apache.org/proper/commons-compress/)

diff --git a/appstore-metadata-service/pom.xml b/appstore-metadata-service/pom.xml
@@ -28,6 +28,21 @@
         <scmCommit>latest</scmCommit>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -97,9 +112,21 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <version>${micrometer.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>${logstash.logback.encoder.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

diff --git a/appstore-metadata-service/src/main/resources/config/application.properties b/appstore-metadata-service/src/main/resources/config/application.properties
@@ -1,3 +1,4 @@
+spring.profiles.active[email protected]@
 spring.jackson.default-property-inclusion=NON_NULL
 database.host=${JDBC_HOST:localhost}
 database.name=${JDBC_DATABASE_NAME:postgres}

diff --git a/appstore-metadata-service/src/main/resources/logback-spring.xml b/appstore-metadata-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,41 @@
+<configuration>
+    <springProfile name="dev">
+        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder>
+                <pattern>
+                    %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n
+                </pattern>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="STDOUT"/>
+        </root>
+        <logger name="com.lgi.appstore.metadata" level="DEBUG" additivity="false">
+            <appender-ref ref="STDOUT"/>
+        </logger>
+    </springProfile>
+    <springProfile name="prod">
+        <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+                <timestampPattern>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</timestampPattern>
+                <customFields>{
+                    "app":"${APP_NAME:-not defined}",
+                    "app_version":"${APP_VERSION:-not defined}",
+                    "app_revision":"${APP_REVISION:-not defined}",
+                    "app_branch":"${APP_BRANCH:-not defined}",
+                    "stack":"${STACK_NAME:-not defined}"
+                    }
+                </customFields>
+                <fieldNames>
+                    <levelValue>[ignore]</levelValue>
+                    <version>[ignore]</version>
+                    <thread>thread</thread>
+                    <stackTrace>exception</stackTrace>
+                </fieldNames>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="jsonConsoleAppender"/>
+        </root>
+    </springProfile>
+</configuration>
diff --git a/pom.xml b/pom.xml
@@ -25,6 +25,7 @@
         <springdoc-openapi-ui-version>1.4.3</springdoc-openapi-ui-version>
         <junit-version>5.6.2</junit-version>
         <maven-surefire-version>2.22.2</maven-surefire-version>
+        <logstash.logback.encoder.version>6.4</logstash.logback.encoder.version>
         <skipUTs>false</skipUTs>
         <registry.url>set_for_pushing_docker_image</registry.url>
         <registry.namespace>set_for_pushing_docker_image</registry.namespace>
@@ -93,6 +94,15 @@
                 <skipFTs>true</skipFTs>
             </properties>
         </profile>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+        </profile>
     </profiles>
 
     <dependencyManagement>