kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the span type missing.

This commit is contained in:
wusheng 2017-07-08 19:48:09 +08:00
parent a23f8ee131
commit f64d414260
6 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java
View File

@ -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.
*/

8
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
View File

@ -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);

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java
View File

@ -98,10 +98,6 @@ public class EntrySpan extends AbstractTracingSpan {
return true;
}
@Override public boolean isLocal() {
return false;
}
@Override public boolean isExit() {
return false;
}

6
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
View File

@ -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;
}

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java
View File

@ -37,10 +37,6 @@ public class LocalSpan extends AbstractTracingSpan {
return false;
}
@Override public boolean isLocal() {
return true;
}
@Override public boolean isExit() {
return false;
}

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
View File

@ -48,10 +48,6 @@ public class NoopSpan implements AbstractSpan {
return false;
}
@Override public boolean isLocal() {
return false;
}
@Override public boolean isExit() {
return false;
}