RUM-9899: fix merging issues

Author: satween

features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerBuilderProviderTest.kt

@@ -16,7 +16,6 @@ import com.datadog.android.internal.concurrent.CompletableFuture
 import com.datadog.android.trace.InternalCoreWriterProvider
 import com.datadog.android.trace.TracingHeaderType
 import com.datadog.android.trace.internal.SpanAttributes
-import com.datadog.android.trace.opentelemetry.internal.NoOpCoreTracerWriter
 import com.datadog.android.trace.opentelemetry.utils.verifyLog
 import com.datadog.android.utils.forge.Configurator
 import com.datadog.opentelemetry.trace.OtelSpan

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

@@ -17,7 +17,7 @@ class com.datadog.android.okhttp.DatadogEventListener : okhttp3.EventListener
     override fun create(okhttp3.Call): okhttp3.EventListener
 open class com.datadog.android.okhttp.DatadogInterceptor : com.datadog.android.okhttp.trace.TracingInterceptor
   override fun intercept(okhttp3.Interceptor.Chain): okhttp3.Response
-  override fun onRequestIntercepted(com.datadog.android.api.feature.FeatureSdkCore, okhttp3.Request, com.datadog.android.okhttp.trace.Span?, okhttp3.Response?, Throwable?)
+  override fun onRequestIntercepted(com.datadog.android.api.feature.FeatureSdkCore, okhttp3.Request, com.datadog.trace.bootstrap.instrumentation.api.AgentSpan?, okhttp3.Response?, Throwable?)
   override fun canSendSpan(): Boolean
   override fun onSdkInstanceReady(com.datadog.android.core.InternalSdkCore)
   class Builder : BaseBuilder<DatadogInterceptor, Builder>
@@ -30,13 +30,13 @@ data class com.datadog.android.okhttp.TraceContext
 enum com.datadog.android.okhttp.TraceContextInjection
   - ALL
   - SAMPLED
-open class com.datadog.android.okhttp.trace.DeterministicTraceSampler : com.datadog.android.core.sampling.DeterministicSampler<Span>
+open class com.datadog.android.okhttp.trace.DeterministicTraceSampler : com.datadog.android.core.sampling.DeterministicSampler<com.datadog.trace.bootstrap.instrumentation.api.AgentSpan>
   constructor(() -> Float)
   constructor(Float)
   constructor(Double)
 fun okhttp3.Request.Builder.parentSpan(io.opentracing.Span): okhttp3.Request.Builder
 interface com.datadog.android.okhttp.trace.TracedRequestListener
-  fun onRequestIntercepted(okhttp3.Request, Span, okhttp3.Response?, Throwable?)
+  fun onRequestIntercepted(okhttp3.Request, com.datadog.trace.bootstrap.instrumentation.api.AgentSpan, 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, com.datadog.trace.bootstrap.instrumentation.api.AgentSpan?, okhttp3.Response?, Throwable?)