From 31a6407feb740885929f196929a394764b16bd4c Mon Sep 17 00:00:00 2001 From: cyejing Date: Wed, 11 Dec 2019 14:20:31 +0800 Subject: [PATCH] Support set operation name in async mode span (#4015) --- .../skywalking/apm/agent/core/context/trace/EntrySpan.java | 2 +- .../skywalking/apm/agent/core/context/trace/ExitSpan.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java index a96308747c..bef43e44e4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java @@ -96,7 +96,7 @@ public class EntrySpan extends StackBasedTracingSpan { @Override public AbstractTracingSpan setOperationName(String operationName) { - if (stackDepth == currentMaxDepth) { + if (stackDepth == currentMaxDepth || isInAsyncMode) { return super.setOperationName(operationName); } else { return this; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java index 774acc4ab5..aa0089a061 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -116,7 +116,7 @@ public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo { @Override public AbstractTracingSpan setOperationName(String operationName) { - if (stackDepth == 1) { + if (stackDepth == 1 || isInAsyncMode) { return super.setOperationName(operationName); } else { return this; -- GitLab