Merge pull request #2030 from emeroad/master

#2026 remove JDK logger dependency
pinpoint-apm · Aug 31, 2016 · 323fe54 · 323fe54
2 parents c40fc00 + 6947ea3
commit 323fe54
Show file tree

Hide file tree

Showing 26 changed files with 664 additions and 187 deletions.
diff --git a/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java b/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java
@@ -16,10 +16,11 @@
 
 package com.navercorp.pinpoint.bootstrap.config;
 
-import com.navercorp.pinpoint.bootstrap.logging.JavaLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.util.NumberUtils;
 import com.navercorp.pinpoint.bootstrap.util.spring.PropertyPlaceholderHelper;
+import com.navercorp.pinpoint.common.util.logger.CommonLogger;
 import com.navercorp.pinpoint.common.util.PropertyUtils;
+import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -29,16 +30,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 /**
  * @author emeroad
  * @author netspider
  */
 public class DefaultProfilerConfig implements ProfilerConfig {
-    private static final Logger logger = JavaLoggerFactory.getLogger(DefaultProfilerConfig.class.getName());
+    private static final CommonLogger logger = StdoutCommonLoggerFactory.INSTANCE.getLogger(DefaultProfilerConfig.class.getName());
     private static final String DEFAULT_IP = "127.0.0.1";
 
     private final Properties properties;
@@ -72,13 +71,13 @@ public static ProfilerConfig load(String pinpointConfigFileName) throws IOExcept
             Properties properties = PropertyUtils.loadProperty(pinpointConfigFileName);
             return new DefaultProfilerConfig(properties);
         } catch (FileNotFoundException fe) {
-            if (logger.isLoggable(Level.WARNING)) {
-                logger.log(Level.WARNING, pinpointConfigFileName + " file does not exist. Please check your configuration.");
+            if (logger.isWarnEnabled()) {
+                logger.warn(pinpointConfigFileName + " file does not exist. Please check your configuration.");
             }
             throw fe;
         } catch (IOException e) {
-            if (logger.isLoggable(Level.WARNING)) {
-                logger.log(Level.WARNING, pinpointConfigFileName + " file I/O error. Error:" + e.getMessage(), e);
+            if (logger.isWarnEnabled()) {
+                logger.warn(pinpointConfigFileName + " file I/O error. Error:" + e.getMessage(), e);
             }
             throw e;
         }
@@ -729,7 +728,7 @@ private String readString(String propertyName, String defaultValue, ValueResolve
         }
         String value = properties.getProperty(propertyName, defaultValue);
         value = valueResolver.resolve(value, properties);
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyName + "=" + value);
         }
         return value;
@@ -739,7 +738,7 @@ private String readString(String propertyName, String defaultValue, ValueResolve
     public int readInt(String propertyName, int defaultValue) {
         String value = properties.getProperty(propertyName);
         int result = NumberUtils.parseInteger(value, defaultValue);
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyName + "=" + result);
         }
         return result;
@@ -758,7 +757,7 @@ public DumpType readDumpType(String propertyName, DumpType defaultDump) {
         } catch (IllegalArgumentException e) {
             result = defaultDump;
         }
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyName + "=" + result);
         }
         return result;
@@ -768,7 +767,7 @@ public DumpType readDumpType(String propertyName, DumpType defaultDump) {
     public long readLong(String propertyName, long defaultValue) {
         String value = properties.getProperty(propertyName);
         long result = NumberUtils.parseLong(value, defaultValue);
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyName + "=" + result);
         }
         return result;
@@ -788,7 +787,7 @@ public List<String> readList(String propertyName) {
     public boolean readBoolean(String propertyName, boolean defaultValue) {
         String value = properties.getProperty(propertyName, Boolean.toString(defaultValue));
         boolean result = Boolean.parseBoolean(value);
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyName + "=" + result);
         }
         return result;
@@ -808,7 +807,7 @@ public Map<String, String> readPattern(String propertyNamePatternRegex) {
             }
         }
 
-        if (logger.isLoggable(Level.INFO)) {
+        if (logger.isInfoEnabled()) {
             logger.info(propertyNamePatternRegex + "=" + result);
         }
 

diff --git a/...p-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java b/...p-core/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/LoggingInterceptor.java
@@ -16,46 +16,47 @@
 
 package com.navercorp.pinpoint.bootstrap.interceptor;
 
+import com.navercorp.pinpoint.common.util.logger.CommonLogger;
+import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
+
 import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * @author emeroad
  */
 public class LoggingInterceptor implements StaticAroundInterceptor, AroundInterceptor, AroundInterceptor0, AroundInterceptor1, AroundInterceptor2, AroundInterceptor3, AroundInterceptor4, AroundInterceptor5, ApiIdAwareAroundInterceptor {
 
-    private final Logger logger;
+    private final CommonLogger logger;
 
     public LoggingInterceptor(String loggerName) {
-        this.logger = Logger.getLogger(loggerName);
+        this.logger = StdoutCommonLoggerFactory.INSTANCE.getLogger(loggerName);
     }
 
     @Override
     public void before(Object target, String className, String methodName, String parameterDescription, Object[] args) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("before " + defaultString(target) + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args));
+        if (logger.isTraceEnabled()) {
+            logger.trace("before " + defaultString(target) + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args));
         }
     }
 
     @Override
     public void after(Object target, String className, String methodName, String parameterDescription, Object[] args, Object result, Throwable throwable) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("after " + defaultString(target) + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable);
