From f64d41426053fe6d65586af74a150e9b99892cab Mon Sep 17 00:00:00 2001 From: wusheng Date: Sat, 8 Jul 2017 19:48:09 +0800 Subject: [PATCH] Fix the span type missing. --- .../apm/agent/core/context/trace/AbstractSpan.java | 5 ----- .../apm/agent/core/context/trace/AbstractTracingSpan.java | 8 +++++++- .../apm/agent/core/context/trace/EntrySpan.java | 4 ---- .../skywalking/apm/agent/core/context/trace/ExitSpan.java | 6 ------ .../apm/agent/core/context/trace/LocalSpan.java | 4 ---- .../skywalking/apm/agent/core/context/trace/NoopSpan.java | 4 ---- 6 files changed, 7 insertions(+), 24 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java index 52e03a60ca..87ad1b4249 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java @@ -50,11 +50,6 @@ public interface AbstractSpan { */ boolean isEntry(); - /** - * @return true if the actual span is a local span. - */ - boolean isLocal(); - /** * @return true if the actual span is an exit span. */ 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 28a3213814..04e9045410 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 @@ -219,7 +219,13 @@ public abstract class AbstractTracingSpan implements AbstractSpan { } else { spanBuilder.setOperationName(operationName); } - spanBuilder.setSpanType(SpanType.Entry); + if (isEntry()) { + spanBuilder.setSpanType(SpanType.Entry); + } else if (isExit()) { + spanBuilder.setSpanType(SpanType.Exit); + } else { + spanBuilder.setSpanType(SpanType.Local); + } spanBuilder.setSpanLayerValue(this.layer.getCode()); if (componentId != DictionaryUtil.nullValue()) { spanBuilder.setComponentId(componentId); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java index 24ca062914..04e42861b0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java @@ -98,10 +98,6 @@ public class EntrySpan extends AbstractTracingSpan { return true; } - @Override public boolean isLocal() { - return false; - } - @Override public boolean isExit() { return false; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java index a60486531f..929872383c 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -2,7 +2,6 @@ package org.skywalking.apm.agent.core.context.trace; import org.skywalking.apm.agent.core.dictionary.DictionaryUtil; import org.skywalking.apm.network.proto.SpanObject; -import org.skywalking.apm.network.proto.SpanType; import org.skywalking.apm.network.trace.component.Component; /** @@ -114,7 +113,6 @@ public class ExitSpan extends AbstractTracingSpan { } else { spanBuilder.setPeer(peer); } - spanBuilder = spanBuilder.setSpanType(SpanType.Exit); return spanBuilder; } @@ -130,10 +128,6 @@ public class ExitSpan extends AbstractTracingSpan { return false; } - @Override public boolean isLocal() { - return false; - } - @Override public boolean isExit() { return true; } 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 6ef653f891..e26fb31ca6 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 @@ -37,10 +37,6 @@ public class LocalSpan extends AbstractTracingSpan { return false; } - @Override public boolean isLocal() { - return true; - } - @Override public boolean isExit() { return false; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java index 7274064a49..01c97cf15f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java @@ -48,10 +48,6 @@ public class NoopSpan implements AbstractSpan { return false; } - @Override public boolean isLocal() { - return false; - } - @Override public boolean isExit() { return false; } -- GitLab