From 7aefb8f8a6bb20e27fc114e81eade09895f0285f Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Tue, 6 Dec 2016 14:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/a/eye/skywalking/model/Span.java      | 6 +++---
 .../java/com/a/eye/skywalking/util/ContextGenerator.java    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java
index b053f1d3d..9f0db257f 100644
--- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java
+++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java
@@ -77,12 +77,12 @@ public class Span {
         this.parentLevel = "";
     }
 
-    public Span(TraceId traceId, String parentLevel, int levelId, String applicationCode, String username) {
+    public Span(TraceId traceId, String parentLevel, int levelId, String applicationCode, String username, String viewPointId) {
         this.traceId = traceId;
         this.parentLevel = parentLevel;
         this.levelId = levelId;
-        this.applicationId = applicationId;
-        this.userId = userId;
+        this.applicationCode = applicationCode;
+        this.username = username;
         this.viewPointId = viewPointId;
         this.routeKey = RoutingKeyGenerator.generate(viewPointId);
     }
diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java
index 2ff7ee4f8..bad6e9c80 100644
--- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java
+++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java
@@ -29,7 +29,7 @@ public final class ContextGenerator {
         Span spanData = CurrentThreadSpanStack.peek();
         if (context != null && context.getTraceId() != null && spanData == null) {
             spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(),
-                    Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID, id.getViewPoint());
+                    Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME, id.getViewPoint());
         } else {
             spanData = getSpanFromThreadLocal(id);
         }
@@ -45,14 +45,14 @@ public final class ContextGenerator {
         int routeKey;
         if (parentSpan == null) {
             // 不存在，新创建一个Context
-            span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID);
+            span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME);
             routeKey = RoutingKeyGenerator.generate(id.getViewPoint());
         } else {
 
             // 根据ParentContextData的TraceId和RPCID
             // LevelId是由SpanNode类的nextSubSpanLevelId字段进行初始化的.
             // 所以在这里不需要初始化
-            span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID);
+            span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME);
             if (!StringUtil.isEmpty(parentSpan.getParentLevel())) {
                 span.setParentLevel(parentSpan.getParentLevel() + "." + parentSpan.getLevelId());
             } else {