Fix logging

openzipkin · Oct 22, 2020 · d12b268 · d12b268
1 parent 0c59872
commit d12b268
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/zipkin-server/src/main/resources/simplelogger.properties b/zipkin-server/src/main/resources/simplelogger.properties
@@ -8,10 +8,7 @@ org.slf4j.simpleLogger.showShortLogName=true
 
 # this mirrors the logging configuration applied in zipkin-server-shared.yml , logging.level
 # This only includes Armeria as for example Kafka and Cassandra are not in the slim dist
-org.slf4j.simpleLogger.log.com.linecorp.armeria.client.HttpResponseDecoder=OFF
 org.slf4j.simpleLogger.log.com.linecorp.armeria.common.Flags=OFF
 org.slf4j.simpleLogger.log.com.linecorp.armeria.common.util.SystemInfo=WARN
-org.slf4j.simpleLogger.log.com.linecorp.armeria.internal.common.JavaVersionSpecific=OFF
-org.slf4j.simpleLogger.log.com.linecorp.armeria.server.docs.DocService=OFF
 org.slf4j.simpleLogger.log.com.linecorp.armeria.server.docs.DocStringExtractor=OFF
-org.slf4j.simpleLogger.log.com.linecorp.armeria.spring.ArmeriaAutoConfiguration=WARN
+org.slf4j.simpleLogger.log.com.linecorp.armeria.spring=WARN
diff --git a/zipkin-server/src/main/resources/zipkin-server-shared.yml b/zipkin-server/src/main/resources/zipkin-server-shared.yml
@@ -260,17 +260,12 @@ logging:
     com.datastax.oss.driver.internal.core.context.InternalDriverContext: 'WARN'
     # Use of native clocks in Cassandra is not insightful
     com.datastax.oss.driver.internal.core.time.Clock: 'WARN'
-    # Silence ResponseTimeoutException in the Armeria framework since we log it anyways in HTTP
-    # logging when enabled. https://github.com/line/armeria/issues/2000
-    com.linecorp.armeria.client.HttpResponseDecoder: 'OFF'
     com.linecorp.armeria.common.Flags: 'OFF'
-    com.linecorp.armeria.common.SerializationFormat: 'OFF'
     # Hostname logging is not Zipkin's duty
     com.linecorp.armeria.common.util.SystemInfo: 'WARN'
-    com.linecorp.armeria.internal.common.JavaVersionSpecific: 'OFF'
     com.linecorp.armeria.server.docs.DocStringExtractor: 'OFF'
     # Redundant to logging already done in c.l.a.s.Server
-    com.linecorp.armeria.spring.ArmeriaAutoConfiguration: 'WARN'
+    com.linecorp.armeria.spring: 'WARN'
     # kafka is quite chatty so we switch everything off by default
     org.apache.kafka: 'OFF'
 #     # investigate /api/v2/dependencies