diff --git a/build.xml b/build.xml index cacd95ba1..fd971c2c2 100644 --- a/build.xml +++ b/build.xml @@ -10,6 +10,7 @@ + diff --git a/src/main/java/com/profiler/LifeCycleEventListener.java b/src/main/java/com/profiler/LifeCycleEventListener.java index ff5462542..9efc9c43e 100644 --- a/src/main/java/com/profiler/LifeCycleEventListener.java +++ b/src/main/java/com/profiler/LifeCycleEventListener.java @@ -1,12 +1,13 @@ package com.profiler; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; import com.profiler.util.Assert; -import java.util.logging.Logger; public class LifeCycleEventListener { - private final static Logger logger = Logger.getLogger(LifeCycleEventListener.class.getName()); + private final static Logger logger = LoggerFactory.getLogger(LifeCycleEventListener.class.getName()); private Agent agent; private boolean started = false; diff --git a/src/main/java/com/profiler/SystemMonitor.java b/src/main/java/com/profiler/SystemMonitor.java index 4237e7a71..f44c7caf0 100644 --- a/src/main/java/com/profiler/SystemMonitor.java +++ b/src/main/java/com/profiler/SystemMonitor.java @@ -9,12 +9,12 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; -import java.util.logging.Level; -import java.util.logging.Logger; import com.profiler.common.dto.thrift.JVMInfoThriftDTO; import com.profiler.config.ProfilerConfig; import com.profiler.context.TraceContext; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; import com.profiler.sender.DataSender; import com.profiler.util.Assert; import com.sun.management.OperatingSystemMXBean; @@ -27,7 +27,7 @@ import com.sun.management.OperatingSystemMXBean; @SuppressWarnings("restriction") public class SystemMonitor { - private static final Logger logger = Logger.getLogger(SystemMonitor.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(SystemMonitor.class.getName()); private final ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1, new ThreadFactory() { @Override @@ -89,7 +89,7 @@ public class SystemMonitor { dataSender.send(jvmInfo); } catch (Exception e) { - logger.log(Level.INFO, "JvmInfo collect error Cause:" + e.getMessage(), e); + logger.warn("JvmInfo collect error Cause:" + e.getMessage(), e); } } @@ -114,8 +114,8 @@ public class SystemMonitor { jvmInfo.setGc2Time(old.getCollectionTime()); } else { // g1 ? - if (logger.isLoggable(Level.FINE)) { - logger.fine("unknown gc type. gc collector size:" + list.size()); + if (logger.isDebugEnabled()) { + logger.debug("unknown gc type. gc collector size:" + list.size()); } } } diff --git a/src/main/java/com/profiler/TomcatProfiler.java b/src/main/java/com/profiler/TomcatProfiler.java index f97f7f35a..e34cd7da6 100644 --- a/src/main/java/com/profiler/TomcatProfiler.java +++ b/src/main/java/com/profiler/TomcatProfiler.java @@ -4,11 +4,10 @@ import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.Instrumentation; import java.util.Properties; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import com.profiler.common.ServiceType; import com.profiler.config.ProfilerConfig; +import com.profiler.logging.Logger; import com.profiler.logging.LoggerBinder; import com.profiler.logging.LoggerFactory; import com.profiler.interceptor.bci.ByteCodeInstrumentor; @@ -17,8 +16,8 @@ import com.profiler.modifier.ModifierRegistry; public class TomcatProfiler { - private static final Logger logger = Logger.getLogger(TomcatProfiler.class.getName()); - private boolean isFine = logger.isLoggable(Level.FINE); + private static final Logger logger = LoggerFactory.getLogger(TomcatProfiler.class.getName()); + private boolean isFine = logger.isDebugEnabled(); private String agentArgString = ""; @@ -45,30 +44,30 @@ public class TomcatProfiler { com.profiler.logging.Logger tomcatLogger = LoggerFactory.getLogger(TomcatProfiler.class); tomcatLogger.info("LoggerFactory initialize end"); } catch (Exception e) { - logger.log(Level.INFO, "boot class not found", e); + logger.warn("boot class not found", e); } try { ProfilerConfig profilerConfig = null; if (!profilerConfig.isProfileEnable()) { - logger.warning("Profiler Agent not started. profile.enable=" + profilerConfig.isProfileEnable()); + logger.warn("Profiler Agent not started. profile.enable=" + profilerConfig.isProfileEnable()); return; } Agent agent = new DefaultAgent(agentArgs, instrumentation, profilerConfig); // new TomcatProfiler(agentArgs, instrumentation, agent, profilerConfig); } catch (Exception e) { - logger.log(Level.SEVERE, "Profiler Agent start fail. Cause:" + e.getMessage(), e); + logger.error("Profiler Agent start fail. Cause:" + e.getMessage(), e); } } private static void dumpSystemProperties() { - if (logger.isLoggable(Level.FINE)) { + if (logger.isDebugEnabled()) { Properties properties = System.getProperties(); Set strings = properties.stringPropertyNames(); for (String key : strings) { - logger.fine("SystemProperties " + key + "=" + properties.get(key)); + logger.debug("SystemProperties " + key + "=" + properties.get(key)); } } } @@ -104,8 +103,8 @@ public class TomcatProfiler { return null; } - if (logger.isLoggable(Level.INFO)) { - logger.info("CATALINA_HOME=" + catalinaHome); + if (logger.isInfoEnabled()) { + logger.info("CATALINA_HOME={}", catalinaHome); } if (profilerConfig.getServiceType() == ServiceType.BLOC) { diff --git a/src/main/java/com/profiler/context/CallStack.java b/src/main/java/com/profiler/context/CallStack.java index 1e9a9636e..dd5d6c7c0 100644 --- a/src/main/java/com/profiler/context/CallStack.java +++ b/src/main/java/com/profiler/context/CallStack.java @@ -1,7 +1,7 @@ package com.profiler.context; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; /** * @author netspider @@ -61,11 +61,11 @@ public class CallStack { stack[index] = null; index--; } else { - Logger logger = Logger.getLogger(this.getClass().getName()); - if (logger.isLoggable(Level.WARNING)) { + Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + if (logger.isWarnEnabled()) { // 자체 stack dump 필요. Exception ex = new Exception("Profiler CallStack check. index:" + index); - logger.log(Level.WARNING, "invalid callStack found", ex); + logger.warn("invalid callStack found", ex); } } } diff --git a/src/main/java/com/profiler/context/DefaultTraceContext.java b/src/main/java/com/profiler/context/DefaultTraceContext.java index 550be7bd1..5fc6dde8b 100644 --- a/src/main/java/com/profiler/context/DefaultTraceContext.java +++ b/src/main/java/com/profiler/context/DefaultTraceContext.java @@ -7,6 +7,8 @@ import com.profiler.common.dto.thrift.SqlMetaData; import com.profiler.common.util.ParsingResult; import com.profiler.common.util.SqlParser; import com.profiler.interceptor.MethodDescriptor; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; import com.profiler.metadata.LRUCache; import com.profiler.metadata.Result; import com.profiler.metadata.StringCache; @@ -16,12 +18,10 @@ import com.profiler.util.NamedThreadLocal; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Level; -import java.util.logging.Logger; public class DefaultTraceContext implements TraceContext { - private final Logger logger = Logger.getLogger(DefaultTraceContext.class.getName()); + private final Logger logger = LoggerFactory.getLogger(DefaultTraceContext.class.getName()); private static DefaultTraceContext CONTEXT = new DefaultTraceContext(); @@ -172,9 +172,9 @@ public class DefaultTraceContext implements TraceContext { // 파싱시 변경되지 않았다면 동일 객체를 리턴하므로 그냥 ==비교를 하면 됨 boolean newValue = this.sqlCache.put(normalizedSql); if (newValue) { - if (logger.isLoggable(Level.FINE)) { + if (logger.isDebugEnabled()) { // TODO hit% 로그를 남겨야 문제 발생시 도움이 될듯 하다. - logger.fine("NewSQLParsingResult:" + parsingResult); + logger.debug("NewSQLParsingResult:{}", parsingResult); } // newValue란 의미는 cache에 인입됬다는 의미이고 이는 신규 sql문일 가능성이 있다는 의미임. // 그러므로 메타데이터를 서버로 전송해야 한다. diff --git a/src/main/java/com/profiler/context/TimeBaseStorage.java b/src/main/java/com/profiler/context/TimeBaseStorage.java index 9f5cf57d9..a120679c2 100644 --- a/src/main/java/com/profiler/context/TimeBaseStorage.java +++ b/src/main/java/com/profiler/context/TimeBaseStorage.java @@ -1,10 +1,11 @@ package com.profiler.context; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; import com.profiler.sender.DataSender; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; /** * @@ -78,8 +79,8 @@ public class TimeBaseStorage implements Storage { private boolean addSpanEvent(SpanEvent spanEvent) { if (storage == null) { - Logger logger = Logger.getLogger(this.getClass().getName()); - logger.fine("storage is null. direct send"); + Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + logger.debug("storage is null. direct send"); // 이미 span이 와서 flush된 상황임. return false; } diff --git a/src/main/java/com/profiler/interceptor/bci/ClassLoadChecker.java b/src/main/java/com/profiler/interceptor/bci/ClassLoadChecker.java index 82a76422e..ac3d3398d 100644 --- a/src/main/java/com/profiler/interceptor/bci/ClassLoadChecker.java +++ b/src/main/java/com/profiler/interceptor/bci/ClassLoadChecker.java @@ -1,12 +1,13 @@ package com.profiler.interceptor.bci; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; + import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.logging.Level; -import java.util.logging.Logger; public class ClassLoadChecker { - private final Logger logger = Logger.getLogger(ClassLoadChecker.class.getName()); + private final Logger logger = LoggerFactory.getLogger(ClassLoadChecker.class.getName()); private static final Object EXIST = new Object(); private ConcurrentMap load = new ConcurrentHashMap(); @@ -15,13 +16,13 @@ public class ClassLoadChecker { LoadClass key = new LoadClass(cl, className); Object old = load.putIfAbsent(key, EXIST); if (old == null) { - if (logger.isLoggable(Level.INFO)) { - logger.info(className + " not exist from " + cl); + if (logger.isInfoEnabled()) { + logger.info("{} not exist from ", cl); } return false; } - if (logger.isLoggable(Level.INFO)) { - logger.info(className + " already exist from " + cl); + if (logger.isInfoEnabled()) { + logger.info("{} already exist from ", cl); } return true; } diff --git a/src/main/java/com/profiler/modifier/AbstractModifier.java b/src/main/java/com/profiler/modifier/AbstractModifier.java index 5d95441c9..f2aeb8dd7 100644 --- a/src/main/java/com/profiler/modifier/AbstractModifier.java +++ b/src/main/java/com/profiler/modifier/AbstractModifier.java @@ -1,15 +1,12 @@ package com.profiler.modifier; -import java.util.logging.Level; import com.profiler.logging.Logger; -import com.profiler.DefaultAgent; import com.profiler.common.ServiceType; import com.profiler.interceptor.ServiceTypeSupport; import com.profiler.Agent; import com.profiler.interceptor.Interceptor; -import com.profiler.interceptor.TraceContextSupport; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.logging.LoggerFactory; diff --git a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java index 2b204babe..952e4c20b 100644 --- a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.arcus; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/arcus/BaseOperationModifier.java b/src/main/java/com/profiler/modifier/arcus/BaseOperationModifier.java index 5b7550cfc..fa7f00f66 100644 --- a/src/main/java/com/profiler/modifier/arcus/BaseOperationModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/BaseOperationModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.arcus; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/arcus/CacheManagerModifier.java b/src/main/java/com/profiler/modifier/arcus/CacheManagerModifier.java index ae0b83254..72850c402 100644 --- a/src/main/java/com/profiler/modifier/arcus/CacheManagerModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/CacheManagerModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.arcus; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.logging.LoggerFactory; diff --git a/src/main/java/com/profiler/modifier/arcus/MemcachedClientModifier.java b/src/main/java/com/profiler/modifier/arcus/MemcachedClientModifier.java index 6279695f5..9ea85bced 100644 --- a/src/main/java/com/profiler/modifier/arcus/MemcachedClientModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/MemcachedClientModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.arcus; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/bloc/handler/HTTPHandlerModifier.java b/src/main/java/com/profiler/modifier/bloc/handler/HTTPHandlerModifier.java index 1b145a623..a79090e9e 100644 --- a/src/main/java/com/profiler/modifier/bloc/handler/HTTPHandlerModifier.java +++ b/src/main/java/com/profiler/modifier/bloc/handler/HTTPHandlerModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.bloc.handler; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java index e9fa6949f..798f72239 100644 --- a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java @@ -2,7 +2,6 @@ package com.profiler.modifier.bloc.handler.interceptors; import java.util.Enumeration; import java.util.UUID; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.common.AnnotationKey; diff --git a/src/main/java/com/profiler/modifier/connector/httpclient4/HttpClient4Modifier.java b/src/main/java/com/profiler/modifier/connector/httpclient4/HttpClient4Modifier.java index 1f5a1e577..3cafae552 100644 --- a/src/main/java/com/profiler/modifier/connector/httpclient4/HttpClient4Modifier.java +++ b/src/main/java/com/profiler/modifier/connector/httpclient4/HttpClient4Modifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.connector.httpclient4; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/HttpURLConnectionModifier.java b/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/HttpURLConnectionModifier.java index 1ec9fecea..e1de94a21 100644 --- a/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/HttpURLConnectionModifier.java +++ b/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/HttpURLConnectionModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.connector.jdkhttpconnector; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.interceptor.bci.InstrumentException; diff --git a/src/main/java/com/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java b/src/main/java/com/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java index 43d28dd9d..a0a79d233 100644 --- a/src/main/java/com/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java @@ -12,7 +12,6 @@ import javassist.CtConstructor; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class CubridPreparedStatementModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/cubrid/CubridResultSetModifier.java b/src/main/java/com/profiler/modifier/db/cubrid/CubridResultSetModifier.java index 4540de85c..c2502b53f 100644 --- a/src/main/java/com/profiler/modifier/db/cubrid/CubridResultSetModifier.java +++ b/src/main/java/com/profiler/modifier/db/cubrid/CubridResultSetModifier.java @@ -11,7 +11,6 @@ import com.profiler.modifier.AbstractModifier; import com.profiler.trace.DatabaseRequestTracer; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class CubridResultSetModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/cubrid/CubridStatementModifier.java b/src/main/java/com/profiler/modifier/db/cubrid/CubridStatementModifier.java index 3c4f6a09f..a41846907 100644 --- a/src/main/java/com/profiler/modifier/db/cubrid/CubridStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/cubrid/CubridStatementModifier.java @@ -13,7 +13,6 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class CubridStatementModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/cubrid/CubridUStatementModifier.java b/src/main/java/com/profiler/modifier/db/cubrid/CubridUStatementModifier.java index 31307cf8e..77d3e520e 100644 --- a/src/main/java/com/profiler/modifier/db/cubrid/CubridUStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/cubrid/CubridUStatementModifier.java @@ -11,7 +11,6 @@ import com.profiler.modifier.AbstractModifier; import com.profiler.trace.DatabaseRequestTracer; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class CubridUStatementModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java b/src/main/java/com/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java index 7022ba8d2..788f89015 100644 --- a/src/main/java/com/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java +++ b/src/main/java/com/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java @@ -11,7 +11,6 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class DBCPBasicDataSourceModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/dbcp/DBCPPoolModifier.java b/src/main/java/com/profiler/modifier/db/dbcp/DBCPPoolModifier.java index b50e67f94..3bf287350 100644 --- a/src/main/java/com/profiler/modifier/db/dbcp/DBCPPoolModifier.java +++ b/src/main/java/com/profiler/modifier/db/dbcp/DBCPPoolModifier.java @@ -11,7 +11,6 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class DBCPPoolModifier extends AbstractModifier { diff --git a/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java index ca88134f8..e6c1e3965 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/ConnectionCreateInterceptor.java @@ -2,7 +2,6 @@ package com.profiler.modifier.db.interceptor; import java.sql.Connection; import java.util.Arrays; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.interceptor.StaticAfterInterceptor; diff --git a/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java index b679dd6e8..f2945045f 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java @@ -14,7 +14,6 @@ import com.profiler.modifier.db.JDBCUrlParser; import com.profiler.util.InterceptorUtils; import com.profiler.util.MetaObject; -import java.util.logging.Level; import com.profiler.logging.Logger; /** diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java index af2353890..5fd2f5e34 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java @@ -12,7 +12,6 @@ import com.profiler.util.NumberUtils; import com.profiler.util.bindvalue.BindValueConverter; import java.util.Map; -import java.util.logging.Level; import com.profiler.logging.Logger; public class PreparedStatementBindVariableInterceptor implements StaticAfterInterceptor, TraceContextSupport { diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java index 61df349d6..1b96dc524 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.common.AnnotationKey; diff --git a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java index 319cf3d36..71101855d 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java @@ -12,7 +12,6 @@ import com.profiler.logging.LoggingUtils; import com.profiler.modifier.db.DatabaseInfo; import com.profiler.util.MetaObject; -import java.util.logging.Level; import com.profiler.logging.Logger; /** diff --git a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java index f3071cf26..231ec18e1 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java @@ -12,7 +12,6 @@ import com.profiler.logging.LoggingUtils; import com.profiler.modifier.db.DatabaseInfo; import com.profiler.util.MetaObject; -import java.util.logging.Level; import com.profiler.logging.Logger; /** diff --git a/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java index 0c23b583b..c412c5b7b 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java @@ -1,7 +1,6 @@ package com.profiler.modifier.db.interceptor; import java.sql.Connection; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.context.Trace; diff --git a/src/main/java/com/profiler/modifier/db/mssql/MSSQLConnectionModifier.java b/src/main/java/com/profiler/modifier/db/mssql/MSSQLConnectionModifier.java index 94b054dd7..3f1009a51 100644 --- a/src/main/java/com/profiler/modifier/db/mssql/MSSQLConnectionModifier.java +++ b/src/main/java/com/profiler/modifier/db/mssql/MSSQLConnectionModifier.java @@ -11,13 +11,11 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; -import com.profiler.logging.LoggerFactory; public class MSSQLConnectionModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MSSQLConnectionModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MSSQLConnectionModifier.class); public MSSQLConnectionModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mssql/MSSQLPreparedStatementModifier.java b/src/main/java/com/profiler/modifier/db/mssql/MSSQLPreparedStatementModifier.java index 0bf9f4e73..54362095c 100644 --- a/src/main/java/com/profiler/modifier/db/mssql/MSSQLPreparedStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mssql/MSSQLPreparedStatementModifier.java @@ -12,12 +12,11 @@ import javassist.CtConstructor; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class MSSQLPreparedStatementModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MSSQLPreparedStatementModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MSSQLPreparedStatementModifier.class); public MSSQLPreparedStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mssql/MSSQLResultSetModifier.java b/src/main/java/com/profiler/modifier/db/mssql/MSSQLResultSetModifier.java index f081223f7..18825ee3c 100644 --- a/src/main/java/com/profiler/modifier/db/mssql/MSSQLResultSetModifier.java +++ b/src/main/java/com/profiler/modifier/db/mssql/MSSQLResultSetModifier.java @@ -12,12 +12,11 @@ import com.profiler.modifier.AbstractModifier; import com.profiler.trace.DatabaseRequestTracer; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class MSSQLResultSetModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MSSQLResultSetModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MSSQLResultSetModifier.class); public MSSQLResultSetModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mssql/MSSQLStatementModifier.java b/src/main/java/com/profiler/modifier/db/mssql/MSSQLStatementModifier.java index 4ac8e1ecf..27e94b29d 100644 --- a/src/main/java/com/profiler/modifier/db/mssql/MSSQLStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mssql/MSSQLStatementModifier.java @@ -10,12 +10,10 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; -import com.profiler.logging.LoggerFactory; public class MSSQLStatementModifier extends AbstractModifier { - private static final Logger logger = LoggerFactory.getLogger(MSSQLStatementModifier.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(MSSQLStatementModifier.class); public MSSQLStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java index 21851c54e..4d345a642 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java @@ -11,13 +11,12 @@ import com.profiler.modifier.db.interceptor.*; import com.profiler.modifier.AbstractModifier; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; public class MySQLConnectionImplModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLConnectionImplModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLConnectionImplModifier.class); public MySQLConnectionImplModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java index e84133e29..28ab9c74a 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java @@ -10,7 +10,6 @@ import com.profiler.modifier.AbstractModifier; import com.profiler.modifier.db.interceptor.*; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; @@ -19,7 +18,7 @@ import com.profiler.logging.LoggerFactory; */ public class MySQLNonRegisteringDriverModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLConnectionImplModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLConnectionImplModifier.class); public MySQLNonRegisteringDriverModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java index f50771414..1faa19aa8 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java @@ -14,13 +14,12 @@ import com.profiler.util.*; import java.lang.reflect.Method; import java.security.ProtectionDomain; import java.util.List; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; public class MySQLPreparedStatementJDBC4Modifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLPreparedStatementJDBC4Modifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLPreparedStatementJDBC4Modifier.class); private final String[] includes = new String[]{"setRowId", "setNClob", "setSQLXML"}; public MySQLPreparedStatementJDBC4Modifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java index 32259aad2..35e34aa07 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java @@ -21,12 +21,11 @@ import javassist.CtConstructor; import java.lang.reflect.Method; import java.security.ProtectionDomain; import java.util.List; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; public class MySQLPreparedStatementModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLPreparedStatementModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLPreparedStatementModifier.class); private final String[] excludes = new String[]{"setRowId", "setNClob", "setSQLXML"}; public MySQLPreparedStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLResultSetModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLResultSetModifier.java index 1916cfcba..a7565c393 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLResultSetModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLResultSetModifier.java @@ -7,14 +7,13 @@ import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.modifier.AbstractModifier; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; // TODO 추가 개발해야 될듯. public class MySQLResultSetModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLResultSetModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLResultSetModifier.class); public MySQLResultSetModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java b/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java index 5753c6979..13a0e8623 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java @@ -1,7 +1,6 @@ package com.profiler.modifier.db.mysql; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; @@ -17,7 +16,7 @@ import com.profiler.modifier.AbstractModifier; public class MySQLStatementModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MySQLStatementModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MySQLStatementModifier.class); public MySQLStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/oracle/OraclePreparedStatementModifier.java b/src/main/java/com/profiler/modifier/db/oracle/OraclePreparedStatementModifier.java index 906f318ba..e14c00757 100644 --- a/src/main/java/com/profiler/modifier/db/oracle/OraclePreparedStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/oracle/OraclePreparedStatementModifier.java @@ -12,12 +12,11 @@ import javassist.CtConstructor; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class OraclePreparedStatementModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(OraclePreparedStatementModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(OraclePreparedStatementModifier.class); public OraclePreparedStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/oracle/OracleResultSetModifier.java b/src/main/java/com/profiler/modifier/db/oracle/OracleResultSetModifier.java index 0f8f3e4b2..df1cadce0 100644 --- a/src/main/java/com/profiler/modifier/db/oracle/OracleResultSetModifier.java +++ b/src/main/java/com/profiler/modifier/db/oracle/OracleResultSetModifier.java @@ -11,12 +11,11 @@ import com.profiler.modifier.AbstractModifier; import com.profiler.trace.DatabaseRequestTracer; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class OracleResultSetModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(OracleResultSetModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(OracleResultSetModifier.class); public OracleResultSetModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/db/oracle/OracleStatementModifier.java b/src/main/java/com/profiler/modifier/db/oracle/OracleStatementModifier.java index 4c23fbd13..6e554bf32 100644 --- a/src/main/java/com/profiler/modifier/db/oracle/OracleStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/oracle/OracleStatementModifier.java @@ -1,7 +1,6 @@ package com.profiler.modifier.db.oracle; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.config.ProfilerConstant; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.logging.LoggerFactory; @@ -11,11 +10,10 @@ import javassist.CtClass; import javassist.CtMethod; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; public class OracleStatementModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(OracleStatementModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(OracleStatementModifier.class); public OracleStatementModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/method/MethodModifier.java b/src/main/java/com/profiler/modifier/method/MethodModifier.java index 14b844eab..0e5feb607 100644 --- a/src/main/java/com/profiler/modifier/method/MethodModifier.java +++ b/src/main/java/com/profiler/modifier/method/MethodModifier.java @@ -2,12 +2,10 @@ package com.profiler.modifier.method; import java.security.ProtectionDomain; import java.util.Arrays; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import javassist.CtClass; import javassist.CtMethod; @@ -23,7 +21,7 @@ import com.profiler.modifier.AbstractModifier; */ public class MethodModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(MethodModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(MethodModifier.class); public MethodModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/servlet/FilterModifier.java b/src/main/java/com/profiler/modifier/servlet/FilterModifier.java index 4575e27a3..09fbeba9e 100644 --- a/src/main/java/com/profiler/modifier/servlet/FilterModifier.java +++ b/src/main/java/com/profiler/modifier/servlet/FilterModifier.java @@ -1,11 +1,9 @@ package com.profiler.modifier.servlet; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/servlet/HttpServletModifier.java b/src/main/java/com/profiler/modifier/servlet/HttpServletModifier.java index a75466550..333dd43d3 100644 --- a/src/main/java/com/profiler/modifier/servlet/HttpServletModifier.java +++ b/src/main/java/com/profiler/modifier/servlet/HttpServletModifier.java @@ -1,12 +1,10 @@ package com.profiler.modifier.servlet; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; @@ -20,7 +18,7 @@ import com.profiler.modifier.AbstractModifier; */ public class HttpServletModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(HttpServletModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(HttpServletModifier.class); public HttpServletModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java b/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java index 907f438a8..46c893e2d 100644 --- a/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java +++ b/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java @@ -1,7 +1,6 @@ package com.profiler.modifier.servlet; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; @@ -21,7 +20,7 @@ import com.profiler.modifier.AbstractModifier; */ public class SpringFrameworkServletModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(SpringFrameworkServletModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(SpringFrameworkServletModifier.class); public SpringFrameworkServletModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java b/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java index f50a81967..3a5e4a317 100644 --- a/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java +++ b/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java @@ -2,7 +2,6 @@ package com.profiler.modifier.servlet.interceptors; import java.util.Enumeration; import java.util.UUID; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; @@ -20,7 +19,7 @@ import com.profiler.util.NumberUtils; public class DoXXXInterceptor implements StaticAroundInterceptor, ByteCodeMethodDescriptorSupport, TraceContextSupport { - private final Logger logger = LoggerFactory.getLogger(DoXXXInterceptor.class.getName()); + private final Logger logger = LoggerFactory.getLogger(DoXXXInterceptor.class); private final boolean isDebug = logger.isDebugEnabled(); private MethodDescriptor descriptor; diff --git a/src/main/java/com/profiler/modifier/tomcat/CatalinaModifier.java b/src/main/java/com/profiler/modifier/tomcat/CatalinaModifier.java index 51f25a0f9..5ad514ddf 100644 --- a/src/main/java/com/profiler/modifier/tomcat/CatalinaModifier.java +++ b/src/main/java/com/profiler/modifier/tomcat/CatalinaModifier.java @@ -1,12 +1,10 @@ package com.profiler.modifier.tomcat; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.modifier.AbstractModifier; @@ -19,7 +17,7 @@ import com.profiler.modifier.tomcat.interceptors.CatalinaAwaitInterceptor; */ public class CatalinaModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(CatalinaModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(CatalinaModifier.class); public CatalinaModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/tomcat/StandardHostValveInvokeModifier.java b/src/main/java/com/profiler/modifier/tomcat/StandardHostValveInvokeModifier.java index 54d7bfe5a..e23d13a3c 100644 --- a/src/main/java/com/profiler/modifier/tomcat/StandardHostValveInvokeModifier.java +++ b/src/main/java/com/profiler/modifier/tomcat/StandardHostValveInvokeModifier.java @@ -1,12 +1,10 @@ package com.profiler.modifier.tomcat; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; diff --git a/src/main/java/com/profiler/modifier/tomcat/TomcatConnectorModifier.java b/src/main/java/com/profiler/modifier/tomcat/TomcatConnectorModifier.java index d74ba6300..c4935653f 100644 --- a/src/main/java/com/profiler/modifier/tomcat/TomcatConnectorModifier.java +++ b/src/main/java/com/profiler/modifier/tomcat/TomcatConnectorModifier.java @@ -1,12 +1,10 @@ package com.profiler.modifier.tomcat; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; @@ -19,7 +17,7 @@ import com.profiler.modifier.AbstractModifier; */ public class TomcatConnectorModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(TomcatConnectorModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(TomcatConnectorModifier.class); public TomcatConnectorModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { super(byteCodeInstrumentor, agent); diff --git a/src/main/java/com/profiler/modifier/tomcat/TomcatStandardServiceModifier.java b/src/main/java/com/profiler/modifier/tomcat/TomcatStandardServiceModifier.java index 9fc82cd5b..029d9f9e8 100644 --- a/src/main/java/com/profiler/modifier/tomcat/TomcatStandardServiceModifier.java +++ b/src/main/java/com/profiler/modifier/tomcat/TomcatStandardServiceModifier.java @@ -1,12 +1,10 @@ package com.profiler.modifier.tomcat; import java.security.ProtectionDomain; -import java.util.logging.Level; import com.profiler.logging.Logger; import com.profiler.logging.LoggerFactory; import com.profiler.Agent; -import com.profiler.DefaultAgent; import com.profiler.LifeCycleEventListener; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; @@ -24,7 +22,7 @@ import com.profiler.modifier.AbstractModifier; */ public class TomcatStandardServiceModifier extends AbstractModifier { - private final Logger logger = LoggerFactory.getLogger(TomcatStandardServiceModifier.class.getName()); + private final Logger logger = LoggerFactory.getLogger(TomcatStandardServiceModifier.class); public TomcatStandardServiceModifier(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent) { diff --git a/src/main/java/com/profiler/sender/LoggingDataSender.java b/src/main/java/com/profiler/sender/LoggingDataSender.java index 2c37d3d58..3a9afca7b 100644 --- a/src/main/java/com/profiler/sender/LoggingDataSender.java +++ b/src/main/java/com/profiler/sender/LoggingDataSender.java @@ -1,16 +1,17 @@ package com.profiler.sender; import com.profiler.context.Thriftable; +import com.profiler.logging.Logger; +import com.profiler.logging.LoggerFactory; import org.apache.thrift.TBase; -import java.util.logging.Logger; /** * */ public class LoggingDataSender implements DataSender { - private static final Logger logger = Logger.getLogger(LoggingDataSender.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(LoggingDataSender.class.getName()); public static final DataSender DEFAULT_LOGGING_DATA_SENDER = new LoggingDataSender(); @Override