RUM-9902: post review fixes

Author: satween

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/CastExt.kt

@@ -1084,6 +1084,7 @@ datadog:
       - "kotlin.collections.MutableMap.isEmpty()"
       - "kotlin.collections.MutableMap.isNotEmpty()"
       - "kotlin.collections.MutableMap.iterator()"
+      - "kotlin.collections.MutableMap.orEmpty()"
       - "kotlin.collections.MutableMap.map(kotlin.Function1)"
       - "kotlin.collections.MutableMap.mapValues(kotlin.Function1)"
       - "kotlin.collections.MutableMap.put(kotlin.Any?, kotlin.Any?)"

detekt_custom.yml

@@ -45,8 +45,7 @@ import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
 import com.datadog.android.telemetry.model.TelemetryDebugEvent
 import com.datadog.android.telemetry.model.TelemetryErrorEvent
 import com.datadog.android.telemetry.model.TelemetryUsageEvent
-import com.datadog.android.trace.GlobalDatadogTracerHolder
-import com.datadog.android.trace.api.clear
+import com.datadog.android.trace.GlobalDatadogTracer
 import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.tools.unit.forge.aThrowable
 import fr.xgouchet.elmyr.Forge
@@ -224,7 +223,7 @@ internal class TelemetryEventHandlerTest {
 
     @AfterEach
     fun `tear down`() {
-        GlobalDatadogTracerHolder.clear()
+        GlobalDatadogTracer.clear()
     }
 
     // region Debug Event
@@ -615,7 +614,7 @@ internal class TelemetryEventHandlerTest {
         if (useTracer) {
             whenever(mockSdkCore.getFeature(Feature.TRACING_FEATURE_NAME)) doReturn mock()
             if (tracerApi == TelemetryEventHandler.TracerApi.OpenTracing) {
-                GlobalDatadogTracerHolder.registerIfAbsent(mock<DatadogTracer>())
+                GlobalDatadogTracer.registerIfAbsent(mock<DatadogTracer>())
             } else if (tracerApi == TelemetryEventHandler.TracerApi.OpenTelemetry) {
                 fakeDatadogContext = fakeDatadogContext.copy(
                     featuresContext = fakeDatadogContext.featuresContext.toMutableMap().apply {

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt

@@ -45,18 +45,13 @@ object com.datadog.android.trace.api.DatadogTracingConstants
     const val ERROR_MSG: String
     const val ERROR_TYPE: String
 interface com.datadog.android.trace.api.propagation.DatadogPropagation
-  fun <C> inject(com.datadog.android.trace.api.span.DatadogSpan, C, (C) -> Unit)
   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
-  fun createExtractedContext(String, String, Int): com.datadog.android.trace.api.span.DatadogSpanContext
 class com.datadog.android.trace.api.propagation.NoOpDatadogPropagation : DatadogPropagation
-  override fun <C> inject(com.datadog.android.trace.api.span.DatadogSpan, C, (C) -> Unit)
   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)
-  override fun createExtractedContext(String, String, Int): com.datadog.android.trace.api.span.DatadogSpanContext
-interface com.datadog.android.trace.api.sampling.DatadogTracerSampler
 interface com.datadog.android.trace.api.scope.DatadogScope : java.io.Closeable
   override fun close()
 interface com.datadog.android.trace.api.span.DatadogSpan
@@ -69,7 +64,7 @@ interface com.datadog.android.trace.api.span.DatadogSpan
   var serviceName: String
   var operationName: String
   val durationNano: Long
-  val startTime: Long
+  val startTimeNano: Long
   val localRootSpan: DatadogSpan?
   fun context(): DatadogSpanContext
   fun finish()
@@ -84,7 +79,6 @@ interface com.datadog.android.trace.api.span.DatadogSpan
   fun setTag(String?, Any?)
   fun getTag(String?): Any?
   fun setMetric(String, Int)
-  fun forceSamplingDecision()
 interface com.datadog.android.trace.api.span.DatadogSpanBuilder
   fun start(): DatadogSpan
   fun withOrigin(String?): DatadogSpanBuilder
@@ -101,13 +95,9 @@ interface com.datadog.android.trace.api.span.DatadogSpanContext
   val traceId: com.datadog.android.trace.api.trace.DatadogTraceId
   val spanId: Long
   val samplingPriority: Int
-  val tags: Map<String?, Any?>?
+  val tags: Map<String?, Any?>
   fun setSamplingPriority(Int): Boolean
-  fun setTracingSamplingPriorityIfNecessary()
   fun setMetric(CharSequence?, Double)
-interface com.datadog.android.trace.api.span.DatadogSpanIdConverter
-  fun fromHex(String): Long
-  fun toHexStringPadded(Long): String
 interface com.datadog.android.trace.api.span.DatadogSpanLink
   val spanId: Long
   val sampled: Boolean
@@ -121,13 +111,6 @@ interface com.datadog.android.trace.api.span.DatadogSpanLogger
   fun log(Map<String, Any>, DatadogSpan)
 interface com.datadog.android.trace.api.span.DatadogSpanWriter
 interface com.datadog.android.trace.api.trace.DatadogTraceId
-  fun toLong(): Long
-  fun toHexString(): String
-interface com.datadog.android.trace.api.trace.DatadogTraceIdFactory
-  fun zero(): DatadogTraceId
-  fun from(Long): DatadogTraceId
-  fun from(String): DatadogTraceId
-  fun fromHex(String): DatadogTraceId
 interface com.datadog.android.trace.api.tracer.DatadogTracer
   fun activeSpan(): com.datadog.android.trace.api.span.DatadogSpan?
   fun propagate(): com.datadog.android.trace.api.propagation.DatadogPropagation
@@ -138,11 +121,8 @@ interface com.datadog.android.trace.api.tracer.DatadogTracer
   fun addScopeListener(com.datadog.android.trace.api.scope.DataScopeListener)
 interface com.datadog.android.trace.api.tracer.DatadogTracerBuilder
   fun build(): DatadogTracer
-  fun withProperties(java.util.Properties): DatadogTracerBuilder
   fun withTracingHeadersTypes(Set<com.datadog.android.trace.TracingHeaderType>): DatadogTracerBuilder
   fun withServiceName(String): DatadogTracerBuilder
-  fun withIdGenerationStrategy(String, Boolean): DatadogTracerBuilder
-  fun withSampler(com.datadog.android.trace.api.sampling.DatadogTracerSampler?): DatadogTracerBuilder
   fun withSampleRate(Double): DatadogTracerBuilder
   fun withTraceLimit(Int): DatadogTracerBuilder
   fun withPartialFlushMinSpans(Int): DatadogTracerBuilder

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

@@ -71,6 +71,13 @@ public abstract interface class com/datadog/android/trace/api/propagation/Datado
 	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 {
 	public abstract fun afterScopeActivated ()V
 	public abstract fun afterScopeClosed ()V
@@ -134,11 +141,6 @@ public abstract interface class com/datadog/android/trace/api/span/DatadogSpanCo
 	public abstract fun setSamplingPriority (I)Z
 }
 
-public abstract interface class com/datadog/android/trace/api/span/DatadogSpanIdConverter {
-	public abstract fun fromHex (Ljava/lang/String;)J
-	public abstract fun toHexStringPadded (J)Ljava/lang/String;
-}
-
 public abstract interface class com/datadog/android/trace/api/span/DatadogSpanLink {
 	public abstract fun getAttributes ()Ljava/util/Map;
 	public abstract fun getSampled ()Z
@@ -168,15 +170,6 @@ public final class com/datadog/android/trace/api/span/NoOpDatadogSpanLogger : co
 public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceId {
 }
 
-public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceIdConverter {
-	public abstract fun from (J)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
-	public abstract fun from (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
-	public abstract fun fromHex (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
-	public abstract fun toHexString (Lcom/datadog/android/trace/api/trace/DatadogTraceId;)Ljava/lang/String;
-	public abstract fun toLong (Lcom/datadog/android/trace/api/trace/DatadogTraceId;)J
-	public abstract fun zero ()Lcom/datadog/android/trace/api/trace/DatadogTraceId;
-}
-
 public abstract interface class com/datadog/android/trace/api/tracer/DatadogTracer {
 	public abstract fun activateSpan (Lcom/datadog/android/trace/api/span/DatadogSpan;)Lcom/datadog/android/trace/api/scope/DatadogScope;
 	public abstract fun activateSpan (Lcom/datadog/android/trace/api/span/DatadogSpan;Z)Lcom/datadog/android/trace/api/scope/DatadogScope;
@@ -194,9 +187,7 @@ public final class com/datadog/android/trace/api/tracer/DatadogTracer$DefaultImp
 public abstract interface class com/datadog/android/trace/api/tracer/DatadogTracerBuilder {
 	public abstract fun build ()Lcom/datadog/android/trace/api/tracer/DatadogTracer;
 	public abstract fun setBundleWithRumEnabled (Z)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
-	public abstract fun withIdGenerationStrategy (Ljava/lang/String;Z)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public abstract fun withPartialFlushMinSpans (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
-	public abstract fun withProperties (Ljava/util/Properties;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public abstract fun withSampleRate (D)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public abstract fun withServiceName (Ljava/lang/String;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public abstract fun withTag (Ljava/lang/String;Ljava/lang/String;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
@@ -219,9 +210,7 @@ public final class com/datadog/android/trace/api/tracer/NoOpDatadogTracerBuilder
 	public fun <init> ()V
 	public fun build ()Lcom/datadog/android/trace/api/tracer/DatadogTracer;
 	public fun setBundleWithRumEnabled (Z)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
-	public fun withIdGenerationStrategy (Ljava/lang/String;Z)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public fun withPartialFlushMinSpans (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
-	public fun withProperties (Ljava/util/Properties;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public fun withSampleRate (D)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public fun withServiceName (Ljava/lang/String;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public fun withTag (Ljava/lang/String;Ljava/lang/String;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;

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

@@ -67,6 +67,6 @@ junitConfig()
 javadocConfig()
 dependencyUpdateConfig()
 publishingConfig(
-    "Tracing engine api specification used for internal module communication."
+    "Tracing engine API specification used for internal module communication."
 )
 detektCustomConfig()

features/dd-sdk-android-trace-api/build.gradle.kts

@@ -69,6 +69,21 @@ object DatadogTracingConstants {
          * Represents the key used for tagging the analytics sample rate in the Datadog tracer.
          */
         const val KEY_ANALYTICS_SAMPLE_RATE: String = "_dd1.sr.eausr"
+
+        /**
+         * Represents the resource name tag used for tracing spans.
+         */
+        const val RESOURCE_NAME: String = "resource.name"
+
+        /**
+         *  String representing the error message.
+         */
+        const val ERROR_MSG: String = "error.message"
+
+        /**
+         *  String representing the type of the error.
+         */
+        const val ERROR_TYPE: String = "error.type"
     }
 
     /**
@@ -95,7 +110,6 @@ object DatadogTracingConstants {
         const val USER_DROP: Int = -1
 
         /** The user has decided to keep the trace.  */
-
         const val USER_KEEP: Int = 2
     }
 
@@ -152,7 +166,7 @@ object DatadogTracingConstants {
         const val ERROR_KIND: String = "error.kind"
 
         /**
-         * The actual Throwable/Exception/Error object instance itself. E.g., A java.lang.UnsupportedOperationException instance
+         * The actual Throwable/Exception/Error object instance itself. E.g., a [UnsupportedOperationException] instance.
          */
         const val ERROR_OBJECT: String = "error.object"
 
@@ -200,25 +214,4 @@ object DatadogTracingConstants {
          */
         const val DEFAULT: Byte = 0
     }
-
-    /**
-     * Provides constant keys used for Datadog tracing tags.
-     */
-    object DDTags {
-
-        /**
-         * Represents the resource name tag used for tracing spans.
-         */
-        const val RESOURCE_NAME: String = "resource.name"
-
-        /**
-         *  String representing the error message.
-         */
-        const val ERROR_MSG: String = "error.message"
-
-        /**
-         *  String representing the type of the error.
-         */
-        const val ERROR_TYPE: String = "error.type"
-    }
 }

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

@@ -13,7 +13,7 @@ import com.datadog.android.trace.api.span.DatadogSpanContext
  * This implementation is intended as a placeholder making possible to create other NoOp.* classes.
  */
 // TODO RUM-10573 - replace with @NoOpImplementation when method-level generics will be supported in noopfactory
-internal class NoOpDatadogPropagation : DatadogPropagation {
+class NoOpDatadogPropagation : DatadogPropagation {
 
     override fun <C> inject(
         context: DatadogSpanContext,

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

@@ -64,7 +64,7 @@ interface DatadogSpan {
     /**
      * Represents the start time of the span in nanoseconds.
      */
-    val startTimeNano: Long
+    val startTimeNanos: Long
 
     /**
      * Refers to the local root span within a trace hierarchy.

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpan.kt

@@ -31,7 +31,7 @@ interface DatadogSpanContext {
     /**
      * Represents a collection of tags associated with the span.
      */
-    val tags: Map<String?, Any?>?
+    val tags: Map<String?, Any?>
 
     /**
      * Sets the sampling priority for the span.