From 67e628fae85e3f5d44abfe38dcfdf051fbaff105 Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Sat, 12 Oct 2013 07:25:19 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20apiId=EB=A5=BC=20annotation=EC=97=90=20=EB=84=A3=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EA=B3=A0=20span,=20spanEvent=EC=97=90=20=EC=A7=81?=
 =?UTF-8?q?=EC=A0=91=20id=EB=A5=BC=20=EB=84=A3=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=A8.=20=20-=20traceAgentId=EA=B0=80=20a?=
 =?UTF-8?q?gentId=EC=99=80=20=EB=8F=99=EC=9D=BC=ED=95=9C=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=9D=BC=EA=B2=BD=EC=9A=B0=20traceid?=
 =?UTF-8?q?=EB=A5=BC=20=EB=A0=88=EC=BD=94=EB=94=A9=20=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=ED=95=A8.=20?=
 =?UTF-8?q?=20=20=20=EB=B3=80=EA=B2=BD=ED=9B=84=20mysql=EC=B5=9C=EC=B4=88?=
 =?UTF-8?q?=20connect=EC=8B=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EA=B0=80=20=204250->4023=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=95=BD=205%=EC=A4=84=EC=96=B4=EB=93=AC.=20mysq=20=EC=B5=9C?=
 =?UTF-8?q?=EC=B4=88=20connect=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20db=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=EC=97=B4=EC=9D=B4=20=ED=81=B0=201.5k=EC=A0=95?=
 =?UTF-8?q?=EB=8F=84=EC=9D=98=20=EC=82=AC=EC=9D=B4=EC=A6=88=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=B0=A8=EC=A7=80=20=ED=95=98=EA=B3=A0=20?=
 =?UTF-8?q?=EC=9E=88=EC=96=B4=20=EC=8B=A4=EC=A0=9C=205%=EC=9D=B4=EC=83=81?=
 =?UTF-8?q?=EC=9D=98=20=EC=84=B1=EB=8A=A5=ED=96=A5=EC=83=81=EC=9D=B4?=
 =?UTF-8?q?=EB=9D=BC=EA=B3=A0=20=EB=B3=BC=EC=88=98=EB=8F=84=20=EC=9E=87?=
 =?UTF-8?q?=EC=9D=8C.?=
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-server/trunk@2509 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../nhn/pinpoint/collector/handler/SpanChunkHandler.java   | 4 ++++
 .../nhn/pinpoint/collector/handler/SpanEventHandler.java   | 4 ++++
 .../com/nhn/pinpoint/collector/handler/SpanHandler.java    | 7 +++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
index 73b9133c2..8499fb266 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
@@ -41,6 +41,10 @@ public class SpanChunkHandler implements SimpleHandler {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SpanChunk={}", spanChunk);
 			}
+            String traceAgentId = spanChunk.getTraceAgentId();
+            if (traceAgentId == null) {
+                spanChunk.setTraceAgentId(spanChunk.getAgentId());
+            }
 
 			traceDao.insertSpanChunk(spanChunk);
 
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
index 24fab8d7b..77fb8ad4b 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
@@ -38,6 +38,10 @@ public class SpanEventHandler implements SimpleHandler {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SpanEvent={}", spanEvent);
 			}
+            String traceAgentId = spanEvent.getTraceAgentId();
+            if (traceAgentId == null) {
+                spanEvent.setTraceAgentId(spanEvent.getAgentKey().getAgentId());
+            }
 
 			traceDao.insertEvent(spanEvent);
 
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
index 4adc2ece6..7317065ad 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
@@ -44,12 +44,15 @@ public class SpanHandler implements SimpleHandler {
 
 		try {
 			TSpan span = (TSpan) tbase;
-
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SPAN={}", span);
 			}
+            String traceAgentId = span.getTraceAgentId();
+            if (traceAgentId == null) {
+                span.setTraceAgentId(span.getAgentId());
+            }
 
-			traceDao.insert(span);
+            traceDao.insert(span);
 //			traceIndexDao.insert(span);
 			applicationTraceIndexDao.insert(span);