RUM-9899: making

 fun activateSpan(span: DatadogSpan, asyncPropagating: Boolean): DatadogScope?

internal

Author: satween

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/tracer/DatadogTracer.kt

@@ -42,17 +42,6 @@ interface DatadogTracer {
      */
     fun activateSpan(span: DatadogSpan): DatadogScope?
 
-    /**
-     * Activates the provided span within the current context of the tracer.
-     * If `asyncPropagating` is set to true, the span is propagated asynchronously.
-     * Once activated, the span becomes the currently active span until it is explicitly deactivated.
-     *
-     * @param span The span to be activated. Represents the logical unit of work being traced.
-     * @param asyncPropagating If true, this context will propagate across async boundaries.
-     * @return An instance of [DatadogScope] representing the activated scope.
-     */
-    fun activateSpan(span: DatadogSpan, asyncPropagating: Boolean): DatadogScope?
-
     /**
      * Creates a new span builder instance with the specified span name.
      *

features/dd-sdk-android-trace-otel/src/main/java/com/datadog/opentelemetry/trace/OtelSpan.java

@@ -153,7 +153,7 @@ public boolean isRecording() {
   }
 
   public DatadogScope activate() {
-    return agentTracer.activateSpan(this.delegate, DEFAULT_ASYNC_PROPAGATING);
+    return DatadogTracingToolkit.activateSpan(agentTracer, this.delegate, DEFAULT_ASYNC_PROPAGATING);
   }
 
   public DatadogSpan getDatadogSpan() {

features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/DatadogTracerAdapter.kt

@@ -67,13 +67,13 @@ internal class DatadogTracerAdapter(
         )
     }
 
-    override fun activateSpan(span: DatadogSpan, asyncPropagating: Boolean): DatadogScope? {
+    override fun propagate(): DatadogPropagation = DatadogPropagationAdapter(internalLogger, delegate.propagate())
+
+    internal fun activateSpan(span: DatadogSpan, asyncPropagating: Boolean): DatadogScope? {
         return (span as? DatadogSpanAdapter)?.let {
             DatadogScopeAdapter(
                 delegate.activateSpan(span.delegate, ScopeSource.INSTRUMENTATION, asyncPropagating) ?: return null
             )
         }
     }
-
-    override fun propagate(): DatadogPropagation = DatadogPropagationAdapter(internalLogger, delegate.propagate())
 }

features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/DatadogTracingToolkit.kt

@@ -6,8 +6,10 @@
 package com.datadog.android.trace.internal
 
 import com.datadog.android.lint.InternalApi
+import com.datadog.android.trace.api.scope.DatadogScope
 import com.datadog.android.trace.api.span.DatadogSpan
 import com.datadog.android.trace.api.span.DatadogSpanContext
+import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.android.trace.api.tracer.DatadogTracerBuilder
 
 /**
@@ -71,4 +73,19 @@ object DatadogTracingToolkit {
     fun addThrowable(span: DatadogSpan, throwable: Throwable, errorPriority: Byte) {
         (span as? DatadogSpanAdapter)?.addThrowable(throwable, errorPriority)
     }
+
+    /**
+     * Activates the provided span within the current context of the tracer.
+     * If `asyncPropagating` is set to true, the span is propagated asynchronously.
+     * Once activated, the span becomes the currently active span until it is explicitly deactivated.
+     *
+     * @param tracer The tracer instance to be used for activation.
+     * @param span The span to be activated. Represents the logical unit of work being traced.
+     * @param asyncPropagating If true, this context will propagate across async boundaries.
+     * @return An instance of [DatadogScope] representing the activated scope.
+     */
+    @JvmStatic // this method is called from OTel code, written in java
+    fun activateSpan(tracer: DatadogTracer, span: DatadogSpan, asyncPropagating: Boolean): DatadogScope? {
+        return (tracer as? DatadogTracerAdapter)?.activateSpan(span, asyncPropagating)
+    }
 }