From 9f4532c03b57eb7c505a3691d1f599f893caabc6 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Thu, 14 Dec 2017 10:43:00 +0800 Subject: [PATCH] fix miss transform ref data for each span issue --- .../agent/core/context/trace/AbstractTracingSpan.java | 6 +++++- .../apm/agent/core/context/trace/EntrySpan.java | 11 ----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index 7e39cff4e..90d174d02 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; import java.util.LinkedList; @@ -280,6 +279,11 @@ public abstract class AbstractTracingSpan implements AbstractSpan { spanBuilder.addLogs(log.transform()); } } + if (this.refs != null) { + for (TraceSegmentRef ref : this.refs) { + spanBuilder.addRefs(ref.transform()); + } + } return spanBuilder; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java index 2870a4b40..b8b3b00fc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java @@ -19,7 +19,6 @@ package org.apache.skywalking.apm.agent.core.context.trace; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.network.proto.SpanObject; import org.apache.skywalking.apm.network.trace.component.Component; /** @@ -127,16 +126,6 @@ public class EntrySpan extends StackBasedTracingSpan { return false; } - @Override public SpanObject.Builder transform() { - SpanObject.Builder builder = super.transform(); - if (refs != null) { - for (TraceSegmentRef ref : refs) { - builder.addRefs(ref.transform()); - } - } - return builder; - } - private void clearWhenRestart() { this.componentId = DictionaryUtil.nullValue(); this.componentName = null;