Reduce CI logging (#654)

* Upgrade logback, filter junit and surefire from stacktraces * Remove most DEBUG-level test logging * Remove Maven Downloading/Downloaded messages (unless warnings)
ExpediaGroup · Apr 20, 2020 · 53b7053 · 53b7053
1 parent 3da7848
commit 53b7053
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 19 deletions.
diff --git a/components/api/src/test/resources/conf/logback/logback.xml b/components/api/src/test/resources/conf/logback/logback.xml
@@ -3,11 +3,14 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 
-  <root level="DEBUG">
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 </configuration>
diff --git a/components/client/src/test/integration/resources/logback.xml b/components/client/src/test/integration/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/components/client/src/test/unit/resources/logback.xml b/components/client/src/test/unit/resources/logback.xml
@@ -3,7 +3,9 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}</pattern>
     </encoder>
   </appender>
 

diff --git a/components/common/src/test/resources/logback.xml b/components/common/src/test/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/components/proxy/src/test/resources/conf/logback.xml b/components/proxy/src/test/resources/conf/logback.xml
@@ -3,11 +3,14 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 
-  <root level="DEBUG">
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 </configuration>
diff --git a/components/proxy/src/test/resources/logback.xml b/components/proxy/src/test/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/components/server/src/test/resources/conf/logback/logback.xml b/components/server/src/test/resources/conf/logback/logback.xml
@@ -3,11 +3,14 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 
-  <root level="DEBUG">
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 </configuration>
diff --git a/components/server/src/test/resources/logback.xml b/components/server/src/test/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/pom.xml b/pom.xml
@@ -128,7 +128,7 @@
     <java-uuid-generator.version>3.1.5</java-uuid-generator.version>
 
     <!-- Logging Versions -->
-    <logback.version>1.1.2</logback.version>
+    <logback.version>1.1.10</logback.version>
     <slf4j.version>1.7.30</slf4j.version>
 
     <scala.version>2.12</scala.version>

diff --git a/support/testsupport/src/test/resources/logback.xml b/support/testsupport/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml
@@ -2,7 +2,10 @@
 <configuration scan="true" scanPeriod="10000">
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml
@@ -2,7 +2,10 @@
 <configuration scan="true" scanPeriod="10000">
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml
@@ -2,7 +2,10 @@
 <configuration scan="true" scanPeriod="10000">
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/system-tests/e2e-suite/src/test/resources/logback.xml b/system-tests/e2e-suite/src/test/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml b/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml
@@ -2,7 +2,10 @@
 <configuration scan="true" scanPeriod="10000">
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/system-tests/ft-suite/src/test/resources/logback.xml b/system-tests/ft-suite/src/test/resources/logback.xml
@@ -3,7 +3,10 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full,
+        org.junit,
+        org.apache.maven.surefire}
+      </pattern>
     </encoder>
   </appender>
 

diff --git a/travis/deploy.sh b/travis/deploy.sh
@@ -48,7 +48,7 @@ mvn install -B -U -P macosx,release -DskipTests=true -Dmaven.test.skip=true -Dgp
 
 function deploySnapshot() {
   echo "Deploying snapshot to sonatype"
-  mvn deploy --settings travis/mvn-settings.xml -B -U -P sonatype-oss-release,linux -DskipTests=true -Dmaven.test.skip=true -Dgpg.skip=true
+  mvn deploy --settings travis/mvn-settings.xml -B -U -P sonatype-oss-release,linux -DskipTests=true -Dmaven.test.skip=true -Dgpg.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 }
 
 if [[ -n "$TRAVIS_TAG" ]]; then