From 6ab9f0b1bb862b9ff3af9772afda795ec5799b15 Mon Sep 17 00:00:00 2001
From: Chisu Yu <puseori9th@gmail.com>
Date: Wed, 29 Aug 2012 10:52:49 +0000
Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20modif?=
 =?UTF-8?q?ied?=
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@559 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 src/main/java/com/profiler/context/Span.java  |  1 +
 .../ExecuteMethodInterceptor.java             | 34 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index 78456d8c9..43b589ac0 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -79,6 +79,7 @@ public class 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("}");
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 15846a7aa..2f031df22 100644
--- a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java
@@ -1,5 +1,13 @@
 package com.profiler.modifier.connector.interceptors;
 
+import java.util.Arrays;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+
+import com.profiler.StopWatch;
+import com.profiler.context.Annotation;
+import com.profiler.context.Trace;
 import com.profiler.interceptor.StaticAroundInterceptor;
 
 /**
@@ -17,27 +25,27 @@ import com.profiler.interceptor.StaticAroundInterceptor;
  */
 public class ExecuteMethodInterceptor implements StaticAroundInterceptor {
 
-	/**
-	 * <pre>
-	 * args is...
-	 * 
-	 * org.apache.http.impl.client.AbstractHttpClient.
-	 * public <T> T execute(
-	 *            final HttpHost target, 
-	 *            final HttpRequest request,
-	 *            final ResponseHandler<? extends T> responseHandler, 
-	 *            final HttpContext context) 
-	 *            throws IOException, ClientProtocolException {
-	 * </pre>
-	 */
 	@Override
 	public void before(Object target, String className, String methodName, Object[] args) {
 		System.out.println("\n\n\n\nHTTP BEFORE");
+
+		HttpHost host = (HttpHost) args[0];
+		HttpRequest request = (HttpRequest) args[1];
+
+		System.out.println(Arrays.toString(request.getAllHeaders()));
+
+		Trace.recordRpcName("http-call", "");
+		Trace.recordServerAddr(host.getHostName(), host.getPort());
+		Trace.record("http.uri=" + request.toString());
+		Trace.record(new Annotation.ClientSend());
 		// TODO : add header
+
+		StopWatch.start("ExecuteMethodInterceptor");
 	}
 
 	@Override
 	public void after(Object target, String className, String methodName, Object[] args, Object result) {
 		System.out.println("\n\n\n\nHTTP AFTER");
+		Trace.record(new Annotation.ClientRecv(), StopWatch.stopAndGetElapsed("ExecuteMethodInterceptor"));
 	}
 }
\ No newline at end of file