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

Merge branch 'master' into feature/new-id 

* master:
  fix operation id of exit span incorrect issue
This commit is contained in:
wusheng 2017-07-20 23:18:06 +08:00
parent 329f224763 f3bc9d445d
commit efbdb7450f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,13 +286,13 @@ public class TracingContext implements AbstractTracerContext {
.doInCondition(
new PossibleFound.FoundAndObtain() {
@Override
public Object doProcess(int peerId) {
return new ExitSpan(spanIdGenerator++, parentSpanId, applicationId, peerId);
public Object doProcess(int operationId) {
return new ExitSpan(spanIdGenerator++, parentSpanId, operationId, applicationId);
}
}, new PossibleFound.NotFoundAndObtain() {
@Override
public Object doProcess() {
return new ExitSpan(spanIdGenerator++, parentSpanId, applicationId, remotePeer);
return new ExitSpan(spanIdGenerator++, parentSpanId, operationName, remotePeer);
}
});
}