Revert "RUM-9902 - fix tests, getting rid from TraceContext"

This reverts commit 4cfff41

# Conflicts:
#	integrations/dd-sdk-android-okhttp-otel/src/main/kotlin/com/datadog/android/okhttp/otel/OkHttpExt.kt
#	integrations/dd-sdk-android-okhttp-otel/src/test/kotlin/com/datadog/android/okhttp/otel/OkHttpExtTest.kt

Author: satween

features/dd-sdk-android-trace-api/api/apiSurface

@@ -46,11 +46,9 @@ object com.datadog.android.trace.api.DatadogTracingConstants
 interface com.datadog.android.trace.api.propagation.DatadogPropagation
   fun <C> inject(com.datadog.android.trace.api.span.DatadogSpanContext, C, (C) -> Unit)
   fun <C> extract(C, (C) -> Unit): com.datadog.android.trace.api.span.DatadogSpanContext?
-  fun isExtractedContext(com.datadog.android.trace.api.span.DatadogSpanContext): Boolean
 class com.datadog.android.trace.api.propagation.NoOpDatadogPropagation : DatadogPropagation
   override fun <C> inject(com.datadog.android.trace.api.span.DatadogSpanContext, C, (C) -> Unit)
   override fun <C> extract(C, (C) -> Unit): com.datadog.android.trace.api.span.DatadogSpanContext?
-  override fun isExtractedContext(com.datadog.android.trace.api.span.DatadogSpanContext)
 interface com.datadog.android.trace.api.scope.DatadogScope : java.io.Closeable
   override fun close()
 interface com.datadog.android.trace.api.span.DatadogSpan

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

