RUM-9899: fix configuration

Author: satween

detekt_custom.yml

@@ -749,6 +749,7 @@ datadog:
       - "java.util.concurrent.atomic.AtomicLong.constructor(kotlin.Long)"
       - "java.util.concurrent.atomic.AtomicLong.get()"
       - "java.util.concurrent.atomic.AtomicLong.set(kotlin.Long)"
+      - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.core.CoreTracer?, com.datadog.trace.core.CoreTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.android.api.SdkCore?, com.datadog.android.api.SdkCore?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(io.opentracing.Tracer?, io.opentracing.Tracer?)"
       - "java.util.concurrent.atomic.AtomicReference.constructor()"
@@ -763,6 +764,7 @@ datadog:
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.SdkCore?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.feature.FeatureEventReceiver?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.rum.internal.domain.RumContext?)"
+      - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.trace.core.CoreTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.set(io.opentracing.Tracer?)"
       - "java.util.concurrent.atomic.AtomicReference.set(kotlin.Nothing?)"
       - "java.util.concurrent.atomic.AtomicReference.set(kotlin.String?)"

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

@@ -67,7 +67,7 @@
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-    import java.util.ArrayList;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;

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

@@ -27,21 +27,23 @@ fun Request.Builder.addParentSpan(span: Span): Request.Builder = apply {
             agentSpanContext.trace.setSamplingPriorityIfNecessary()
         }
         @Suppress("UnsafeThirdPartyFunctionCall") // the context will always be a TraceContext
-        tag(TraceContext::class.java, span.extractTraceContext())
+        tag(
+            TraceContext::class.java,
+            TraceContext(
+                span.spanContext.traceId,
+                span.spanContext.spanId,
+                agentSpanContext.samplingPriority
+            )
+        )
     } else {
         @Suppress("UnsafeThirdPartyFunctionCall") // the context will always be a TraceContext
-        tag(TraceContext::class.java, span.extractTraceContext())
+        tag(
+            TraceContext::class.java,
+            TraceContext(
+                span.spanContext.traceId,
+                span.spanContext.spanId,
+                if (span.spanContext.isSampled) PrioritySampling.USER_KEEP else PrioritySampling.UNSET
+            )
+        )
     }
 }
-
-private fun Span.extractTraceContext() = TraceContext(
-    spanContext.traceId,
-    spanContext.spanId,
-    if (spanContext.isSampled) PrioritySampling.USER_KEEP else PrioritySampling.UNSET
-)
-
-private fun OtelSpan.extractTraceContext() = TraceContext(
-    spanContext.traceId,
-    spanContext.spanId,
-    agentSpanContext.samplingPriority
-)

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

@@ -7,8 +7,8 @@
 package com.datadog.android.okhttp.trace
 
 import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import com.datadog.trace.core.CoreTracer
+import com.datadog.trace.bootstrap.instrumentation.api.AgentTracer
 
-typealias Tracer = CoreTracer
+typealias Tracer = AgentTracer.TracerAPI
 typealias Span = AgentSpan
 typealias SpanContext = AgentSpan.Context

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

@@ -27,6 +27,7 @@ import com.datadog.android.trace.AndroidTracer
 import com.datadog.android.trace.TracingHeaderType
 import com.datadog.legacy.trace.api.DDTags
 import com.datadog.legacy.trace.api.sampling.PrioritySampling
+import com.datadog.trace.api.config.TracerConfig
 import com.datadog.trace.api.interceptor.MutableSpan
 import com.datadog.trace.api.sampling.SamplingMechanism
 import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan
@@ -40,6 +41,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import java.net.HttpURLConnection
+import java.util.Properties
 import java.util.concurrent.atomic.AtomicReference
 
 /**
@@ -846,16 +848,19 @@ internal constructor(
         internal const val OKHTTP_INTERCEPTOR_HEADER_TYPES = "okhttp_interceptor_header_types"
 
         private const val AGENT_PSR_ATTRIBUTE = "_dd.agent_psr"
+
         private val DEFAULT_LOCAL_TRACER_FACTORY: (SdkCore, Set<TracingHeaderType>) -> Tracer =
-            { sdkCore, _: Set<TracingHeaderType> ->
+            { sdkCore, tracingHeaderTypes: Set<TracingHeaderType> ->
+                val propagationStyles = tracingHeaderTypes.joinToString(",")
                 CoreTracer.CoreTracerBuilder((sdkCore as FeatureSdkCore).internalLogger)
+                    .withProperties(
+                        Properties().apply {
+                            setProperty(TracerConfig.PROPAGATION_STYLE_EXTRACT, propagationStyles)
+                            setProperty(TracerConfig.PROPAGATION_STYLE_INJECT, propagationStyles)
+                        }
+                    )
                     .sampler(AllSampler())
                     .build()
-//                AndroidTracer.Builder(sdkCore)
-//                    // set sample rate to 100 to avoid sampling in the tracer, we are going to sample in the interceptor
-//                    .setSampleRate(ALL_IN_SAMPLE_RATE)
-//                    .setTracingHeaderTypes(tracingHeaderTypes)
-//                    .build()
             }
     }
 }