From c36a0cffaebe5abbddd634958b58d75da2561457 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Wed, 13 Feb 2013 10:20:28 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20AnnotationNames=20->=20AnnotationKey=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD.?= 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@1192 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../java/com/profiler/context/Annotation.java | 13 ++++------ .../java/com/profiler/context/AsyncTrace.java | 8 +++--- src/main/java/com/profiler/context/Trace.java | 26 +++++++++---------- ...seOperationTransitionStateInterceptor.java | 8 +++--- .../ExecuteMethodInterceptor.java | 6 ++--- .../Execute2MethodInterceptor.java | 4 +-- .../ExecuteMethodInterceptor.java | 4 +-- ...paredStatementExecuteQueryInterceptor.java | 5 ++-- .../interceptors/DoXXXInterceptor.java | 6 ++--- .../StandardHostValveInvokeInterceptor.java | 6 ++--- .../java/com/profiler/context/TraceTest.java | 6 ++--- 11 files changed, 44 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/profiler/context/Annotation.java b/src/main/java/com/profiler/context/Annotation.java index 674df5be7..30b02c9c1 100644 --- a/src/main/java/com/profiler/context/Annotation.java +++ b/src/main/java/com/profiler/context/Annotation.java @@ -1,11 +1,8 @@ package com.profiler.context; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.util.AnnotationTranscoder; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author netspider */ @@ -14,22 +11,22 @@ public class Annotation implements Thriftable { private static final AnnotationTranscoder transcoder = new AnnotationTranscoder(); // private final long timestamp; - private final AnnotationNames key; + private final AnnotationKey key; private final Object value; - public Annotation(AnnotationNames key) { + public Annotation(AnnotationKey key) { this.key = key; this.value = null; } - public Annotation(AnnotationNames key, Object value) { + public Annotation(AnnotationKey key, Object value) { this.key = key; this.value = value; } - public AnnotationNames getKey() { + public AnnotationKey getKey() { return this.key; } diff --git a/src/main/java/com/profiler/context/AsyncTrace.java b/src/main/java/com/profiler/context/AsyncTrace.java index 541ffda21..e1b5a359a 100644 --- a/src/main/java/com/profiler/context/AsyncTrace.java +++ b/src/main/java/com/profiler/context/AsyncTrace.java @@ -5,7 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.logging.LoggingUtils; @@ -92,11 +92,11 @@ public class AsyncTrace { } - public void recordAttribute(final AnnotationNames key, final String value) { + public void recordAttribute(final AnnotationKey key, final String value) { recordAttibute(key, (Object) value); } - public void recordAttibute(final AnnotationNames key, final Object value) { + public void recordAttibute(final AnnotationKey key, final Object value) { subSpan.addAnnotation(new Annotation(key, value)); } @@ -112,7 +112,7 @@ public class AsyncTrace { this.subSpan.setEndPoint(endPoint); } - private void annotate(final AnnotationNames key) { + private void annotate(final AnnotationKey key) { this.subSpan.addAnnotation(new Annotation(key)); } diff --git a/src/main/java/com/profiler/context/Trace.java b/src/main/java/com/profiler/context/Trace.java index bfd7887ae..77f821b78 100644 --- a/src/main/java/com/profiler/context/Trace.java +++ b/src/main/java/com/profiler/context/Trace.java @@ -1,6 +1,6 @@ package com.profiler.context; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.common.util.ParsingResult; import com.profiler.interceptor.MethodDescriptor; @@ -196,7 +196,7 @@ public final class Trace { public void recordException(Object result) { if (result instanceof Throwable) { Throwable th = (Throwable) result; - recordAttribute(AnnotationNames.EXCEPTION, th.getMessage()); + recordAttribute(AnnotationKey.EXCEPTION, th.getMessage()); Span span = getCallStack().getSpan(); if (span.getException() == 0) { @@ -210,9 +210,9 @@ public final class Trace { return; } if (methodDescriptor.getApiId() == 0) { - recordAttribute(AnnotationNames.API, methodDescriptor.getFullName()); + recordAttribute(AnnotationKey.API, methodDescriptor.getFullName()); } else { - recordAttribute(AnnotationNames.API_DID, methodDescriptor.getApiId()); + recordAttribute(AnnotationKey.API_DID, methodDescriptor.getApiId()); } } @@ -223,26 +223,26 @@ public final class Trace { } public void recordApi(int apiId) { - recordAttribute(AnnotationNames.API_ID, apiId); + recordAttribute(AnnotationKey.API_ID, apiId); } public void recordApi(int apiId, Object[] args) { - recordAttribute(AnnotationNames.API_ID, apiId); + recordAttribute(AnnotationKey.API_ID, apiId); recocordArgs(args); } private void recocordArgs(Object[] args) { if (args != null) { - int min = Math.min(args.length, AnnotationNames.MAX_ARGS_SIZE); + int min = Math.min(args.length, AnnotationKey.MAX_ARGS_SIZE); for (int i = 0; i < min; i++) { - recordAttribute(AnnotationNames.getArgs(i), args[i]); + recordAttribute(AnnotationKey.getArgs(i), args[i]); } // TODO MAX 사이즈를 넘는건 마크만 해줘야 하나? } } - public void recordAttribute(final AnnotationNames key, final String value) { + public void recordAttribute(final AnnotationKey key, final String value) { recordAttribute(key, (Object) value); } @@ -256,14 +256,14 @@ public final class Trace { } public void recordSqlParsingResult(ParsingResult parsingResult) { - recordAttribute(AnnotationNames.SQL_ID, parsingResult.getSql().hashCode()); + recordAttribute(AnnotationKey.SQL_ID, parsingResult.getSql().hashCode()); String output = parsingResult.getOutput(); if (output != null && output.length() != 0) { - recordAttribute(AnnotationNames.SQL_PARAM, output); + recordAttribute(AnnotationKey.SQL_PARAM, output); } } - public void recordAttribute(final AnnotationNames key, final Object value) { + public void recordAttribute(final AnnotationKey key, final Object value) { // TODO API 단일화 필요. StackFrame currentStackFrame = getCurrentStackFrame(); if (currentStackFrame instanceof RootStackFrame) { @@ -327,7 +327,7 @@ public final class Trace { } } - private void annotate(final AnnotationNames key) { + private void annotate(final AnnotationKey key) { StackFrame currentStackFrame = getCurrentStackFrame(); if (currentStackFrame instanceof RootStackFrame) { Span span = ((RootStackFrame) currentStackFrame).getSpan(); diff --git a/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java b/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java index faa635f15..3f87edb96 100644 --- a/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java +++ b/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java @@ -7,7 +7,7 @@ import java.nio.charset.Charset; import java.util.logging.Level; import java.util.logging.Logger; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.logging.LoggingUtils; import net.spy.memcached.MemcachedNode; import net.spy.memcached.ops.OperationState; @@ -76,7 +76,7 @@ public class BaseOperationTransitionStateInterceptor implements StaticBeforeInte asyncTrace.recordRpcName(svcType, serviceCode, baseOperation.getClass().getSimpleName()); String cmd = getCommand(baseOperation); - asyncTrace.recordAttibute(AnnotationNames.ARCUS_COMMAND, cmd); + asyncTrace.recordAttibute(AnnotationKey.ARCUS_COMMAND, cmd); // TimeObject timeObject = (TimeObject) // asyncTrace.getAttachObject(); @@ -97,7 +97,7 @@ public class BaseOperationTransitionStateInterceptor implements StaticBeforeInte } Exception exception = baseOperation.getException(); if (exception != null) { - asyncTrace.recordAttibute(AnnotationNames.EXCEPTION, InterceptorUtils.exceptionToString(exception)); + asyncTrace.recordAttibute(AnnotationKey.EXCEPTION, InterceptorUtils.exceptionToString(exception)); } if (!baseOperation.isCancelled()) { TimeObject timeObject = (TimeObject) asyncTrace.getAttachObject(); @@ -105,7 +105,7 @@ public class BaseOperationTransitionStateInterceptor implements StaticBeforeInte asyncTrace.markAfterTime(); asyncTrace.traceBlockEnd(); } else { - asyncTrace.recordAttribute(AnnotationNames.EXCEPTION, "cancelled by user"); + asyncTrace.recordAttribute(AnnotationKey.EXCEPTION, "cancelled by user"); TimeObject timeObject = (TimeObject) asyncTrace.getAttachObject(); // asyncTrace.record(Annotation.ClientRecv, timeObject.getCancelTime()); asyncTrace.markAfterTime(); 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 f37e2a78b..e0f4a893b 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 @@ -5,7 +5,7 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.SpanID; @@ -68,9 +68,9 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor, ByteCo trace.markBeforeTime(); trace.recordRpcName(ServiceType.BLOC, traceContext.getApplicationId(), requestURL); trace.recordEndPoint(request.protocol().toString() + ":" + request.serverName().toString() + ":" + request.getServerPort()); - trace.recordAttribute(AnnotationNames.HTTP_URL, request.requestURI().toString()); + trace.recordAttribute(AnnotationKey.HTTP_URL, request.requestURI().toString()); if (parameters != null && parameters.length() > 0) { - trace.recordAttribute(AnnotationNames.HTTP_PARAM, parameters); + trace.recordAttribute(AnnotationKey.HTTP_PARAM, parameters); } } catch (Exception e) { diff --git a/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java index 54296821d..22533db86 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java @@ -3,10 +3,10 @@ package com.profiler.modifier.connector.interceptors; import java.net.URI; import java.util.logging.Logger; +import com.profiler.common.AnnotationKey; import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpUriRequest; -import com.profiler.common.AnnotationNames; import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.Trace; @@ -65,7 +65,7 @@ public class Execute2MethodInterceptor implements StaticAroundInterceptor, ByteC int port = host.getPort(); trace.recordEndPoint(request.getProtocolVersion() + ":" + host.getHostName() + ((port > 0) ? ":" + port : "")); - trace.recordAttribute(AnnotationNames.HTTP_URL, request.getRequestLine().getUri()); + trace.recordAttribute(AnnotationKey.HTTP_URL, request.getRequestLine().getUri()); } @Override diff --git a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java index 6f6a30b61..e2d6b9489 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java @@ -2,10 +2,10 @@ package com.profiler.modifier.connector.interceptors; import java.util.logging.Logger; +import com.profiler.common.AnnotationKey; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; -import com.profiler.common.AnnotationNames; import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.Trace; @@ -66,7 +66,7 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor, ByteCo int port = host.getPort(); trace.recordEndPoint(request.getProtocolVersion() + ":" + host.getHostName() + ((port > 0) ? ":" + port : "")); - trace.recordAttribute(AnnotationNames.HTTP_URL, request.getRequestLine().getUri()); + trace.recordAttribute(AnnotationKey.HTTP_URL, request.getRequestLine().getUri()); } @Override 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 bf58e0185..ab5f98f09 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.util.ParsingResult; import com.profiler.context.Trace; import com.profiler.context.TraceContext; @@ -17,7 +17,6 @@ import com.profiler.interceptor.StaticAroundInterceptor; import com.profiler.logging.LoggingUtils; import com.profiler.modifier.db.util.DatabaseInfo; import com.profiler.util.MetaObject; -import com.profiler.util.StringUtils; public class PreparedStatementExecuteQueryInterceptor implements StaticAroundInterceptor, ByteCodeMethodDescriptorSupport { @@ -59,7 +58,7 @@ public class PreparedStatementExecuteQueryInterceptor implements StaticAroundInt Map bindValue = getBindValue.invoke(target); String bindString = toBindVariable(bindValue); - trace.recordAttribute(AnnotationNames.SQL_BINDVALUE, bindString); + trace.recordAttribute(AnnotationKey.SQL_BINDVALUE, bindString); trace.recordApi(descriptor); // trace.recordApi(apiId); 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 1cc7f49a7..65c351b06 100644 --- a/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java +++ b/src/main/java/com/profiler/modifier/servlet/interceptors/DoXXXInterceptor.java @@ -7,7 +7,7 @@ import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.SpanID; @@ -92,7 +92,7 @@ public class DoXXXInterceptor implements StaticAroundInterceptor, ByteCodeMethod int port = request.getServerPort(); trace.recordEndPoint(request.getProtocol() + ":" + request.getServerName() + ((port > 0) ? ":" + port : "")); - trace.recordAttribute(AnnotationNames.HTTP_URL, request.getRequestURI()); + trace.recordAttribute(AnnotationKey.HTTP_URL, request.getRequestURI()); } catch (Exception e) { if (logger.isLoggable(Level.WARNING)) { logger.log(Level.WARNING, "Tomcat StandardHostValve trace start fail. Caused:" + e.getMessage(), e); @@ -116,7 +116,7 @@ public class DoXXXInterceptor implements StaticAroundInterceptor, ByteCodeMethod HttpServletRequest request = (HttpServletRequest) args[0]; String parameters = getRequestParameter(request); if (parameters != null && parameters.length() > 0) { - trace.recordAttribute(AnnotationNames.HTTP_PARAM, parameters); + trace.recordAttribute(AnnotationKey.HTTP_PARAM, parameters); } diff --git a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java index 2fecd916c..cf6c1dfa1 100644 --- a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java +++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java @@ -7,7 +7,7 @@ import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.SpanID; @@ -70,7 +70,7 @@ public class StandardHostValveInvokeInterceptor implements StaticAroundIntercept int port = request.getServerPort(); trace.recordEndPoint(request.getProtocol() + ":" + request.getServerName() + ((port > 0) ? ":" + port : "")); trace.recordRemoteAddr(remoteAddr); - trace.recordAttribute(AnnotationNames.HTTP_URL, request.getRequestURI()); + trace.recordAttribute(AnnotationKey.HTTP_URL, request.getRequestURI()); } catch (Exception e) { if (logger.isLoggable(Level.WARNING)) { logger.log(Level.WARNING, "Tomcat StandardHostValve trace start fail. Caused:" + e.getMessage(), e); @@ -94,7 +94,7 @@ public class StandardHostValveInvokeInterceptor implements StaticAroundIntercept HttpServletRequest request = (HttpServletRequest) args[0]; String parameters = getRequestParameter(request); if (parameters != null && parameters.length() > 0) { - trace.recordAttribute(AnnotationNames.HTTP_PARAM, parameters); + trace.recordAttribute(AnnotationKey.HTTP_PARAM, parameters); } diff --git a/src/test/java/com/profiler/context/TraceTest.java b/src/test/java/com/profiler/context/TraceTest.java index 37a0eae4c..74a82b3d2 100644 --- a/src/test/java/com/profiler/context/TraceTest.java +++ b/src/test/java/com/profiler/context/TraceTest.java @@ -1,6 +1,6 @@ package com.profiler.context; -import com.profiler.common.AnnotationNames; +import com.profiler.common.AnnotationKey; import com.profiler.common.ServiceType; import com.profiler.sender.DataSender; @@ -22,7 +22,7 @@ public class TraceTest { // http server receive trace.recordRpcName(ServiceType.UNKNOWN, "service_name", "http://"); trace.recordEndPoint("http:localhost:8080"); - trace.recordAttribute(AnnotationNames.API, "VALUE"); + trace.recordAttribute(AnnotationKey.API, "VALUE"); // get data form db getDataFromDB(trace); @@ -76,7 +76,7 @@ public class TraceTest { // db server request trace.recordRpcName(ServiceType.MYSQL, "mysql", "rpc"); - trace.recordAttribute(AnnotationNames.SQL, "SELECT * FROM TABLE"); + trace.recordAttribute(AnnotationKey.SQL, "SELECT * FROM TABLE"); // get a db response