From 990b945ded9a599be283dfeeb969f71a96fafd14 Mon Sep 17 00:00:00 2001
From: Chisu Yu <puseori9th@gmail.com>
Date: Wed, 5 Sep 2012 09:02:12 +0000
Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20refac?=
 =?UTF-8?q?tor?=
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@583 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../java/com/profiler/context/EndPoint.java   |  2 +-
 src/main/java/com/profiler/context/Span.java  | 27 +++++++++++++------
 src/main/java/com/profiler/context/Trace.java |  2 +-
 .../java/com/profiler/context/TraceID.java    |  2 +-
 .../interceptors/InvokeMethodInterceptor.java |  2 ++
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/profiler/context/EndPoint.java b/src/main/java/com/profiler/context/EndPoint.java
index a943d01e6..2ffbfe790 100644
--- a/src/main/java/com/profiler/context/EndPoint.java
+++ b/src/main/java/com/profiler/context/EndPoint.java
@@ -11,7 +11,7 @@ public class EndPoint {
 	}
 
 	public String toString() {
-		return "EndPoint{ip=" + ip + ", port=" + port + "}";
+		return "{ip=" + ip + ", port=" + port + "}";
 	}
 
 	public com.profiler.context.gen.Endpoint toThrift() {
diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index 01ff8995e..7f958c0b2 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -95,14 +95,25 @@ public class Span {
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 
-		sb.append("Span={");
-		sb.append("TraceID=").append(traceID);
-		sb.append(", CreateTime=").append(createTime);
-		sb.append(", Name=").append(name);
-		sb.append(", ServiceName=").append(serviceName);
-		sb.append(", EndPoint=").append(endPoint);
-		sb.append(", Annotations=").append(annotations);
-		sb.append(", BinaryAnnotations=").append(binaryAnnotations);
+		sb.append("{");
+		sb.append("\n\t TraceID = ").append(traceID);
+		sb.append(",\n\t CreateTime = ").append(createTime);
+		sb.append(",\n\t Name = ").append(name);
+		sb.append(",\n\t ServiceName = ").append(serviceName);
+		sb.append(",\n\t EndPoint = ").append(endPoint);
+
+		sb.append(",\n\t Annotations = {");
+		for (HippoAnnotation a : annotations) {
+			sb.append("\n\t\t").append(a);
+		}
+		sb.append("\n\t}");
+
+		sb.append(",\n\t BinaryAnnotations=");
+		for (HippoBinaryAnnotation a : binaryAnnotations) {
+			sb.append("\n\t\t").append(a);
+		}
+		sb.append("\n\t}");
+
 		sb.append("}");
 
 		return sb.toString();
diff --git a/src/main/java/com/profiler/context/Trace.java b/src/main/java/com/profiler/context/Trace.java
index 756ad4e69..9917c98e1 100644
--- a/src/main/java/com/profiler/context/Trace.java
+++ b/src/main/java/com/profiler/context/Trace.java
@@ -105,7 +105,7 @@ public final class Trace {
 	static void logSpan(Span span) {
 		try {
 			// TODO: send span to the server.
-			System.out.println("\n\n[WRITE SPAN] hashCode=" + span.hashCode() + ", Value=" + span + ", SpanMap.size=" + spanMap.size() + ", CurrentThreadID=" + Thread.currentThread().getId() + ", CurrentThreadName=" + Thread.currentThread().getName() +"\n\n");
+			System.out.println("\n\n[WRITE SPAN] hashCode=" + span.hashCode() + ",\n\t " + span + ",\n\t SpanMap.size=" + spanMap.size() + ",\n\t CurrentThreadID=" + Thread.currentThread().getId() + ",\n\t CurrentThreadName=" + Thread.currentThread().getName() +"\n\n");
 
 			// TODO: remove this, just for debugging
 			if (spanMap.size() > 0) {
diff --git a/src/main/java/com/profiler/context/TraceID.java b/src/main/java/com/profiler/context/TraceID.java
index a9bb469fb..2ba33ffdc 100644
--- a/src/main/java/com/profiler/context/TraceID.java
+++ b/src/main/java/com/profiler/context/TraceID.java
@@ -106,7 +106,7 @@ public class TraceID {
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 
-		sb.append("TraceID={");
+		sb.append("{");
 		sb.append("id=").append(id);
 		sb.append(", parentSpanId=").append(parentSpanId);
 		sb.append(", spanId=").append(spanId);
diff --git a/src/main/java/com/profiler/modifier/tomcat/interceptors/InvokeMethodInterceptor.java b/src/main/java/com/profiler/modifier/tomcat/interceptors/InvokeMethodInterceptor.java
index 9f1f6bb07..299d5bc22 100644
--- a/src/main/java/com/profiler/modifier/tomcat/interceptors/InvokeMethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/InvokeMethodInterceptor.java
@@ -54,6 +54,8 @@ public class InvokeMethodInterceptor implements StaticAroundInterceptor {
 		// TODO result 가 Exception 타입일경우 호출 실패임.
 		Trace.record(Annotation.ServerSend, StopWatch.stopAndGetElapsed("InvokeMethodInterceptor-starttime"));
 		RequestTracer.endTransaction();
+		
+		Trace.removeTraceId();
 	}
 
 	/**