feedback

Author: mcculls

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

@@ -97,7 +97,7 @@ public byte source() {
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActiveSpan();
+        tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
         throw new RuntimeException("Tried to close scope when not on top");
       } else {

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

@@ -107,7 +107,7 @@ public byte source() {
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActiveSpan();
+        tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
         throw new RuntimeException("Tried to close scope when not on top");
       } else {

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

@@ -978,7 +978,7 @@ public AgentScope activeScope() {
   }
 
   @Override
-  public void closeActiveSpan() {
+  public void closeActive() {
     AgentScope activeScope = this.scopeManager.active();
     if (activeScope != null) {
       activeScope.close();

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

@@ -125,7 +125,7 @@ public byte source() {
     @Override
     public void close() {
       if (agentSpan == tracer.activeSpan()) {
-        tracer.closeActiveSpan();
+        tracer.closeActive();
       } else if (Config.get().isScopeStrictMode()) {
         throw new RuntimeException("Tried to close scope when not on top");
       } else {

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

@@ -122,11 +122,13 @@ public static AgentScope.Continuation captureSpan(final AgentSpan span) {
   }
 
   /**
-   * Closes the scope for the currently active span. Prefer closing the scope returned by {@link
-   * #activateSpan} when available.
+   * Closes the scope for the currently active span.
+   *
+   * @deprecated Prefer closing the scope returned by {@link #activateSpan} when available.
    */
-  public static void closeActiveSpan() {
-    get().closeActiveSpan();
+  @Deprecated
+  public static void closeActive() {
+    get().closeActive();
   }
 
   /**
@@ -318,6 +320,8 @@ AgentSpan startSpan(
 
     AgentScope.Continuation captureSpan(AgentSpan span);
 
+    void closeActive();
+
     void closePrevious(boolean finishSpan);
 
     AgentScope activateNext(AgentSpan span);
@@ -326,8 +330,6 @@ AgentSpan startSpan(
 
     AgentScope activeScope();
 
-    void closeActiveSpan();
-
     default AgentSpan blackholeSpan() {
       final AgentSpan active = activeSpan();
       return new BlackHoleSpan(active != null ? active.getTraceId() : DDTraceId.ZERO);
@@ -473,6 +475,9 @@ public boolean isAsyncPropagationEnabled() {
     @Override
     public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {}
 
+    @Override
+    public void closeActive() {}
+
     @Override
     public void closePrevious(final boolean finishSpan) {}
 
@@ -491,9 +496,6 @@ public AgentScope activeScope() {
       return null;
     }
 
-    @Override
-    public void closeActiveSpan() {}
-
     @Override
     public AgentSpan blackholeSpan() {
       return NoopSpan.INSTANCE; // no-op tracer stays no-op