diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CloseConnectionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java similarity index 92% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/CloseConnectionInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java index fbde17e8d..3df732e05 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CloseConnectionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/CloseConnectionInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.interceptor.StaticBeforeInterceptor; import com.profiler.util.MetaObject; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateConnectionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java similarity index 92% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateConnectionInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java index d9df41e78..b4b3253eb 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateConnectionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/CreateConnectionInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import java.sql.Connection; import java.util.Arrays; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreatePreparedStatementInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java similarity index 94% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/CreatePreparedStatementInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java index e81bf66f2..dfba82835 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreatePreparedStatementInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/CreatePreparedStatementInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.context.Trace; import com.profiler.interceptor.StaticAfterInterceptor; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateStatementInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java similarity index 93% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateStatementInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java index 6218a38ba..715f59af8 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/CreateStatementInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/CreateStatementInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.context.Trace; import com.profiler.interceptor.StaticAfterInterceptor; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteQueryMethodInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java similarity index 97% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteQueryMethodInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java index a3149b0e5..6b8c6513c 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteQueryMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/ExecuteQueryMethodInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.StopWatch; import com.profiler.context.Annotation; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteUpdateMethodInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/ExecuteUpdateMethodInterceptor.java similarity index 97% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteUpdateMethodInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/ExecuteUpdateMethodInterceptor.java index 5b1b41659..87d01750a 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/ExecuteUpdateMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/ExecuteUpdateMethodInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.StopWatch; import com.profiler.context.Annotation; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementBindVariableInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java similarity index 91% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementBindVariableInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java index 66b20d4d6..67394b300 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementBindVariableInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementBindVariableInterceptor.java @@ -1,6 +1,5 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; -import com.nhncorp.lucy.net.util.ConverterUtil; import com.profiler.context.Trace; import com.profiler.interceptor.StaticAfterInterceptor; import com.profiler.util.MetaObject; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementMethodInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementMethodInterceptor.java similarity index 96% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementMethodInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementMethodInterceptor.java index 047df91ee..3fb4ec21f 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/PreparedStatementMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementMethodInterceptor.java @@ -1,4 +1,4 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.context.Annotation; import com.profiler.context.Trace; diff --git a/src/main/java/com/profiler/modifier/db/mysql/interceptors/TransactionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java similarity index 96% rename from src/main/java/com/profiler/modifier/db/mysql/interceptors/TransactionInterceptor.java rename to src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java index 84e014819..66b88ee7d 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/interceptors/TransactionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java @@ -1,9 +1,8 @@ -package com.profiler.modifier.db.mysql.interceptors; +package com.profiler.modifier.db.interceptor; import com.profiler.context.Annotation; import com.profiler.context.Trace; import com.profiler.interceptor.StaticAroundInterceptor; -import com.profiler.modifier.db.ConnectionTrace; import com.profiler.util.InterceptorUtils; import com.profiler.util.MetaObject; import com.profiler.util.StringUtils; 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 2b7c681fc..e4119efda 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java @@ -4,13 +4,9 @@ import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.interceptor.bci.InstrumentException; -import com.profiler.modifier.db.mysql.interceptors.*; -import javassist.CtClass; -import javassist.CtMethod; +import com.profiler.modifier.db.interceptor.*; -import com.profiler.config.TomcatProfilerConstant; import com.profiler.modifier.AbstractModifier; -import com.profiler.trace.DatabaseRequestTracer; import java.security.ProtectionDomain; import java.util.logging.Level; @@ -40,7 +36,7 @@ public class MySQLConnectionImplModifier extends AbstractModifier { mysqlConnection.addTraceVariable("__url", "__setUrl", "__getUrl", "java.lang.String"); // 해당 Interceptor를 공통클래스 만들경우 system에 로드해야 된다. -// Interceptor createConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.CreateConnectionInterceptor"); +// Interceptor createConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreateConnectionInterceptor"); Interceptor createConnection = new CreateConnectionInterceptor(); String[] params = new String[] { "java.lang.String", "int", "java.util.Properties", "java.lang.String", "java.lang.String" @@ -48,17 +44,17 @@ public class MySQLConnectionImplModifier extends AbstractModifier { mysqlConnection.addInterceptor("getInstance", params, createConnection); -// Interceptor closeConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.CloseConnectionInterceptor"); +// Interceptor closeConnection = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CloseConnectionInterceptor"); Interceptor closeConnection = new CloseConnectionInterceptor(); mysqlConnection.addInterceptor("close", null, closeConnection); -// Interceptor createStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.CreateStatementInterceptor"); +// Interceptor createStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreateStatementInterceptor"); Interceptor createStatement = new CreateStatementInterceptor(); mysqlConnection.addInterceptor("createStatement", null, createStatement); -// Interceptor preparedStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.CreatePreparedStatementInterceptor"); +// Interceptor preparedStatement = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.CreatePreparedStatementInterceptor"); Interceptor preparedStatement = new CreatePreparedStatementInterceptor(); mysqlConnection.addInterceptor("prepareStatement", new String[]{"java.lang.String"}, preparedStatement); 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 1faa8230c..cd1817285 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java @@ -6,7 +6,7 @@ import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.interceptor.bci.InstrumentException; import com.profiler.interceptor.bci.NotFoundInstrumentException; import com.profiler.modifier.AbstractModifier; -import com.profiler.modifier.db.mysql.interceptors.PreparedStatementBindVariableInterceptor; +import com.profiler.modifier.db.interceptor.PreparedStatementBindVariableInterceptor; import com.profiler.util.*; import java.lang.reflect.Method; @@ -51,7 +51,7 @@ public class MySQLPreparedStatementJDBC4Modifier extends AbstractModifier { private void bindVariableIntercept(InstrumentClass preparedStatement, ClassLoader classLoader, ProtectionDomain protectedDomain) throws InstrumentException { BindVariableFilter exclude = new IncludeBindVariableFilter(includes); List bindMethod = PreparedStatementUtils.findBindVariableSetMethod(exclude); -// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.PreparedStatementBindVariableInterceptor"); +// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.PreparedStatementBindVariableInterceptor"); Interceptor interceptor = new PreparedStatementBindVariableInterceptor(); for (Method method : bindMethod) { String methodName = method.getName(); 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 4c6a73fac..5757eb9be 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java @@ -2,18 +2,14 @@ package com.profiler.modifier.db.mysql; import java.lang.reflect.Method; import java.security.ProtectionDomain; -import java.sql.Connection; -import java.sql.SQLException; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListSet; import java.util.logging.Level; import java.util.logging.Logger; import com.profiler.interceptor.bci.InstrumentException; import com.profiler.interceptor.bci.NotFoundInstrumentException; -import com.profiler.modifier.db.mysql.interceptors.PreparedStatementBindVariableInterceptor; -import com.profiler.modifier.db.mysql.interceptors.PreparedStatementMethodInterceptor; +import com.profiler.modifier.db.interceptor.PreparedStatementMethodInterceptor; +import com.profiler.modifier.db.interceptor.PreparedStatementBindVariableInterceptor; import com.profiler.util.ExcludeBindVariableFilter; import com.profiler.util.JavaAssistUtils; import com.profiler.util.PreparedStatementUtils; @@ -50,7 +46,7 @@ public class MySQLPreparedStatementModifier extends AbstractModifier { checkLibrary(classLoader, javassistClassName); try { InstrumentClass preparedStatement = byteCodeInstrumentor.getClass(javassistClassName); -// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.PreparedStatementMethodInterceptor"); +// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.PreparedStatementMethodInterceptor"); Interceptor interceptor = new PreparedStatementMethodInterceptor(); preparedStatement.addInterceptor("executeQuery", null, interceptor); @@ -85,7 +81,7 @@ public class MySQLPreparedStatementModifier extends AbstractModifier { private void bindVariableIntercept(InstrumentClass preparedStatement, ClassLoader classLoader, ProtectionDomain protectedDomain) throws InstrumentException { ExcludeBindVariableFilter exclude = new ExcludeBindVariableFilter(excludes); List bindMethod = PreparedStatementUtils.findBindVariableSetMethod(exclude); -// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.PreparedStatementBindVariableInterceptor"); +// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.PreparedStatementBindVariableInterceptor"); Interceptor interceptor = new PreparedStatementBindVariableInterceptor(); for (Method method : bindMethod) { String methodName = method.getName(); 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 15d1ca7b4..34e8eea8c 100644 --- a/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java +++ b/src/main/java/com/profiler/modifier/db/mysql/MySQLStatementModifier.java @@ -1,20 +1,16 @@ package com.profiler.modifier.db.mysql; import java.security.ProtectionDomain; -import java.sql.Connection; import java.util.logging.Level; import java.util.logging.Logger; import com.profiler.interceptor.Interceptor; import com.profiler.interceptor.bci.InstrumentException; -import com.profiler.interceptor.bci.JavaAssistClass; -import com.profiler.modifier.db.mysql.interceptors.ExecuteQueryMethodInterceptor; -import javassist.*; +import com.profiler.modifier.db.interceptor.ExecuteQueryMethodInterceptor; import com.profiler.interceptor.bci.ByteCodeInstrumentor; import com.profiler.interceptor.bci.InstrumentClass; import com.profiler.modifier.AbstractModifier; -import javassist.bytecode.AccessFlag; public class MySQLStatementModifier extends AbstractModifier { @@ -37,12 +33,12 @@ public class MySQLStatementModifier extends AbstractModifier { try { InstrumentClass statementClass = byteCodeInstrumentor.getClass(javassistClassName); -// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.ExecuteQueryMethodInterceptor"); +// Interceptor interceptor = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.ExecuteQueryMethodInterceptor"); Interceptor interceptor = new ExecuteQueryMethodInterceptor(); statementClass.addInterceptor("executeQuery", new String[]{"java.lang.String"}, interceptor); - Interceptor interceptor1 = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.mysql.interceptors.ExecuteUpdateMethodInterceptor"); + Interceptor interceptor1 = newInterceptor(classLoader, protectedDomain, "com.profiler.modifier.db.interceptor.ExecuteUpdateMethodInterceptor"); statementClass.addInterceptor("executeUpdate", new String[]{"java.lang.String", "boolean", "boolean"}, interceptor1); statementClass.addTraceVariable("__url", "__setUrl", "__getUrl", "java.lang.String");