From 76046d52daaa419475907d4c013bbee3386feba3 Mon Sep 17 00:00:00 2001 From: Chisu Yu Date: Mon, 8 Oct 2012 02:30:35 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20chang?= =?UTF-8?q?e=20arcus=20modifier=20:=20protocol=20code=20to=20uppercase=20c?= =?UTF-8?q?hange=20httpclient=20modifier=20:=20get=20protocol=20version.?= 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@730 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../modifier/arcus/ArcusClientModifier.java | 13 +------------ .../interceptors/ExecuteMethodInterceptor.java | 8 ++------ .../StandardHostValveInvokeInterceptor.java | 4 ++-- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java index 79b1f8270..cdf7dff33 100644 --- a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java @@ -73,17 +73,6 @@ public class ArcusClientModifier extends AbstractModifier { */ code.append("com.profiler.context.Trace.setTraceId(__nextTraceId);"); - // code.append("System.out.println(__traceId);"); - // code.append("System.out.println($1);"); - // code.append("System.out.println(\"Change state \" + state + \" -> \" + newState);"); - // code.append("System.out.println(handlingNode);"); - // code.append("System.out.println(\"cmd=\" + ((cmd == null) ? null : new String(cmd.array())));"); - // code.append("System.out.println(Thread.currentThread().getId());"); - // code.append("System.out.println(Thread.currentThread().getName());"); - // code.append("System.out.println(\"\");"); - // code.append("System.out.println(\"\");"); - // code.append("System.out.println(\"\");"); - /** * After sending command to the Arcus server. now waiting server * response. @@ -96,7 +85,7 @@ public class ArcusClientModifier extends AbstractModifier { code.append(" java.net.SocketAddress socketAddress = handlingNode.getSocketAddress();"); code.append(" if (socketAddress instanceof java.net.InetSocketAddress) {"); code.append(" java.net.InetSocketAddress addr = (java.net.InetSocketAddress) handlingNode.getSocketAddress();"); - code.append(" com.profiler.context.Trace.recordEndPoint(\"arcus:\" + addr.getHostName() + \":\" + addr.getPort());"); + code.append(" com.profiler.context.Trace.recordEndPoint(\"ARCUS:\" + addr.getHostName() + \":\" + addr.getPort());"); code.append(" }"); code.append(" com.profiler.context.Trace.recordRpcName(\"arcus\", \"\");"); code.append(" com.profiler.context.Trace.recordAttribute(\"arcus.command\", ((cmd == null) ? \"UNKNOWN\" : new String(cmd.array())));"); 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 8f2b09a32..e3a409195 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java @@ -27,8 +27,6 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor { @Override public void before(Object target, String className, String methodName, String parameterDescription, Object[] args) { - System.out.println("\n\n\n\nINVOKE HTTP START ----------------------------------------------------------------------------------------------------------------------------------------------------"); - final HttpHost host = (HttpHost) args[0]; final HttpRequest request = (HttpRequest) args[1]; @@ -43,8 +41,8 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor { request.addHeader(Header.HTTP_SAMPLED.toString(), String.valueOf(nextId.isSampled())); request.addHeader(Header.HTTP_FLAGS.toString(), String.valueOf(nextId.getFlags())); - Trace.recordRpcName("http-call", ""); - Trace.recordEndPoint("http:" + host.getHostName() + ":" + host.getPort()); + Trace.recordRpcName(request.getProtocolVersion().toString(), request.toString()); + Trace.recordEndPoint(request.getProtocolVersion().toString() + ":" + host.getHostName() + ":" + host.getPort()); Trace.recordAttibute("http.url", request.toString()); Trace.record(Annotation.ClientSend); } finally { @@ -59,7 +57,5 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor { Trace.traceBlockBegin(); Trace.record(Annotation.ClientRecv, StopWatch.stopAndGetElapsed("ExecuteMethodInterceptor")); Trace.traceBlockEnd(); - - System.out.println("\n\n\n\nINVOKE HTTP END ----------------------------------------------------------------------------------------------------------------------------------------------------"); } } \ No newline at end of file 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 eb42222d2..fd42d42bc 100644 --- a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java +++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java @@ -43,9 +43,9 @@ public class StandardHostValveInvokeInterceptor implements StaticAroundIntercept } Trace.setTraceId(newTraceID); } - + Trace.recordRpcName("tomcat", requestURL); - Trace.recordEndPoint(request.getProtocol() + ":" + request.getLocalAddr() + ":" + request.getLocalPort()); + Trace.recordEndPoint(request.getProtocol() + ":" + request.getLocalName() + ":" + request.getLocalPort()); Trace.recordAttibute("http.params", parameters); Trace.record(Annotation.ServerRecv);