@@ -64,14 +64,12 @@ public final class com/datadog/android/trace/api/DatadogTracingConstants$TracerC
 public abstract interface class com/datadog/android/trace/api/propagation/DatadogPropagation {
 	public abstract fun extract (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Lcom/datadog/android/trace/api/span/DatadogSpanContext;
 	public abstract fun inject (Lcom/datadog/android/trace/api/span/DatadogSpanContext;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
-	public abstract fun isExtractedContext (Lcom/datadog/android/trace/api/span/DatadogSpanContext;)Z
 }
 
 public final class com/datadog/android/trace/api/propagation/NoOpDatadogPropagation : com/datadog/android/trace/api/propagation/DatadogPropagation {
 	public fun <init> ()V
 	public fun extract (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Lcom/datadog/android/trace/api/span/DatadogSpanContext;
 	public fun inject (Lcom/datadog/android/trace/api/span/DatadogSpanContext;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
-	public fun isExtractedContext (Lcom/datadog/android/trace/api/span/DatadogSpanContext;)Z
 }
 
 public abstract interface class com/datadog/android/trace/api/scope/DataScopeListener {

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/propagation/DatadogPropagation.kt

@@ -47,12 +47,4 @@ interface DatadogPropagation {
         carrier: C,
         getter: (carrier: C, classifier: (String, String) -> Boolean) -> Unit
     ): DatadogSpanContext?
-
-    /**
-     * Determines if the provided [DatadogSpanContext] represents an extracted context.
-     *
-     * @param context The DatadogSpanContext to be evaluated.
-     * @return True if the context is identified as an extracted context, otherwise false.
-     */
-    fun isExtractedContext(context: DatadogSpanContext): Boolean
 }

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/propagation/NoOpDatadogPropagation.kt

@@ -25,6 +25,4 @@ class NoOpDatadogPropagation : DatadogPropagation {
         carrier: C,
         getter: (carrier: C, classifier: (String, String) -> Boolean) -> Unit
     ): DatadogSpanContext? = null
-
-    override fun isExtractedContext(context: DatadogSpanContext) = false
 }

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

@@ -191,6 +191,7 @@ public final class com/datadog/trace/api/DDSpanId {
 	public static fun from (Ljava/lang/String;)J
 	public static fun fromHex (Ljava/lang/String;)J
 	public static fun fromHex (Ljava/lang/String;IIZ)J
+	public static fun fromHexOrDefault (Ljava/lang/String;J)J
 	public static fun toHexString (J)Ljava/lang/String;
 	public static fun toHexStringPadded (J)Ljava/lang/String;
 	public static fun toString (J)Ljava/lang/String;

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

@@ -36,6 +36,21 @@ public static long fromHex(String s) throws NumberFormatException {
     return LongStringUtils.parseUnsignedLongHex(s);
   }
 
+  /**
+   * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
+   *
+   * @param s String in hex of unsigned 64 bit id
+   * @return long created from parsing sting or defaultValue if there was NumberFormatException during parsing
+   */
+  public static long fromHexOrDefault(String s, long defaultValue) {
+    try {
+      return fromHex(s);
+    } catch (NumberFormatException e) {
+      return defaultValue;
+    }
+
+  }
+
   /**
    * Parse the span id from the given {@code String} hex representation of the unsigned 64 bit id.
    *

features/dd-sdk-android-trace/api/apiSurface

@@ -22,12 +22,16 @@ data class com.datadog.android.trace.TraceConfiguration
     fun build(): TraceConfiguration
 interface com.datadog.android.trace.event.SpanEventMapper : com.datadog.android.event.EventMapper<com.datadog.android.trace.model.SpanEvent>
   override fun map(com.datadog.android.trace.model.SpanEvent): com.datadog.android.trace.model.SpanEvent
-interface com.datadog.android.trace.internal.DatadogSpanIdConverter
+class com.datadog.android.trace.internal.DatadogPropagationHelper
+  fun isExtractedContext(com.datadog.android.trace.api.span.DatadogSpanContext): Boolean
+  fun createExtractedContext(String, String, Int): com.datadog.android.trace.api.span.DatadogSpanContext
+class com.datadog.android.trace.internal.DatadogSpanIdConverter
   fun fromHex(String): Long
   fun toHexStringPadded(Long): String
 fun com.datadog.android.trace.api.trace.DatadogTraceId.Companion.fromHex(String): com.datadog.android.trace.api.trace.DatadogTraceId
 object com.datadog.android.trace.internal.DatadogTracingToolkit
   val spanIdConverter: DatadogSpanIdConverter
+  var propagationHelper: DatadogPropagationHelper
   var spanLogger: com.datadog.android.trace.api.span.DatadogSpanLogger
   fun setTracingSamplingPriorityIfNecessary(com.datadog.android.trace.api.span.DatadogSpanContext)
   fun setTraceId128BitGenerationEnabled(com.datadog.android.trace.api.tracer.DatadogTracerBuilder): com.datadog.android.trace.api.tracer.DatadogTracerBuilder

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

@@ -52,9 +52,14 @@ public abstract interface class com/datadog/android/trace/event/SpanEventMapper
 	public abstract fun map (Lcom/datadog/android/trace/model/SpanEvent;)Lcom/datadog/android/trace/model/SpanEvent;
 }
 
-public abstract interface class com/datadog/android/trace/internal/DatadogSpanIdConverter {
-	public abstract fun fromHex (Ljava/lang/String;)J
-	public abstract fun toHexStringPadded (J)Ljava/lang/String;
+public final class com/datadog/android/trace/internal/DatadogPropagationHelper {
+	public final fun createExtractedContext (Ljava/lang/String;Ljava/lang/String;I)Lcom/datadog/android/trace/api/span/DatadogSpanContext;
+	public final fun isExtractedContext (Lcom/datadog/android/trace/api/span/DatadogSpanContext;)Z
+}
+
+public final class com/datadog/android/trace/internal/DatadogSpanIdConverter {
+	public final fun fromHex (Ljava/lang/String;)J
+	public final fun toHexStringPadded (J)Ljava/lang/String;
 }
 
 public final class com/datadog/android/trace/internal/DatadogTraceExtKt {
@@ -64,6 +69,7 @@ public final class com/datadog/android/trace/internal/DatadogTraceExtKt {
 public final class com/datadog/android/trace/internal/DatadogTracingToolkit {
 	public static final field INSTANCE Lcom/datadog/android/trace/internal/DatadogTracingToolkit;
 	public static final field spanIdConverter Lcom/datadog/android/trace/internal/DatadogSpanIdConverter;
+	public final fun getPropagationHelper ()Lcom/datadog/android/trace/internal/DatadogPropagationHelper;
 	public final fun getSpanLogger ()Lcom/datadog/android/trace/api/span/DatadogSpanLogger;
 	public final fun setTraceId128BitGenerationEnabled (Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public final fun setTracingSamplingPriorityIfNecessary (Lcom/datadog/android/trace/api/span/DatadogSpanContext;)V

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

@@ -9,7 +9,6 @@ package com.datadog.android.trace.internal
 import com.datadog.android.trace.api.propagation.DatadogPropagation
 import com.datadog.android.trace.api.span.DatadogSpanContext
 import com.datadog.trace.bootstrap.instrumentation.api.AgentPropagation
-import com.datadog.trace.core.propagation.ExtractedContext
 
 internal class DatadogPropagationAdapter(private val delegate: AgentPropagation) : DatadogPropagation {
 
@@ -29,9 +28,4 @@ internal class DatadogPropagationAdapter(private val delegate: AgentPropagation)
         return delegate.extract(carrier) { car, cls -> getter(car, cls::accept) }
             ?.let { DatadogSpanContextAdapter(it) }
     }
-
-    override fun isExtractedContext(context: DatadogSpanContext): Boolean {
-        if (context !is DatadogSpanContextAdapter) return false
-        return context.delegate is ExtractedContext
-    }
 }

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

@@ -0,0 +1,53 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+package com.datadog.android.trace.internal
+
+import com.datadog.android.lint.InternalApi
+import com.datadog.android.trace.api.span.DatadogSpanContext
+import com.datadog.trace.api.DDSpanId
+import com.datadog.trace.api.DDTraceId
+import com.datadog.trace.core.propagation.ExtractedContext
+
+/**
+ * For internal usage only.
+ * Helper class for handling Datadog context propagation.
+ */
+@InternalApi
+class DatadogPropagationHelper internal constructor() {
+    /**
+     * Determines if the provided [DatadogSpanContext] represents an extracted context.
+     *
+     * @param context The DatadogSpanContext to be evaluated.
+     * @return True if the context is identified as an extracted context, otherwise false.
+     */
+    fun isExtractedContext(context: DatadogSpanContext): Boolean {
+        if (context !is DatadogSpanContextAdapter) return false
+        return context.delegate is ExtractedContext
+    }
+
+    /**
+     * Creates a `DatadogSpanContext` object that represents an extracted context from the given parameters.
+     *
+     * @param traceId The unique identifier for the trace.
+     * @param spanId The unique identifier for the span.
+     * @param samplingPriority The sampling priority value for determining the trace's sampling behavior.
+     * @return A `DatadogSpanContext` instance containing the extracted context.
+     */
+    fun createExtractedContext(
+        traceId: String,
+        spanId: String,
+        samplingPriority: Int
+    ): DatadogSpanContext = DatadogSpanContextAdapter(
+        ExtractedContext(
+            DDTraceId.fromHexOrDefault(traceId, DDTraceId.ZERO),
+            DDSpanId.fromHexOrDefault(spanId, DDSpanId.ZERO),
+            samplingPriority,
+            null,
+            null,
+            null
+        )
+    )
+}