RUM-9899: getting rid from deprecated & unused code (ScopeState & ScopeStateAware)

Author: satween

features/dd-sdk-android-trace-internal/api/dd-sdk-android-trace-internal.api

@@ -2290,7 +2290,7 @@ public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/
 	public abstract fun getSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
 }
 
-public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentScopeManager : com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
+public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentScopeManager {
 	public abstract fun activate (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
 	public abstract fun activate (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
 	public abstract fun activateNext (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
@@ -2590,7 +2590,7 @@ public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/
 	public abstract fun withTag (Ljava/lang/String;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentTracer$SpanBuilder;
 }
 
-public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$TracerAPI : com/datadog/trace/api/EndpointCheckpointer, com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
+public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$TracerAPI : com/datadog/trace/api/EndpointCheckpointer {
 	public abstract fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
 	public abstract fun activateSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;Z)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope;
 	public abstract fun activeSpan ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
@@ -2790,15 +2790,6 @@ public final class com/datadog/trace/bootstrap/instrumentation/api/ScopeSource :
 	public static fun values ()[Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeSource;
 }
 
-public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/ScopeState {
-	public abstract fun activate ()V
-	public abstract fun fetchFromActive ()V
-}
-
-public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware {
-	public abstract fun newScopeState ()Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeState;
-}
-
 public class com/datadog/trace/bootstrap/instrumentation/api/SpanLink : com/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink {
 	protected fun <init> (Lcom/datadog/trace/api/DDTraceId;JBLjava/lang/String;Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink$Attributes;)V
 	public fun attributes ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpanLink$Attributes;
@@ -3361,7 +3352,6 @@ public class com/datadog/trace/core/CoreTracer : com/datadog/trace/bootstrap/ins
 	public fun getTagInterceptor ()Lcom/datadog/trace/core/taginterceptor/TagInterceptor;
 	public fun getTraceId ()Ljava/lang/String;
 	public fun getTraceId (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Ljava/lang/String;
-	public fun newScopeState ()Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeState;
 	public fun onRootSpanFinished (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;Lcom/datadog/trace/api/EndpointTracker;)V
 	public fun onRootSpanStarted (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/api/EndpointTracker;
 	public fun propagate ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentPropagation;
@@ -3969,7 +3959,6 @@ public final class com/datadog/trace/core/scopemanager/ContinuableScopeManager :
 	public fun addScopeListener (Lcom/datadog/trace/api/scopemanager/ScopeListener;)V
 	public fun captureSpan (Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentScope$Continuation;
 	public fun closePrevious (Z)V
-	public fun newScopeState ()Lcom/datadog/trace/bootstrap/instrumentation/api/ScopeState;
 }
 
 public class com/datadog/trace/core/taginterceptor/RuleFlags {

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/AgentScopeManager.java

@@ -3,7 +3,7 @@
 /**
  * Allows custom scope managers. See OTScopeManager, CustomScopeManager, and ContextualScopeManager
  */
-public interface AgentScopeManager extends ScopeStateAware {
+public interface AgentScopeManager {
 
   AgentScope activate(AgentSpan span, ScopeSource source);
 

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

@@ -30,7 +30,7 @@ public class AgentTracer {
   // Not intended to be constructed.
   private AgentTracer() {}
 
-  public interface TracerAPI extends EndpointCheckpointer, ScopeStateAware {
+  public interface TracerAPI extends EndpointCheckpointer {
 
     /**
      * Create and start a new span.

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/ScopeState.java

@@ -40,7 +40,6 @@
 import com.datadog.trace.bootstrap.instrumentation.api.PathwayContext;
 import com.datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import com.datadog.trace.bootstrap.instrumentation.api.ScopeSource;
-import com.datadog.trace.bootstrap.instrumentation.api.ScopeState;
 import com.datadog.trace.bootstrap.instrumentation.api.TagContext;
 import com.datadog.trace.common.metrics.MetricsAggregator;
 import com.datadog.trace.common.metrics.NoOpMetricsAggregator;
@@ -205,11 +204,6 @@ public EndpointTracker onRootSpanStarted(AgentSpan root) {
         return endpointCheckpointer.onRootSpanStarted(root);
     }
 
-    @Override
-    public ScopeState newScopeState() {
-        return scopeManager.newScopeState();
-    }
-
     public static class CoreTracerBuilder {
 
         private Config config;

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/ScopeStateAware.java

@@ -17,7 +17,6 @@
 import com.datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import com.datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import com.datadog.trace.bootstrap.instrumentation.api.ScopeSource;
-import com.datadog.trace.bootstrap.instrumentation.api.ScopeState;
 import com.datadog.trace.core.monitor.HealthMetrics;
 import com.datadog.trace.logger.Logger;
 import com.datadog.trace.logger.LoggerFactory;
@@ -320,26 +319,6 @@ ScopeStack scopeStack() {
         return this.tlsScopeStack.get();
     }
 
-    @Override
-    public ScopeState newScopeState() {
-        return new ContinuableScopeState();
-    }
-
-    private class ContinuableScopeState implements ScopeState {
-
-        private ScopeStack localScopeStack = tlsScopeStack.initialValue();
-
-        @Override
-        public void activate() {
-            tlsScopeStack.set(localScopeStack);
-        }
-
-        @Override
-        public void fetchFromActive() {
-            localScopeStack = tlsScopeStack.get();
-        }
-    }
-
     static final class ScopeStackThreadLocal extends ThreadLocal<ScopeStack> {
 
         private final ProfilingContextIntegration profilingContextIntegration;

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/core/CoreTracer.java

@@ -27,7 +27,7 @@ public final class com/datadog/android/trace/AndroidTracer$Companion {
 }
 
 public final class com/datadog/android/trace/DatadogTracer {
-	public static final field INSTANCE Lcom/datadog/android/trace/DatadogTracer;
+	public fun <init> ()V
 }
 
 public abstract interface class com/datadog/android/trace/InternalCoreWriterProvider {