From 77f71d5cbbddcd4471a59a43e5c6e75af8878d40 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Tue, 17 Nov 2015 21:21:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=AD=97=E6=AE=B5=E7=9A=84=E6=96=B9=E6=B3=95=202.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96TraceId=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessKeyAppender.java}                 | 16 +++++++------
 .../com/ai/cloud/skywalking/api/Tracing.java  | 23 +++++++++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)
 rename skywalking-api/src/main/java/com/ai/cloud/skywalking/{util/BusinessKeyTracing.java => api/BusinessKeyAppender.java} (68%)
 create mode 100644 skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java

diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BusinessKeyTracing.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java
similarity index 68%
rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BusinessKeyTracing.java
rename to skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java
index 7caf3a6c4..ee2ff9c85 100644
--- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BusinessKeyTracing.java
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java
@@ -1,26 +1,28 @@
-package com.ai.cloud.skywalking.util;
+package com.ai.cloud.skywalking.api;
 
 import com.ai.cloud.skywalking.conf.AuthDesc;
 import com.ai.cloud.skywalking.conf.Config;
 import com.ai.cloud.skywalking.context.Context;
 import com.ai.cloud.skywalking.context.Span;
 
-public final class BusinessKeyTracing {
-
+public final class BusinessKeyAppender {
     private static final char spiltChar = '^';
 
-
-    private BusinessKeyTracing() {
+    private BusinessKeyAppender() {
         // Non
     }
 
+    /**
+     * 在当前埋点上下文中设置业务级信息
+     * 
+     * @param businessKey
+     */
     public static void trace(String businessKey) {
-
         if (!AuthDesc.isAuth())
             return;
 
         Span spanData = Context.getLastSpan();
-        if (spanData != null) {
+        if (spanData == null) {
             return;
         }
         spanData.setBusinessKey(businessKey.replace('-', spiltChar).substring(0, Config.BusinessKey.MAX_LENGTH));
diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java
new file mode 100644
index 000000000..29ee97b05
--- /dev/null
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java
@@ -0,0 +1,23 @@
+package com.ai.cloud.skywalking.api;
+
+import com.ai.cloud.skywalking.conf.AuthDesc;
+import com.ai.cloud.skywalking.context.Context;
+import com.ai.cloud.skywalking.context.Span;
+
+public class Tracing {
+	/**
+	 * 获取当前上下文中的TraceId
+	 * @return
+	 */
+	public static String getTraceId(){
+		if (!AuthDesc.isAuth())
+            return "";
+
+        Span spanData = Context.getLastSpan();
+        if (spanData == null) {
+            return "";
+        }
+        
+        return spanData.getTraceId();
+	}
+}