diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java index dde36c5d3..9db53a179 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java @@ -50,7 +50,7 @@ public class ContextSnapshot { } public boolean isFromCurrent() { - return traceSegmentId.equals(ContextManager.capture().getTraceSegmentId()); + return traceSegmentId != null && traceSegmentId.equals(ContextManager.capture().getTraceSegmentId()); } public CorrelationContext getCorrelationContext() {