From 809158b23b4fd4251479e22bd2047cbcf2bcfe5b Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Wed, 19 Jul 2017 11:58:34 +0800
Subject: [PATCH] fix miss entryServiceId and entryServiceName in
 ContextSnapshot  issue

---
 .../agent/core/context/ContextSnapshot.java   | 19 +++++++++++++++++--
 .../core/context/IgnoredTracerContext.java    |  2 +-
 .../agent/core/context/TracingContext.java    | 18 ++++++++++++++----
 .../core/context/trace/TraceSegmentRef.java   |  6 ++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
index 755a2275d8..9d988e190d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
@@ -2,6 +2,8 @@ package org.skywalking.apm.agent.core.context;
 
 import java.util.List;
 import org.skywalking.apm.agent.core.context.ids.DistributedTraceId;
+import org.skywalking.apm.agent.core.dictionary.DictionaryUtil;
+import org.skywalking.apm.util.StringUtil;
 
 /**
  * The <code>ContextSnapshot</code> is a snapshot for current context. The snapshot carries the info for building
@@ -20,16 +22,24 @@ public class ContextSnapshot {
      */
     private int spanId = -1;
 
+    private String entryOperationName;
+
     /**
      * {@link DistributedTraceId}
      */
     private List<DistributedTraceId> distributedTraceIds;
 
     ContextSnapshot(String traceSegmentId, int spanId,
-        List<DistributedTraceId> distributedTraceIds) {
+        List<DistributedTraceId> distributedTraceIds, int entryServiceId, String entryOperationName) {
         this.traceSegmentId = traceSegmentId;
         this.spanId = spanId;
         this.distributedTraceIds = distributedTraceIds;
+
+        if (entryServiceId == DictionaryUtil.nullValue()) {
+            this.entryOperationName = "#" + entryOperationName;
+        } else {
+            this.entryOperationName = String.valueOf(entryServiceId);
+        }
     }
 
     public List<DistributedTraceId> getDistributedTraceIds() {
@@ -48,6 +58,11 @@ public class ContextSnapshot {
         return traceSegmentId != null
             && spanId > -1
             && distributedTraceIds != null
-            && distributedTraceIds.size() > 0;
+            && distributedTraceIds.size() > 0
+            && !StringUtil.isEmpty(entryOperationName);
+    }
+
+    public String getEntryOperationName() {
+        return entryOperationName;
     }
 }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/IgnoredTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/IgnoredTracerContext.java
index 4ad37e361a..6f3e0ce51e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/IgnoredTracerContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/IgnoredTracerContext.java
@@ -33,7 +33,7 @@ public class IgnoredTracerContext implements AbstractTracerContext {
     }
 
     @Override public ContextSnapshot capture() {
-        return new ContextSnapshot(null, -1, null);
+        return new ContextSnapshot(null, -1, null, 0, null);
     }
 
     @Override public void continued(ContextSnapshot snapshot) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
index 15e41c2a85..f74654f472 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
@@ -132,10 +132,20 @@ public class TracingContext implements AbstractTracerContext {
      */
     @Override
     public ContextSnapshot capture() {
-        return new ContextSnapshot(segment.getTraceSegmentId(),
-            activeSpan().getSpanId(),
-            segment.getRelatedGlobalTraces()
-        );
+        List<TraceSegmentRef> refs = this.segment.getRefs();
+        if (refs != null && refs.size() > 0) {
+            TraceSegmentRef ref = refs.get(0);
+            return new ContextSnapshot(segment.getTraceSegmentId(),
+                activeSpan().getSpanId(),
+                segment.getRelatedGlobalTraces(), ref.getOperationId(), ref.getOperationName()
+            );
+        } else {
+            AbstractTracingSpan firstSpan = first();
+            return new ContextSnapshot(segment.getTraceSegmentId(),
+                activeSpan().getSpanId(),
+                segment.getRelatedGlobalTraces(), firstSpan.getOperationId(), firstSpan.getOperationName()
+            );
+        }
     }
 
     /**
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
index 1e2da12173..672d7b35f1 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
@@ -57,6 +57,12 @@ public class TraceSegmentRef {
         this.type = SegmentRefType.CROSS_THREAD;
         this.traceSegmentId = snapshot.getTraceSegmentId();
         this.spanId = snapshot.getSpanId();
+        String entryOperationName = snapshot.getEntryOperationName();
+        if (entryOperationName.charAt(0) == '#') {
+            this.operationName = entryOperationName.substring(1);
+        } else {
+            this.operationId = Integer.parseInt(entryOperationName);
+        }
     }
 
     public String getOperationName() {
-- 
GitLab