From 9f8622b8a1ee18601cb9a64e7768117385b3307d Mon Sep 17 00:00:00 2001 From: ascrutae Date: Wed, 12 Jul 2017 16:33:51 +0800 Subject: [PATCH] fix issue that local span transform failured --- .../apm/agent/core/context/trace/AbstractTracingSpan.java | 8 ++++++-- .../apm/agent/core/context/trace/LocalSpan.java | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index fc75d7dce..8a209aa95 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -232,11 +232,15 @@ public abstract class AbstractTracingSpan implements AbstractSpan { } else { spanBuilder.setSpanType(SpanType.Local); } - spanBuilder.setSpanLayerValue(this.layer.getCode()); + if (this.layer != null) { + spanBuilder.setSpanLayerValue(this.layer.getCode()); + } if (componentId != DictionaryUtil.nullValue()) { spanBuilder.setComponentId(componentId); } else { - spanBuilder.setComponent(componentName); + if (componentName != null) { + spanBuilder.setComponent(componentName); + } } spanBuilder.setIsError(errorOccurred); if (this.tags != null) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java index e26fb31ca..d89c5ea31 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java @@ -1,7 +1,5 @@ package org.skywalking.apm.agent.core.context.trace; -import org.skywalking.apm.network.proto.SpanObject; - /** * The LocalSpan represents a normal tracing point, such as a local method. * @@ -29,10 +27,6 @@ public class LocalSpan extends AbstractTracingSpan { return this; } - @Override public SpanObject.Builder transform() { - return null; - } - @Override public boolean isEntry() { return false; }