From 20a58ff10e751cdae7a9f3b43b4fe4edcfd3ea7e Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Tue, 10 Sep 2013 09:37:01 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20traceId=EB=A5=BC=20transactionId=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=ED=95=A8.?=
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-commons/trunk@2298 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java  |  4 ++--
 .../{TraceIdUtils.java => TransactionIdUtils.java}    | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)
 rename src/main/java/com/nhn/pinpoint/common/util/{TraceIdUtils.java => TransactionIdUtils.java} (79%)

diff --git a/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java b/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
index bd91ff849..f72e8d1c3 100644
--- a/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
+++ b/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
@@ -6,12 +6,12 @@ import java.util.List;
 
 import com.nhn.pinpoint.common.ServiceType;
 import com.nhn.pinpoint.common.buffer.AutomaticBuffer;
+import com.nhn.pinpoint.common.util.TransactionIdUtils;
 import com.nhn.pinpoint.thrift.dto.Annotation;
 import com.nhn.pinpoint.thrift.dto.Span;
 import com.nhn.pinpoint.common.buffer.Buffer;
 import com.nhn.pinpoint.common.util.BytesUtils;
 import com.nhn.pinpoint.common.buffer.FixedBuffer;
-import com.nhn.pinpoint.common.util.TraceIdUtils;
 
 /**
  *
@@ -121,7 +121,7 @@ public class SpanBo implements com.nhn.pinpoint.common.bo.Span {
     }
 
 	public String getTraceId() {
-        return TraceIdUtils.formatString(traceAgentId, traceAgentStartTime, traceTransactionId);
+        return TransactionIdUtils.formatString(traceAgentId, traceAgentStartTime, traceTransactionId);
 	}
     
     public String getAgentId() {
diff --git a/src/main/java/com/nhn/pinpoint/common/util/TraceIdUtils.java b/src/main/java/com/nhn/pinpoint/common/util/TransactionIdUtils.java
similarity index 79%
rename from src/main/java/com/nhn/pinpoint/common/util/TraceIdUtils.java
rename to src/main/java/com/nhn/pinpoint/common/util/TransactionIdUtils.java
index 58daa8c12..380397faa 100644
--- a/src/main/java/com/nhn/pinpoint/common/util/TraceIdUtils.java
+++ b/src/main/java/com/nhn/pinpoint/common/util/TransactionIdUtils.java
@@ -3,7 +3,7 @@ package com.nhn.pinpoint.common.util;
 /**
  *
  */
-public class TraceIdUtils {
+public class TransactionIdUtils {
 
     public static final String formatString(String agentId, long agentStartTime, long transactionId) {
         if (agentId == null) {
@@ -16,15 +16,6 @@ public class TraceIdUtils {
                 digits(transactionId, 12));
     }
 
-    @Deprecated
-    public static final String formatString(long mostSigBits, long leastSigBits) {
-        return (digits(mostSigBits >> 32, 8) + "-" +
-                digits(mostSigBits >> 16, 4) + "-" +
-                digits(mostSigBits, 4) + "-" +
-                digits(leastSigBits >> 48, 4) + "-" +
-                digits(leastSigBits, 12));
-    }
-
     private static String digits(long val, int digits) {
         long hi = 1L << (digits * 4);
         return Long.toHexString(hi | (val & (hi - 1))).substring(1);