From 760506ae43fa49d41b7097703994b6de37a8a572 Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Mon, 10 Mar 2025 16:09:34 +0000
Subject: [PATCH] Remove unused activeScope method (#8531)

---
 .../main/java/datadog/trace/core/CoreTracer.java    |  5 -----
 .../bootstrap/instrumentation/api/AgentTracer.java  | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
index 1a63eb22832..d629b1820ab 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -965,11 +965,6 @@ public AgentSpan activeSpan() {
     return scopeManager.activeSpan();
   }
 
-  @Override
-  public AgentScope activeScope() {
-    return scopeManager.active();
-  }
-
   @Override
   public void checkpointActiveForRollback() {
     this.scopeManager.checkpointActiveForRollback();
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
index 0a72dcf03ad..0ea77358500 100644
--- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
@@ -189,12 +189,6 @@ public static AgentSpan activeSpan() {
     return get().activeSpan();
   }
 
-  /** @deprecated To be removed, do not use. */
-  @Deprecated
-  public static AgentScope activeScope() {
-    return get().activeScope();
-  }
-
   /**
    * Checks whether asynchronous propagation is enabled, meaning this context will propagate across
    * asynchronous boundaries.
@@ -368,8 +362,6 @@ AgentSpan startSpan(
 
     AgentSpan activeSpan();
 
-    AgentScope activeScope();
-
     default AgentSpan blackholeSpan() {
       final AgentSpan active = activeSpan();
       return new BlackHoleSpan(active != null ? active.getTraceId() : DDTraceId.ZERO);
@@ -539,11 +531,6 @@ public AgentSpan activeSpan() {
       return NoopSpan.INSTANCE;
     }
 
-    @Override
-    public AgentScope activeScope() {
-      return null;
-    }
-
     @Override
     public AgentSpan blackholeSpan() {
       return NoopSpan.INSTANCE; // no-op tracer stays no-op