RUM-9899: Getting rid from migration abstractions

Author: satween

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

@@ -813,7 +813,6 @@ public class com/datadog/opentracing/scopemanager/SimpleScope : com/datadog/open
 
 public class com/datadog/trace/api/Config {
 	public static final field PREFIX Ljava/lang/String;
-	public final field configProvider Lcom/datadog/trace/bootstrap/config/provider/ConfigProvider;
 	public static fun get ()Lcom/datadog/trace/api/Config;
 	public static fun get (Ljava/util/Properties;)Lcom/datadog/trace/api/Config;
 	public fun getBaggageMapping ()Ljava/util/Map;
@@ -2327,7 +2326,6 @@ public final class com/datadog/trace/bootstrap/config/provider/ConfigProvider {
 	public fun getStringNotEmpty (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 	public fun isEnabled (Ljava/lang/Iterable;Ljava/lang/String;Ljava/lang/String;Z)Z
 	public fun isSet (Ljava/lang/String;)Z
-	public fun toString ()Ljava/lang/String;
 	public static fun withPropertiesOverride (Ljava/util/Properties;)Lcom/datadog/trace/bootstrap/config/provider/ConfigProvider;
 }
 
@@ -2336,7 +2334,6 @@ public abstract class com/datadog/trace/bootstrap/config/provider/ConfigProvider
 	protected abstract fun get (Ljava/lang/String;)Ljava/lang/String;
 	public final fun get (Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
 	public abstract fun origin ()Lcom/datadog/trace/api/ConfigOrigin;
-	public abstract fun toString ()Ljava/lang/String;
 }
 
 public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentPropagation {

integrations/dd-sdk-android-okhttp/api/apiSurface

@@ -35,14 +35,11 @@ open class com.datadog.android.okhttp.trace.DeterministicTraceSampler : com.data
   constructor(Float)
   constructor(Double)
 fun okhttp3.Request.Builder.parentSpan(io.opentracing.Span): okhttp3.Request.Builder
-typealias Tracer = com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI
-typealias Span = com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
-typealias SpanContext = com.datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context
 interface com.datadog.android.okhttp.trace.TracedRequestListener
   fun onRequestIntercepted(okhttp3.Request, Span, okhttp3.Response?, Throwable?)
 open class com.datadog.android.okhttp.trace.TracingInterceptor : okhttp3.Interceptor
   override fun intercept(okhttp3.Interceptor.Chain): okhttp3.Response
-  protected open fun onRequestIntercepted(com.datadog.android.api.feature.FeatureSdkCore, okhttp3.Request, Span?, okhttp3.Response?, Throwable?)
+  protected open fun onRequestIntercepted(com.datadog.android.api.feature.FeatureSdkCore, okhttp3.Request, com.datadog.trace.bootstrap.instrumentation.api.AgentSpan?, okhttp3.Response?, Throwable?)
   class Builder : BaseBuilder<TracingInterceptor, Builder>
     constructor(Map<String, Set<com.datadog.android.trace.TracingHeaderType>>)
     constructor(List<String>)
@@ -53,7 +50,7 @@ open class com.datadog.android.okhttp.trace.TracingInterceptor : okhttp3.Interce
     fun setSdkInstanceName(String): R
     fun setTracedRequestListener(TracedRequestListener): R
     fun setTraceSampleRate(Float): R
-    fun setTraceSampler(com.datadog.android.core.sampling.Sampler<Span>): R
+    fun setTraceSampler(com.datadog.android.core.sampling.Sampler<com.datadog.trace.bootstrap.instrumentation.api.AgentSpan>): R
     fun setTraceContextInjection(com.datadog.android.okhttp.TraceContextInjection): R
     fun set404ResourcesRedacted(Boolean): R
     abstract fun build(): T

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

@@ -15,9 +15,7 @@ import com.datadog.android.core.configuration.Configuration
 import com.datadog.android.core.sampling.Sampler
 import com.datadog.android.okhttp.internal.rum.NoOpRumResourceAttributesProvider
 import com.datadog.android.okhttp.internal.rum.buildResourceId
-import com.datadog.android.okhttp.trace.Span
 import com.datadog.android.okhttp.trace.TracedRequestListener
-import com.datadog.android.okhttp.trace.Tracer
 import com.datadog.android.okhttp.trace.TracingInterceptor
 import com.datadog.android.rum.GlobalRumMonitor
 import com.datadog.android.rum.RumAttributes
@@ -30,6 +28,8 @@ import com.datadog.android.rum.internal.monitor.AdvancedNetworkRumMonitor
 import com.datadog.android.rum.tracking.ViewTrackingStrategy
 import com.datadog.android.trace.AndroidTracer
 import com.datadog.android.trace.TracingHeaderType
+import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
+import com.datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -74,11 +74,11 @@ open class DatadogInterceptor internal constructor(
     tracedHosts: Map<String, Set<TracingHeaderType>>,
     tracedRequestListener: TracedRequestListener,
     internal val rumResourceAttributesProvider: RumResourceAttributesProvider,
-    traceSampler: Sampler<Span>,
+    traceSampler: Sampler<AgentSpan>,
     traceContextInjection: TraceContextInjection,
     redacted404ResourceName: Boolean,
-    localTracerFactory: (SdkCore, Set<TracingHeaderType>) -> Tracer,
-    globalTracerProvider: () -> Tracer?
+    localTracerFactory: (SdkCore, Set<TracingHeaderType>) -> AgentTracer.TracerAPI,
+    globalTracerProvider: () -> AgentTracer.TracerAPI?
 ) : TracingInterceptor(
     sdkInstanceName,
     tracedHosts,
@@ -127,7 +127,7 @@ open class DatadogInterceptor internal constructor(
     override fun onRequestIntercepted(
         sdkCore: FeatureSdkCore,
         request: Request,
-        span: Span?,
+        span: AgentSpan?,
         response: Response?,
         throwable: Throwable?
     ) {
@@ -166,7 +166,7 @@ open class DatadogInterceptor internal constructor(
         sdkCore: FeatureSdkCore,
         request: Request,
         response: Response,
-        span: Span?,
+        span: AgentSpan?,
         isSampled: Boolean
     ) {
         val requestId = request.buildResourceId(generateUuid = false)

integrations/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/internal/utils/SpanSamplingIdProvider.kt

@@ -7,12 +7,12 @@
 package com.datadog.android.okhttp.internal.utils
 
 import com.datadog.android.log.LogAttributes
-import com.datadog.android.okhttp.trace.Span
+import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import com.datadog.trace.core.DDSpanContext
 
 internal object SpanSamplingIdProvider {
 
-    fun provideId(span: Span): ULong {
+    fun provideId(span: AgentSpan): ULong {
         val context = span.context()
         val sessionId = (context as? DDSpanContext)?.tags?.get(LogAttributes.RUM_SESSION_ID) as? String
 

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

@@ -9,6 +9,7 @@ package com.datadog.android.okhttp.trace
 import androidx.annotation.FloatRange
 import com.datadog.android.core.sampling.DeterministicSampler
 import com.datadog.android.okhttp.internal.utils.SpanSamplingIdProvider
+import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
 /**
  * A [DeterministicSampler] using the TraceID of a Span to compute the sampling decision.
@@ -18,7 +19,7 @@ import com.datadog.android.okhttp.internal.utils.SpanSamplingIdProvider
  */
 open class DeterministicTraceSampler(
     sampleRateProvider: () -> Float
-) : DeterministicSampler<Span>(
+) : DeterministicSampler<AgentSpan>(
     SpanSamplingIdProvider::provideId,
     sampleRateProvider
 ) {

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

@@ -7,6 +7,7 @@
 package com.datadog.android.okhttp.trace
 
 import com.datadog.tools.annotation.NoOpImplementation
+import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import okhttp3.Request
 import okhttp3.Response
 
@@ -28,7 +29,7 @@ interface TracedRequestListener {
      */
     fun onRequestIntercepted(
         request: Request,
-        span: Span,
+        span: AgentSpan,
         response: Response?,
         throwable: Throwable?
     )