From 6698362a033cbc4d90a89c06e4e58b88f235f6c5 Mon Sep 17 00:00:00 2001 From: Chisu Yu Date: Thu, 27 Sep 2012 01:55:46 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20add?= =?UTF-8?q?=20Endpoint=20to=20span.?= 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@715 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/java/com/profiler/context/EndPoint.java | 10 ++++++---- src/main/java/com/profiler/context/Span.java | 3 ++- src/main/java/com/profiler/context/Trace.java | 4 ++-- .../profiler/modifier/arcus/ArcusClientModifier.java | 2 +- .../interceptors/ExecuteMethodInterceptor.java | 2 +- .../StandardHostValveInvokeInterceptor.java | 2 +- src/test/java/com/profiler/context/TraceTest.java | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/profiler/context/EndPoint.java b/src/main/java/com/profiler/context/EndPoint.java index a6bb6815d..21309510b 100644 --- a/src/main/java/com/profiler/context/EndPoint.java +++ b/src/main/java/com/profiler/context/EndPoint.java @@ -2,19 +2,21 @@ package com.profiler.context; public class EndPoint { + private final String protocol; private final String ip; private final int port; - public EndPoint(String ip, int port) { + public EndPoint(String protocol, String ip, int port) { + this.protocol = protocol; this.ip = ip; this.port = port; } - + public String toString() { - return "{ip=" + ip + ", port=" + port + "}"; + return protocol + "://" + ip + ":" + port; } public com.profiler.common.dto.thrift.Endpoint toThrift() { - return new com.profiler.common.dto.thrift.Endpoint(ip, (short) port); + return new com.profiler.common.dto.thrift.Endpoint(protocol, ip, (short) port); } } diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java index 8af803351..391592561 100644 --- a/src/main/java/com/profiler/context/Span.java +++ b/src/main/java/com/profiler/context/Span.java @@ -132,7 +132,8 @@ public class Span { span.setServiceName(serviceName); span.setSpanID(traceID.getSpanId()); span.setParentSpanId(traceID.getParentSpanId()); - + span.setEndPoint(endPoint.toThrift()); + List annotationList = new ArrayList(annotations.size()); for (HippoAnnotation a : annotations) { annotationList.add(a.toThrift()); diff --git a/src/main/java/com/profiler/context/Trace.java b/src/main/java/com/profiler/context/Trace.java index 69fd199f5..e48651d76 100644 --- a/src/main/java/com/profiler/context/Trace.java +++ b/src/main/java/com/profiler/context/Trace.java @@ -264,7 +264,7 @@ public final class Trace { } } - public static void recordEndPoint(final String ip, final int port) { + public static void recordEndPoint(final String protocol, final String ip, final int port) { if (!tracingEnabled) return; @@ -273,7 +273,7 @@ public final class Trace { @Override public Span updateSpan(Span span) { // set endpoint to both span and annotations - span.setEndPoint(new EndPoint(ip, port)); + span.setEndPoint(new EndPoint(protocol, ip, port)); return span; } }); diff --git a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java index 5ef04a1f7..dc7c35817 100644 --- a/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java +++ b/src/main/java/com/profiler/modifier/arcus/ArcusClientModifier.java @@ -96,7 +96,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(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 5d3960875..f5d616e52 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java @@ -44,7 +44,7 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor { request.addHeader(Header.HTTP_FLAGS.toString(), String.valueOf(nextId.getFlags())); Trace.recordRpcName("http-call", ""); - Trace.recordEndPoint(host.getHostName(), host.getPort()); + Trace.recordEndPoint("http", host.getHostName(), host.getPort()); Trace.recordAttibute("http.url", request.toString()); Trace.record(Annotation.ClientSend); } finally { 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 e9c78389d..42d8be3cf 100644 --- a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java +++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java @@ -45,7 +45,7 @@ public class StandardHostValveInvokeInterceptor implements StaticAroundIntercept } Trace.recordRpcName("tomcat", requestURL); - Trace.recordEndPoint(request.getLocalAddr(), request.getLocalPort()); + Trace.recordEndPoint(request.getProtocol(), request.getLocalAddr(), request.getLocalPort()); Trace.recordAttibute("http.params", parameters); Trace.record(Annotation.ServerRecv); diff --git a/src/test/java/com/profiler/context/TraceTest.java b/src/test/java/com/profiler/context/TraceTest.java index ccc80d873..5e5cdd947 100644 --- a/src/test/java/com/profiler/context/TraceTest.java +++ b/src/test/java/com/profiler/context/TraceTest.java @@ -11,7 +11,7 @@ public class TraceTest { // http server receive Trace.recordRpcName("service_name", "http://"); - Trace.recordEndPoint("localhost", 8080); + Trace.recordEndPoint("http", "localhost", 8080); Trace.recordAttibute("KEY", "VALUE"); Trace.record(Annotation.ServerRecv);