Remove AgentScope.source() from instrumentation API (#8539)

Author: mcculls

dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java

@@ -89,11 +89,6 @@ public AgentSpan span() {
       return agentSpan;
     }
 
-    @Override
-    public byte source() {
-      return ScopeSource.MANUAL.id();
-    }
-
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {

dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java

@@ -99,11 +99,6 @@ public AgentSpan span() {
       return agentSpan;
     }
 
-    @Override
-    public byte source() {
-      return ScopeSource.MANUAL.id();
-    }
-
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -922,12 +922,7 @@ public AgentScope activateSpan(AgentSpan span, ScopeSource source, boolean isAsy
 
   @Override
   public AgentScope.Continuation captureActiveSpan() {
-    AgentScope activeScope = this.scopeManager.active();
-    if (null != activeScope && activeScope.isAsyncPropagating()) {
-      return scopeManager.captureSpan(activeScope.span(), activeScope.source());
-    } else {
-      return AgentTracer.noopContinuation();
-    }
+    return scopeManager.captureActiveSpan();
   }
 
   @Override
@@ -937,16 +932,12 @@ public AgentScope.Continuation captureSpan(final AgentSpan span) {
 
   @Override
   public boolean isAsyncPropagationEnabled() {
-    AgentScope activeScope = this.scopeManager.active();
-    return activeScope != null && activeScope.isAsyncPropagating();
+    return scopeManager.isAsyncPropagationEnabled();
   }
 
   @Override
   public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
-    AgentScope activeScope = this.scopeManager.active();
-    if (activeScope != null) {
-      activeScope.setAsyncPropagation(asyncPropagationEnabled);
-    }
+    scopeManager.setAsyncPropagationEnabled(asyncPropagationEnabled);
   }
 
   @Override

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

@@ -184,7 +184,6 @@ public final void afterActivated() {
     }
   }
 
-  @Override
   public byte source() {
     return (byte) (source & 0x7F);
   }

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

@@ -13,6 +13,7 @@
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
@@ -90,6 +91,15 @@ public AgentScope activate(
     return activate(span, source.id(), true, isAsyncPropagating);
   }
 
+  public AgentScope.Continuation captureActiveSpan() {
+    ContinuableScope activeScope = scopeStack().active();
+    if (null != activeScope && activeScope.isAsyncPropagating()) {
+      return captureSpan(activeScope.span(), activeScope.source());
+    } else {
+      return AgentTracer.noopContinuation();
+    }
+  }
+
   public AgentScope.Continuation captureSpan(final AgentSpan span, byte source) {
     ScopeContinuation continuation = new ScopeContinuation(this, span, source);
     continuation.register();
@@ -166,6 +176,18 @@ ContinuableScope continueSpan(
     return scope;
   }
 
+  public boolean isAsyncPropagationEnabled() {
+    ContinuableScope activeScope = scopeStack().active();
+    return activeScope != null && activeScope.isAsyncPropagating();
+  }
+
+  public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {
+    ContinuableScope activeScope = scopeStack().active();
+    if (activeScope != null) {
+      activeScope.setAsyncPropagation(asyncPropagationEnabled);
+    }
+  }
+
   public void closePrevious(final boolean finishSpan) {
     ScopeStack scopeStack = scopeStack();
 

dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java

@@ -117,11 +117,6 @@ public AgentSpan span() {
       return agentSpan;
     }
 
-    @Override
-    public byte source() {
-      return ScopeSource.MANUAL.id();
-    }
-
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java

@@ -6,8 +6,6 @@
 public interface AgentScope extends TraceScope, Closeable {
   AgentSpan span();
 
-  byte source();
-
   @Override
   void close();
 

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java

@@ -10,11 +10,6 @@ public AgentSpan span() {
     return NoopSpan.INSTANCE;
   }
 
-  @Override
-  public byte source() {
-    return 0;
-  }
-
   @Override
   public Continuation capture() {
     return NoopContinuation.INSTANCE;