From 5658e91aadb883faad3f6ba4f192258bb98571ff Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 24 Sep 2013 10:25:39 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20Datasource=20api=EC=A4=91=EC=97=90=EC=84=9C=20username,=20pa?= =?UTF-8?q?ss=EA=B0=80=20=EB=93=A4=EC=96=B4=EA=B0=80=EB=8A=94=20api?= =?UTF-8?q?=EB=8F=84=20=EC=B6=94=EA=B0=80=ED=95=A8.=20log=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@2346 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../modifier/db/cubrid/CubridConnectionModifier.java | 2 +- .../modifier/db/cubrid/CubridDriverModifier.java | 2 +- .../db/cubrid/CubridPreparedStatementModifier.java | 4 ++-- .../modifier/db/cubrid/CubridResultSetModifier.java | 2 +- .../modifier/db/cubrid/CubridStatementModifier.java | 2 +- .../modifier/db/cubrid/CubridUStatementModifier.java | 2 +- .../modifier/db/dbcp/DBCPBasicDataSourceModifier.java | 11 +++++++---- .../DataSourceGetConnectionInterceptor.java | 7 ++++++- .../db/mysql/MySQLConnectionImplModifier.java | 2 +- .../modifier/db/mysql/MySQLConnectionModifier.java | 2 +- .../db/mysql/MySQLNonRegisteringDriverModifier.java | 2 +- .../db/mysql/MySQLPreparedStatementJDBC4Modifier.java | 2 +- .../db/mysql/MySQLPreparedStatementModifier.java | 4 ++-- .../modifier/db/mysql/MySQLStatementModifier.java | 2 +- .../OraclePreparedStatementWrapperModifier.java | 2 +- .../profiler/modifier/method/MethodModifier.java | 4 ++-- .../modifier/servlet/HttpServletModifier.java | 2 +- .../servlet/SpringFrameworkServletModifier.java | 2 +- 18 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridConnectionModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridConnectionModifier.java index b5fc0af8c..79f492b26 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridConnectionModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridConnectionModifier.java @@ -61,7 +61,7 @@ public class CubridConnectionModifier extends AbstractModifier { return cubridConnection.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridDriverModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridDriverModifier.java index ff71adde9..5aa3aeba7 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridDriverModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridDriverModifier.java @@ -40,7 +40,7 @@ public class CubridDriverModifier extends AbstractModifier { return mysqlConnection.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java index c3559bb67..84cc19a31 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridPreparedStatementModifier.java @@ -54,7 +54,7 @@ public class CubridPreparedStatementModifier extends AbstractModifier { return preparedStatementClass.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } @@ -78,7 +78,7 @@ public class CubridPreparedStatementModifier extends AbstractModifier { } catch (NotFoundInstrumentException e) { // bind variable setter메소드를 못찾을 경우는 그냥 경고만 표시, 에러 아님. if (logger.isTraceEnabled()) { - logger.trace("bindVariable api not found. Cause:" + e.getMessage(), e); + logger.trace("bindVariable api not found. Cause:{}", e.getMessage(), e); } } } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridResultSetModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridResultSetModifier.java index af74c7fb3..fbe0f5fa5 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridResultSetModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridResultSetModifier.java @@ -35,7 +35,7 @@ public class CubridResultSetModifier extends AbstractModifier { return resultSetClass.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridStatementModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridStatementModifier.java index 883a4441b..97253b0c5 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridStatementModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridStatementModifier.java @@ -52,7 +52,7 @@ public class CubridStatementModifier extends AbstractModifier { return statementClass.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridUStatementModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridUStatementModifier.java index c5a482ee6..46cb68887 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridUStatementModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/cubrid/CubridUStatementModifier.java @@ -33,7 +33,7 @@ public class CubridUStatementModifier extends AbstractModifier { return ustatementClass.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java index 30d9ed86c..b75f0d34c 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/dbcp/DBCPBasicDataSourceModifier.java @@ -7,7 +7,6 @@ import com.nhn.pinpoint.profiler.interceptor.bci.InstrumentClass; import com.nhn.pinpoint.profiler.interceptor.bci.InstrumentException; import com.nhn.pinpoint.profiler.modifier.AbstractModifier; import com.nhn.pinpoint.profiler.modifier.db.interceptor.DataSourceGetConnectionInterceptor; -import javassist.CtClass; import java.security.ProtectionDomain; @@ -34,13 +33,17 @@ public class DBCPBasicDataSourceModifier extends AbstractModifier { try { InstrumentClass basicDataSource = byteCodeInstrumentor.getClass(javassistClassName); - Interceptor interceptor = new DataSourceGetConnectionInterceptor(); - basicDataSource.addInterceptor("getConnection", null, interceptor); + Interceptor interceptor1 = new DataSourceGetConnectionInterceptor(); + basicDataSource.addInterceptor("getConnection", null, interceptor1); + + Interceptor interceptor2 = new DataSourceGetConnectionInterceptor(); + basicDataSource.addInterceptor("getConnection", new String[] {"java.lang.String", "java.lang.String"}, interceptor2); + return basicDataSource.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/interceptor/DataSourceGetConnectionInterceptor.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/interceptor/DataSourceGetConnectionInterceptor.java index 54ab58959..65339b991 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/interceptor/DataSourceGetConnectionInterceptor.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/interceptor/DataSourceGetConnectionInterceptor.java @@ -51,7 +51,12 @@ public class DataSourceGetConnectionInterceptor implements SimpleAroundIntercept } try { trace.recordServiceType(ServiceType.DBCP); - trace.recordApi(descriptor, null); + if (args.length == 2) { +// args[1]은 패스워드라서 뺀다. + trace.recordApi(descriptor, new Object[] {args[0]}); + } else { + trace.recordApi(descriptor, null); + } trace.recordException(result); trace.markAfterTime(); diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java index 42047cbd6..2fda3cc0e 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionImplModifier.java @@ -77,7 +77,7 @@ public class MySQLConnectionImplModifier extends AbstractModifier { return mysqlConnection.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionModifier.java index c1d2d305a..c98d651f2 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLConnectionModifier.java @@ -84,7 +84,7 @@ public class MySQLConnectionModifier extends AbstractModifier { return mysqlConnection.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java index fb6ba11b1..68eccc6f7 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLNonRegisteringDriverModifier.java @@ -50,7 +50,7 @@ public class MySQLNonRegisteringDriverModifier extends AbstractModifier { return mysqlConnection.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java index a5cbf903b..47045d106 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementJDBC4Modifier.java @@ -43,7 +43,7 @@ public class MySQLPreparedStatementJDBC4Modifier extends AbstractModifier { return preparedStatement.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java index e2eca1ea0..db004a531 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLPreparedStatementModifier.java @@ -59,7 +59,7 @@ public class MySQLPreparedStatementModifier extends AbstractModifier { return preparedStatement.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } @@ -95,7 +95,7 @@ public class MySQLPreparedStatementModifier extends AbstractModifier { } catch (NotFoundInstrumentException e) { // bind variable setter메소드를 못찾을 경우는 그냥 경고만 표시, 에러 아님. if (logger.isTraceEnabled()) { - logger.trace("bindVariable api not found. Cause:" + e.getMessage(), e); + logger.trace("bindVariable api not found. Cause:{}", e.getMessage(), e); } } } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLStatementModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLStatementModifier.java index 0997f970a..cd9db366a 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLStatementModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/mysql/MySQLStatementModifier.java @@ -52,7 +52,7 @@ public class MySQLStatementModifier extends AbstractModifier { return statementClass.toBytecode(); } catch (InstrumentException e) { if (logger.isWarnEnabled()) { - logger.warn(this.getClass().getSimpleName() + " modify fail. Cause:" + e.getMessage(), e); + logger.warn("{} modify fail. Cause:{}", this.getClass().getSimpleName(), e.getMessage(), e); } return null; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/oracle/OraclePreparedStatementWrapperModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/oracle/OraclePreparedStatementWrapperModifier.java index 0ac0a1eb8..bed2f5589 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/db/oracle/OraclePreparedStatementWrapperModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/db/oracle/OraclePreparedStatementWrapperModifier.java @@ -79,7 +79,7 @@ public class OraclePreparedStatementWrapperModifier extends AbstractModifier { } catch (NotFoundInstrumentException e) { // bind variable setter메소드를 못찾을 경우는 그냥 경고만 표시, 에러 아님. if (logger.isTraceEnabled()) { - logger.trace("bindVariable api not found. Cause:" + e.getMessage(), e); + logger.trace("bindVariable api not found. Cause:{}", e.getMessage(), e); } } } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/method/MethodModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/method/MethodModifier.java index 10aff6b99..04c45fa1b 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/method/MethodModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/method/MethodModifier.java @@ -51,14 +51,14 @@ public class MethodModifier extends AbstractModifier { for (Method method : methodList) { Interceptor interceptor = byteCodeInstrumentor.newInterceptor(classLoader, protectedDomain, "com.nhn.pinpoint.profiler.modifier.method.interceptor.MethodInterceptor"); if (logger.isTraceEnabled()) { - logger.trace("### c=" + javassistClassName + ", m=" + method.getMethodName() + ", params=" + Arrays.toString(method.getMethodParams())); + logger.trace("### c={}, m={}, params={}", javassistClassName, method.getMethodName(), Arrays.toString(method.getMethodParams())); } clazz.addInterceptor(method.getMethodName(), method.getMethodParams(), interceptor); } return clazz.toBytecode(); } catch (Exception e) { - logger.warn("modify fail. Cause:" + e.getMessage(), e); + logger.warn("modify fail. Cause:{}", e.getMessage(), e); return null; } } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/HttpServletModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/HttpServletModifier.java index b7dc80f35..05fe05370 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/HttpServletModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/HttpServletModifier.java @@ -47,7 +47,7 @@ public class HttpServletModifier extends AbstractModifier { return servlet.toBytecode(); } catch (InstrumentException e) { - logger.info("modify fail. Cause:" + e.getMessage(), e); + logger.info("modify fail. Cause:{}", e.getMessage(), e); return null; } } diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/SpringFrameworkServletModifier.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/SpringFrameworkServletModifier.java index cf12da99f..4c6b1d95e 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/SpringFrameworkServletModifier.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/servlet/SpringFrameworkServletModifier.java @@ -53,7 +53,7 @@ public class SpringFrameworkServletModifier extends AbstractModifier { return servlet.toBytecode(); } catch (InstrumentException e) { - logger.warn("modify fail. Cause:" + e.getMessage(), e); + logger.warn("modify fail. Cause:{}", e.getMessage(), e); return null; } }