RUM-9902 - post review fixes

Author: satween

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

@@ -192,7 +192,7 @@ public abstract interface class com/datadog/android/trace/api/tracer/DatadogTrac
 	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;
-	public abstract fun withTraceLimit (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
+	public abstract fun withTraceRateLimit (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public abstract fun withTracingHeadersTypes (Ljava/util/Set;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 }
 
@@ -215,7 +215,7 @@ public final class com/datadog/android/trace/api/tracer/NoOpDatadogTracerBuilder
 	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;
-	public fun withTraceLimit (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
+	public fun withTraceRateLimit (I)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 	public fun withTracingHeadersTypes (Ljava/util/Set;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
 }
 

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpanContext.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.

features/dd-sdk-android-trace-otel/src/main/java/com/datadog/opentelemetry/trace/OtelExtractedContext.java

@@ -76,7 +76,7 @@ public int getSamplingPriority() {
         return prioritySampling;
     }
 
-    @Nullable
+    @NonNull
     @Override
     public Map<String, Object> getTags() {
         // Do nothing

features/dd-sdk-android-trace-otel/src/main/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerProvider.kt

@@ -153,17 +153,6 @@ class OtelTracerProvider internal constructor(
                 .withServiceName(serviceName)
                 .build()
 
-            GlobalDatadogTracer.registerIfAbsent(datadogTracer).let { registeredAsGlobal ->
-                sdkCore.internalLogger.log(
-                    InternalLogger.Level.INFO,
-                    listOf(
-                        InternalLogger.Target.USER,
-                        InternalLogger.Target.MAINTAINER
-                    ),
-                    { if (registeredAsGlobal) USED_AS_GLOBAL_INFO_MESSAGE else NOT_USED_AS_GLOBAL_INFO_MESSAGE }
-                )
-            }
-
             return datadogTracer
         }
 
@@ -213,17 +202,6 @@ class OtelTracerProvider internal constructor(
         fun setSampleRate(
             @FloatRange(from = 0.0, to = 100.0) sampleRate: Double
         ): Builder {
-            // In case the sample rate is not set we should not specify it. The agent code under the hood
-            // will provide different sampler based on this property and also different sampling priorities used
-            // in the metrics
-            // -1 MANUAL_DROP User indicated to drop the trace via configuration (sampling rate).
-            // 0 AUTO_DROP Sampler indicated to drop the trace using a sampling rate provided by the Agent through
-            // a remote configuration. The Agent API is not used in Android so this `sampling_priority:0` will never
-            // be used.
-            // 1 AUTO_KEEP Sampler indicated to keep the trace using a sampling rate from the default configuration
-            // which right now is 100.0
-            // (Default sampling priority value. or in our case no specified sample rate will be considered as 100)
-            // 2 MANUAL_KEEP User indicated to keep the trace, either manually or via configuration (sampling rate)
             builderDelegate.withSampleRate(sampleRate)
             return this
         }
@@ -237,7 +215,7 @@ class OtelTracerProvider internal constructor(
         fun setTraceRateLimit(
             @IntRange(from = 1, to = Int.MAX_VALUE.toLong()) traceRateLimit: Int
         ): Builder {
-            builderDelegate.withTraceLimit(traceRateLimit)
+            builderDelegate.withTraceRateLimit(traceRateLimit)
             return this
         }
 
@@ -306,10 +284,6 @@ class OtelTracerProvider internal constructor(
             "You are trying to bundle the traces with a RUM context, " +
                 "but the RUM context is missing. " +
                 "You should check if the RUM feature is enabled for your SDK instance."
-        internal const val USED_AS_GLOBAL_INFO_MESSAGE =
-            "OpenTracer's DatadogTracer instance will be used as global instance"
-        internal const val NOT_USED_AS_GLOBAL_INFO_MESSAGE =
-            "OpenTracer's DatadogTracer instance will not be used as global instance"
 
         // the minimum closed spans required for triggering a flush and deliver
         // everything to the writer

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

@@ -7,17 +7,17 @@ package com.datadog.android.trace
 
 import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.android.trace.api.tracer.NoOpDatadogTracer
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * A holder object for managing and retrieving a global instance of the [DatadogTracer].
  *
  * This object is used to share same instance of [DatadogTracer] across different integrations such as
- * `OkHttp, Kotlin's coroutines, ect.
+ * `OkHttp`, Kotlin's coroutines, ect.
  */
 object GlobalDatadogTracer {
 
-    @get:Synchronized
-    internal var instance: DatadogTracer? = null
+    private val instance = AtomicReference<DatadogTracer?>()
 
     /**
      * Registers the provided tracer as the global tracer if no tracer is currently registered.
@@ -27,12 +27,7 @@ object GlobalDatadogTracer {
      */
     @Synchronized
     fun registerIfAbsent(tracer: DatadogTracer): Boolean {
-        if (instance == null) {
-            instance = tracer
-            return true
-        }
-
-        return false
+        return instance.compareAndSet(null, tracer)
     }
 
     /**
@@ -48,16 +43,17 @@ object GlobalDatadogTracer {
      *
      * @return An instance of [DatadogTracer] or null.
      */
-    fun getOrNull(): DatadogTracer? = instance
+    fun getOrNull(): DatadogTracer? = instance.get()
 
     /**
      * Clears the current instance of the global Datadog tracer.
      *
      * This method sets the internal tracer instance to null, effectively
      * removing any active tracer currently held in the global state.
-     * The general purpose is to use it for test implementation..
+     * The general purpose is to use it for test implementation.
      */
+    @Synchronized
     fun clear() {
-        instance = null
+        instance.set(null)
     }
 }

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

@@ -15,7 +15,7 @@ import com.datadog.trace.core.PendingTrace
 internal class DatadogSpanContextAdapter(internal val delegate: AgentSpan.Context) : DatadogSpanContext {
     override val spanId: Long get() = delegate.spanId
     override val samplingPriority: Int get() = delegate.samplingPriority
-    override val tags: Map<String?, Any?> get() = ddSpanContext?.tags.orEmpty()
+    override val tags: Map<String, Any?> get() = ddSpanContext?.tags.orEmpty()
     override val traceId: DatadogTraceId get() = DatadogTraceIdAdapter(delegate.traceId)
 
     private val ddSpanContext: DDSpanContext?

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

@@ -43,7 +43,7 @@ internal class DatadogTracerBuilderAdapter(
         this.serviceName = serviceName
     }
 
-    override fun withTraceLimit(traceRateLimit: Int) = apply {
+    override fun withTraceRateLimit(traceRateLimit: Int) = apply {
         this.traceRateLimit = traceRateLimit
     }
 
@@ -67,8 +67,8 @@ internal class DatadogTracerBuilderAdapter(
         this.sampleRate = sampleRate
     }
 
-    override fun withPartialFlushMinSpans(withPartialFlushMinSpans: Int) = apply {
-        this.partialFlushMinSpans = withPartialFlushMinSpans
+    override fun withPartialFlushMinSpans(partialFlushMinSpans: Int) = apply {
+        this.partialFlushMinSpans = partialFlushMinSpans
     }
 
     override fun withTag(key: String, value: String) = apply {

features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/domain/event/CoreTracerSpanToSpanEventMapper.kt

@@ -53,12 +53,11 @@ internal class CoreTracerSpanToSpanEventMapper(
         return DDSpanId.toHexStringPadded(model.spanId)
     }
 
-    // todo RUM-10805 - make it back private and re-create objects in tests
     private fun resolveParentId(model: DDSpan): String {
         return DDSpanId.toHexStringPadded(model.parentId)
     }
 
-    // todo RUM-10805 - make it back private and re-create objects in tests
+    // TODO RUM-10805 - make it back private and re-create objects in tests
     internal fun resolveMetrics(event: DDSpan): SpanEvent.Metrics {
         val metrics = resolveMetricsFromSpanContext(event).apply {
             this[DDSpanContext.PRIORITY_SAMPLING_KEY] = event.samplingPriority()
@@ -69,6 +68,7 @@ internal class CoreTracerSpanToSpanEventMapper(
         )
     }
 
+    // TODO RUM-10805 - make it back private and re-create objects in tests
     internal fun resolveMeta(datadogContext: DatadogContext, event: DDSpan): SpanEvent.Meta {
         val deviceInfo = resolveDeviceInfo(datadogContext.deviceInfo)
         val osInfo = resolveOsInfo(datadogContext.deviceInfo)

instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/trace/TracesTest.kt

@@ -171,7 +171,7 @@ internal abstract class TracesTest {
         const val OPERATION_NAME_KEY = "name"
         const val META_KEY = "meta"
         const val METRICS_KEY = "metrics"
-        internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(100)
+        internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(60)
 
         private const val TAG_STATUS = "status"
         private const val TAG_MESSAGE = "message"

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/internal/utils/SpanSamplingIdProviderTest.kt

@@ -45,7 +45,7 @@ internal class SpanSamplingIdProviderTest {
     @Mock
     lateinit var mockSpanContext: DatadogSpanContext
 
-    private lateinit var fakeTags: Map<String?, Any?>
+    private lateinit var fakeTags: Map<String, Any?>
 
     @BeforeEach
     fun `set up`(forge: Forge) {