From e6a26b5171bb9e7e8046ca4794ec933cb8a20d10 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 12 Mar 2013 04:35:03 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20jdbc=20api=20interceptor=EC=97=90=EC=84=9C=20recordRpc=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C.?= 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@1324 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../interceptor/bci/InstrumentClass.java | 1 - .../interceptor/DriverConnectInterceptor.java | 1 - .../PreparedStatementCreateInterceptor.java | 2 - ...paredStatementExecuteQueryInterceptor.java | 1 - .../StatementExecuteQueryInterceptor.java | 1 - .../StatementExecuteUpdateInterceptor.java | 1 - .../interceptor/TransactionInterceptor.java | 42 +------------------ 7 files changed, 1 insertion(+), 48 deletions(-) diff --git a/src/main/java/com/profiler/interceptor/bci/InstrumentClass.java b/src/main/java/com/profiler/interceptor/bci/InstrumentClass.java index 7b63b7120..e7dad80aa 100644 --- a/src/main/java/com/profiler/interceptor/bci/InstrumentClass.java +++ b/src/main/java/com/profiler/interceptor/bci/InstrumentClass.java @@ -1,6 +1,5 @@ package com.profiler.interceptor.bci; -import javassist.CannotCompileException; import javassist.CtMethod; import com.profiler.interceptor.Interceptor; 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 a194f04e8..5255e0905 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java @@ -74,7 +74,6 @@ public class DriverConnectInterceptor implements StaticAroundInterceptor, ByteCo } trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java index e61612afe..c8edf62eb 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java @@ -48,7 +48,6 @@ public class PreparedStatementCreateInterceptor implements StaticAroundIntercept DatabaseInfo databaseInfo = (DatabaseInfo) getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); @@ -88,7 +87,6 @@ public class PreparedStatementCreateInterceptor implements StaticAroundIntercept } trace.recordApi(descriptor); -// trace.recordApi(apiId); trace.markAfterTime(); trace.traceBlockEnd(); 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 3404c2675..3e1f29321 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java @@ -52,7 +52,6 @@ public class PreparedStatementExecuteQueryInterceptor implements StaticAroundInt DatabaseInfo databaseInfo = (DatabaseInfo) getUrl.invoke(target); trace.recordServiceType(databaseInfo.getExecuteQueryType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); 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 418b01301..6b5f5c7a2 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java @@ -49,7 +49,6 @@ public class StatementExecuteQueryInterceptor implements StaticAroundInterceptor DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getExecuteQueryType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); 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 80fd55806..f2eae3545 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java @@ -50,7 +50,6 @@ public class StatementExecuteUpdateInterceptor implements StaticAroundIntercepto DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); 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 f423bc4de..2205c3c7f 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java @@ -79,7 +79,6 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); @@ -90,31 +89,8 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode private void afterStartTransaction(Trace trace, Connection target, Object[] arg, Object result) { try { trace.recordApi(descriptor, arg); -// trace.recordApi(apiId, arg); trace.recordException(result); -// Boolean autocommit = (Boolean) arg; -// boolean success = InterceptorUtils.isSuccess(result); -// if (!autocommit) { -// // transaction start; -// if (success) { -// trace.recordAttribute("Transaction", "begin"); -// trace.recordApi(descriptor, null); -// } else { -// trace.recordAttribute("Transaction", "begin fail"); -// Throwable th = (Throwable) result; -// trace.recordAttribute("Exception", th.getMessage()); -// } -// -// } else { -// if (success) { -// trace.recordAttribute("Transaction", "autoCommit:false"); -// } else { -// trace.recordAttribute("Transaction", "autoCommit:false fail"); -// Throwable th = (Throwable) result; -// trace.recordAttribute("Exception", th.getMessage()); -// } -// -// } + } catch (Exception e) { if (logger.isLoggable(Level.WARNING)) { logger.log(Level.WARNING, e.getMessage(), e); @@ -132,12 +108,10 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); trace.recordDestinationAddress(databaseInfo.getHost()); -// trace.record(Annotation.ClientSend); } @@ -146,25 +120,14 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); trace.recordDestinationAddress(databaseInfo.getHost()); trace.recordApi(descriptor); -// trace.recordApi(apiId); trace.recordException(result); -// boolean success = InterceptorUtils.isSuccess(result); -// if (success) { -// trace.recordAttribute("Transaction", "commit"); -// } else { -// trace.recordAttribute("Transaction", "commit fail"); -// Throwable th = (Throwable) result; -// trace.recordAttribute("Exception", th.getMessage()); -// } - } catch (Exception e) { if (logger.isLoggable(Level.WARNING)) { logger.log(Level.WARNING, e.getMessage(), e); @@ -183,7 +146,6 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); @@ -196,14 +158,12 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); trace.recordServiceType(databaseInfo.getType()); - trace.recordRpcName(databaseInfo.getUrl()); trace.recordEndPoint(databaseInfo.getUrl()); trace.recordDestinationId(databaseInfo.getDatabaseId()); trace.recordDestinationAddress(databaseInfo.getHost()); trace.recordApi(descriptor); -// trace.recordApi(apiId); trace.recordException(result); // boolean success = InterceptorUtils.isSuccess(result); // if (success) {