feedback

Author: mcculls

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java

@@ -3,6 +3,7 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTraceCollector;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopAgentScope;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 /**
@@ -60,7 +61,7 @@ public AgentScope activate() {
     } else {
       // continuation cancelled or too many activations; rollback count
       COUNT.decrementAndGet(this);
-      return null;
+      return NoopAgentScope.INSTANCE;
     }
   }