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

Merge pull request #286 from ascrutae/zhangxin/feature/local-span-transform 

fix issue that local span transform failured
This commit is contained in:
吴晟 Wu Sheng 2017-07-12 03:50:29 -05:00 committed by GitHub
parent 2db0ee67d0 9f8622b8a1
commit 64435c3e39
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,7 +1,5 @@
package org.skywalking.apm.agent.core.context.trace;
import org.skywalking.apm.network.proto.SpanObject;
/**
* The <code>LocalSpan</code> 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;
}