+        if (logger.isTraceEnabled()) {
+            logger.trace("after " + defaultString(target) + " " + className + "." + methodName + parameterDescription + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable);
         }
     }
 
     @Override
     public void before(Object target, Object[] args) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("before " + defaultString(target) + " args:" + Arrays.toString(args) );
+        if (logger.isTraceEnabled()) {
+            logger.trace("before " + defaultString(target) + " args:" + Arrays.toString(args) );
         }
     }
 
     @Override
     public void after(Object target, Object[] args, Object result, Throwable throwable) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("after " + defaultString(target) + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable);
+        if (logger.isTraceEnabled()) {
+            logger.trace("after " + defaultString(target) + " args:" + Arrays.toString(args) + " result:" + result + " Throwable:" + throwable);
         }
     }
 

diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/logging/JavaLoggerBinder.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/logging/JavaLoggerBinder.java
diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLoggerFactory.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/logging/PLoggerFactory.java
@@ -16,7 +16,9 @@
 
 package com.navercorp.pinpoint.bootstrap.logging;
 
-import java.util.logging.Logger;
+
+import com.navercorp.pinpoint.common.util.logger.CommonLogger;
+import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
 
 /**
  * @author emeroad
@@ -29,8 +31,8 @@ public static void initialize(PLoggerBinder loggerBinder) {
         if (PLoggerFactory.loggerBinder == null) {
             PLoggerFactory.loggerBinder = loggerBinder;
         } else {
-            final Logger logger = Logger.getLogger(PLoggerFactory.class.getName());
-            logger.warning("loggerBinder is not null");
+            final CommonLogger logger = StdoutCommonLoggerFactory.INSTANCE.getLogger(PLoggerFactory.class.getName());
+            logger.warn("loggerBinder is not null");
         }
     }
 

diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtils.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtils.java
@@ -16,9 +16,11 @@
 
 package com.navercorp.pinpoint.bootstrap.util;
 
+import com.navercorp.pinpoint.common.util.logger.CommonLogger;
+import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
+
 import java.net.*;
 import java.util.Enumeration;
-import java.util.logging.Logger;
 
 /**
  * @author emeroad
@@ -46,12 +48,17 @@ public static String getHostIp() {
             final InetAddress thisIp = InetAddress.getLocalHost();
             hostIp = thisIp.getHostAddress();
         } catch (UnknownHostException e) {
-            Logger.getLogger(NetworkUtils.class.getClass().getName()).warning(e.getMessage());
+            CommonLogger logger = getLogger();
+            logger.warn(e.getMessage());
             hostIp = "127.0.0.1";
         }
         return hostIp;
     }
 
+    private static CommonLogger getLogger() {
+        return StdoutCommonLoggerFactory.INSTANCE.getLogger(NetworkUtils.class.getClass().getName());
+    }
+
     @Deprecated
     public static String getMachineName() {
         try {
@@ -76,7 +83,8 @@ public static String getMachineName() {
             }
             return ERROR_HOST_NAME;
         } catch (SocketException e) {
-            Logger.getLogger(NetworkUtils.class.getClass().getName()).warning(e.getMessage());
+            CommonLogger logger = getLogger();
+            logger.warn(e.getMessage());
             return ERROR_HOST_NAME;
         }
     }

diff --git a/...src/main/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelper.java b/...src/main/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelper.java
@@ -15,13 +15,15 @@
  */
 package com.navercorp.pinpoint.bootstrap.util.spring;
 
+import com.navercorp.pinpoint.common.util.logger.CommonLogger;
+import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 
 /**
  * Utility class for working with Strings that have placeholder values in them. A placeholder takes the form
@@ -37,7 +39,7 @@
  */
 public class PropertyPlaceholderHelper {
 
-    private static final Logger logger = Logger.getLogger(PropertyPlaceholderHelper.class.getName());
+    private static final CommonLogger logger = StdoutCommonLoggerFactory.INSTANCE.getLogger(PropertyPlaceholderHelper.class.getName());
 
     private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<String, String>(4);
 
@@ -167,8 +169,8 @@ protected String parseStringValue(
                     // previously resolved placeholder value.
                     propVal = parseStringValue(propVal, placeholderResolver, visitedPlaceholders);
                     buf.replace(startIndex, endIndex + this.placeholderSuffix.length(), propVal);
-                    if (logger.isLoggable(Level.FINE)) {
-                        logger.fine("Resolved placeholder '" + placeholder + "'");
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("Resolved placeholder '" + placeholder + "'");
                     }
                     startIndex = buf.indexOf(this.placeholderPrefix, startIndex + propVal.length());
                 }