RUM-9899: fix test compilation reverting and fixing TODOs

Author: satween

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

@@ -1803,6 +1803,7 @@ public final class com/datadog/trace/api/gateway/RequestContextSlot : java/lang/
 }
 
 public abstract interface class com/datadog/trace/api/interceptor/MutableSpan {
+	public abstract fun drop ()V
 	public abstract fun getDurationNano ()J
 	public abstract fun getLocalRootSpan ()Lcom/datadog/trace/api/interceptor/MutableSpan;
 	public abstract fun getOperationName ()Ljava/lang/CharSequence;
@@ -2525,6 +2526,7 @@ public final class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$N
 	public fun addThrowable (Ljava/lang/Throwable;B)Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan;
 	public fun beginEndToEnd ()V
 	public fun context ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan$Context;
+	public fun drop ()V
 	public fun eligibleForDropping ()Z
 	public fun finish ()V
 	public fun finish (J)V
@@ -3550,6 +3552,7 @@ public class com/datadog/trace/core/DDSpan : com/datadog/trace/api/profiling/Tra
 	public fun beginEndToEnd ()V
 	public synthetic fun context ()Lcom/datadog/trace/bootstrap/instrumentation/api/AgentSpan$Context;
 	public final fun context ()Lcom/datadog/trace/core/DDSpanContext;
+	public fun drop ()V
 	public fun eligibleForDropping ()Z
 	public fun finish ()V
 	public fun finish (J)V
@@ -3838,6 +3841,7 @@ public class com/datadog/trace/core/PendingTrace : com/datadog/trace/bootstrap/i
 	public fun setSamplingPriorityIfNecessary ()V
 	public fun size ()I
 	public fun touch ()V
+	public fun unregisterSpan (Lcom/datadog/trace/core/DDSpan;)V
 	public fun write ()V
 	public fun writeOnBufferFull ()Z
 }

features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/api/interceptor/MutableSpan.java

@@ -78,4 +78,6 @@ default Object getTag(String key) {
    * @return The root span for the current trace fragment.
    */
   MutableSpan getLocalRootSpan();
+
+  void drop();
 }

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

@@ -4,6 +4,7 @@
 
 import androidx.annotation.Nullable;
 
+import com.datadog.android.trace.internal.compat.function.Consumer;
 import com.datadog.trace.api.DDSpanId;
 import com.datadog.trace.api.DDTraceId;
 import com.datadog.trace.api.EndpointCheckpointer;
@@ -19,13 +20,12 @@
 import com.datadog.trace.api.scopemanager.ScopeListener;
 import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import com.datadog.android.trace.internal.compat.function.Consumer;
-
-import org.jetbrains.annotations.NotNull;
 
 public class AgentTracer {
   private static final String DEFAULT_INSTRUMENTATION_NAME = "datadog";
@@ -420,6 +420,9 @@ public AgentSpan setBaggageItem(final String key, final String value) {
       return this;
     }
 
+    @Override
+    public void drop() {}
+
     @Override
     public void finish() {}
 

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

@@ -322,6 +322,11 @@ public DDSpan getLocalRootSpan() {
     return context.getTrace().getRootSpan();
   }
 
+  @Override
+  public void drop() {
+    context.getTrace().unregisterSpan(this);
+  }
+
   /**
    * Checks whether the span is also the local root span
    *

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

@@ -223,6 +223,13 @@ void registerSpan(final DDSpan span) {
         }
     }
 
+    public void unregisterSpan(final DDSpan span){
+        PENDING_REFERENCE_COUNT.decrementAndGet(this);
+        if (pendingTraceBuffer.longRunningSpansEnabled()){
+            spans.remove(span);
+        }
+    }
+
     void trackRunningTrace(final DDSpan span) {
         if (!compareAndSetLongRunningState(
                 LongRunningTracesTracker.UNDEFINED, LongRunningTracesTracker.TO_TRACK)) {

integrations/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/trace/TracingInterceptor.kt

@@ -615,10 +615,6 @@ internal constructor(
         }
     }
 
-    private fun Span.drop() {
-        // TODO (this as? MutableSpan)?.drop()
-    }
-
     private fun Span.sample(request: Request): Boolean {
         val samplingPriority = (this as? DDSpan)?.samplingPriority
         return if (samplingPriority != null) {

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/DatadogInterceptorWithoutTracesTest.kt

@@ -85,7 +85,7 @@ import java.util.Locale
     ExtendWith(TestConfigurationExtension::class)
 )
 @MockitoSettings(strictness = Strictness.LENIENT)
-@ForgeConfiguration(BaseConfigurator::class)
+@ForgeConfiguration(value = BaseConfigurator::class, seed = 0x76e0a392b31aL)
 internal class DatadogInterceptorWithoutTracesTest {
 
     lateinit var testedInterceptor: TracingInterceptor
@@ -156,8 +156,8 @@ internal class DatadogInterceptorWithoutTracesTest {
     fun `set up`(forge: Forge) {
         fakeTraceId = forge.aDDTraceId(fakeTraceIdString)
         mockSpanContext = forge.newSpanContextMock(fakeTraceId, fakeSpanId)
-        mockSpanBuilder = forge.newSpanBuilderMock(context = mockSpanContext)
         mockSpan = forge.newSpanMock(mockSpanContext)
+        mockSpanBuilder = forge.newSpanBuilderMock(mockSpan, mockSpanContext)
         mockPropagation = newAgentPropagationMock()
         mockLocalTracer = forge.newTracerMock(mockSpanBuilder, mockPropagation)
 
@@ -367,8 +367,7 @@ internal class DatadogInterceptorWithoutTracesTest {
         val response = testedInterceptor.intercept(mockChain)
 
         verify(mockSpanBuilder).withOrigin(DatadogInterceptor.ORIGIN_RUM)
-        //// TODO - fix drop method
-//        verify(mockSpan).drop()
+        verify(mockSpan).drop()
         assertThat(response).isSameAs(fakeResponse)
     }
 
@@ -382,10 +381,9 @@ internal class DatadogInterceptorWithoutTracesTest {
         val response = testedInterceptor.intercept(mockChain)
 
         verify(mockSpanBuilder).withOrigin(DatadogInterceptor.ORIGIN_RUM)
-        verify(mockSpan as MutableSpan).setResourceName(fakeUrl.lowercase(Locale.US))
-        verify(mockSpan as MutableSpan).setError(true)
-        // TODO - fix drop method
-//        verify(mockSpan).drop()
+        verify(mockSpan).setResourceName(fakeUrl.lowercase(Locale.US))
+        verify(mockSpan).setError(true)
+        verify(mockSpan).drop()
         assertThat(response).isSameAs(fakeResponse)
     }