From 9862fe023f550c5c92b94814a568b494b54ec97c Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Wed, 1 Jan 2020 09:13:55 +0800
Subject: [PATCH] Log harmless exception in DEBUG level (#4156)

* Log harmless exception in DEBUG level

* Log harmless exception in DEBUG level

* Minor refactor to avoid default method
---
 .../apache/skywalking/apm/agent/core/logging/api/ILog.java  | 2 ++
 .../skywalking/apm/agent/core/logging/api/NoopLogger.java   | 5 +++++
 .../apm/agent/core/logging/core/PatternLogger.java          | 6 ++++++
 .../agent/core/plugin/match/ProtectiveShieldMatcher.java    | 4 +++-
 apm-sniffer/config/agent.config                             | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
index 5c4d496085..afd5fd2a49 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
@@ -51,5 +51,7 @@ public interface ILog {
 
     void debug(String format, Object... arguments);
 
+    void debug(Throwable t, String format, Object... arguments);
+
     void error(String format);
 }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
index 2ad720692b..016cc43463 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
@@ -78,6 +78,11 @@ public enum NoopLogger implements ILog {
 
     }
 
+    @Override
+    public void debug(final Throwable t, final String format, final Object... arguments) {
+
+    }
+
     @Override
     public void error(String format) {
 
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
index a03341cdba..9a2bc530b9 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
@@ -184,6 +184,12 @@ public class PatternLogger implements ILog {
         }
     }
 
+    @Override
+    public void debug(final Throwable t, final String format, final Object... arguments) {
+        if (isDebugEnable()) {
+            logger(LogLevel.DEBUG, replaceParam(format, arguments), t);
+        }
+    }
 
     String format(LogLevel level, String message, Throwable t) {
         LogEvent logEvent = new LogEvent(level, message, t, targetClass);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java
index a4c7027652..46a3cea5d3 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java
@@ -46,7 +46,9 @@ public class ProtectiveShieldMatcher<T> extends ElementMatcher.Junction.Abstract
         try {
             return this.matcher.matches(target);
         } catch (Throwable t) {
-            logger.warn(t, "Byte-buddy occurs exception when match type.");
+            if (logger.isDebugEnable()) {
+                logger.debug(t, "Byte-buddy occurs exception when match type.");
+            }
             return false;
         }
     }
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index dfa6aeee9e..ca47aef401 100644
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -48,7 +48,7 @@ collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES:127.0.0.1:11800}
 logging.file_name=${SW_LOGGING_FILE_NAME:skywalking-api.log}
 
 # Logging level
-logging.level=${SW_LOGGING_LEVEL:DEBUG}
+logging.level=${SW_LOGGING_LEVEL:INFO}
 
 # Logging dir
 # logging.dir=${SW_LOGGING_DIR:""}
-- 
GitLab