RUM-9899: post-review fixes

satween · satween · commit 1e8df9f36064 · 2025-08-26T12:43:13.000+01:00
diff --git a/features/dd-sdk-android-trace-api/api/apiSurface b/features/dd-sdk-android-trace-api/api/apiSurface
@@ -115,7 +115,6 @@ 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
   fun activateSpan(com.datadog.android.trace.api.span.DatadogSpan): com.datadog.android.trace.api.scope.DatadogScope?
-  fun activateSpan(com.datadog.android.trace.api.span.DatadogSpan, Boolean): com.datadog.android.trace.api.scope.DatadogScope?
   fun buildSpan(CharSequence): com.datadog.android.trace.api.span.DatadogSpanBuilder
   fun buildSpan(String, CharSequence): com.datadog.android.trace.api.span.DatadogSpanBuilder
   fun addScopeListener(com.datadog.android.trace.api.scope.DatadogScopeListener)
diff --git a/features/dd-sdk-android-trace-api/api/dd-sdk-android-trace-api.api b/features/dd-sdk-android-trace-api/api/dd-sdk-android-trace-api.api
@@ -162,7 +162,6 @@ public final class com/datadog/android/trace/api/trace/DatadogTraceId$Companion
 
 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;
 	public abstract fun activeSpan ()Lcom/datadog/android/trace/api/span/DatadogSpan;
 	public abstract fun addScopeListener (Lcom/datadog/android/trace/api/scope/DatadogScopeListener;)V
 	public abstract fun buildSpan (Ljava/lang/CharSequence;)Lcom/datadog/android/trace/api/span/DatadogSpanBuilder;
@@ -188,7 +187,6 @@ public abstract interface class com/datadog/android/trace/api/tracer/DatadogTrac
 public final class com/datadog/android/trace/api/tracer/NoOpDatadogTracer : com/datadog/android/trace/api/tracer/DatadogTracer {
 	public fun <init> ()V
 	public fun activateSpan (Lcom/datadog/android/trace/api/span/DatadogSpan;)Lcom/datadog/android/trace/api/scope/DatadogScope;
-	public fun activateSpan (Lcom/datadog/android/trace/api/span/DatadogSpan;Z)Lcom/datadog/android/trace/api/scope/DatadogScope;
 	public fun activeSpan ()Lcom/datadog/android/trace/api/span/DatadogSpan;
 	public fun addScopeListener (Lcom/datadog/android/trace/api/scope/DatadogScopeListener;)V
 	public fun buildSpan (Ljava/lang/CharSequence;)Lcom/datadog/android/trace/api/span/DatadogSpanBuilder;
diff --git a/features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpanWriter.kt b/features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpanWriter.kt
@@ -7,6 +7,6 @@ package com.datadog.android.trace.api.span
 
 /**
  * A writer is responsible for sending collected spans.
- * This wrapper is required to not expose CoreTracer wrapper to dependent modules
- * */
+ * This wrapper is required to not expose [CoreTracer] wrapper to dependent modules
+ */
 interface DatadogSpanWriter
diff --git a/features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/api/DDTraceId.java b/features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/api/DDTraceId.java
@@ -58,11 +58,14 @@ public static DDTraceId fromHex(String s) throws NumberFormatException {
    * Creates a new {@link DDTraceId} from the given {@link #toHexString() hexadecimal
    * representation}.
    *
-   * @param s The hexadecimal {@link String} representation of a {@link DD128bTraceId} to parse.
-   * @return A new {@link DDTraceId} instance or DDTraceId.ZERO if the given {@link #toHexString()
-   * hexadecimal String} does not represent a valid number.
+   * @param s the hexadecimal {@link String} representation of a {@link DD128bTraceId}
+   *          or {@link DD64bTraceId} to parse.
+   * @param defaultValue an {@link DDTraceId} instance to return if the given {@code s}
+   *                    is not a valid value.
+   * @return a new {@link DDTraceId} instance or {@code defaultValue} if the given
+   *         {@code s} does not represent a valid number.
    */
-  public static DDTraceId fromHexOrDefault(String s, DDTraceId defaultValue) throws NumberFormatException {
+  public static DDTraceId fromHexOrDefault(String s, DDTraceId defaultValue) {
     try {
       return fromHex(s);
     } catch (NumberFormatException e) {
diff --git a/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/common/sampling/SamplerTest.kt b/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/common/sampling/SamplerTest.kt
@@ -73,8 +73,8 @@ class SamplerTest {
         val actual = Sampler.Builder.forConfig(mockConfig, null)
 
         // Then
-        assertThat(actual).isInstanceOf(RateByServiceTraceSampler::class.java)
-        assertThat((actual as RateByServiceTraceSampler).sampleRate).isEqualTo(fakeSampleRate)
+        check(actual is RateByServiceTraceSampler)
+        assertThat(actual.sampleRate).isEqualTo(fakeSampleRate)
     }
 
     @Test
@@ -96,8 +96,8 @@ class SamplerTest {
         val actual = Sampler.Builder.forConfig(mockConfig, null)
 
         // Then
-        assertThat(actual).isInstanceOf(ForcePrioritySampler::class.java)
-        assertThat((actual as ForcePrioritySampler).prioritySampling).isEqualTo(PrioritySampling.SAMPLER_KEEP.toInt())
+        check(actual is ForcePrioritySampler)
+        assertThat(actual.prioritySampling).isEqualTo(PrioritySampling.SAMPLER_KEEP.toInt())
         assertThat(actual.samplingMechanism).isEqualTo(SamplingMechanism.DEFAULT.toInt())
     }
 
@@ -111,8 +111,8 @@ class SamplerTest {
         val actual = Sampler.Builder.forConfig(mockConfig, null)
 
         // Then
-        assertThat(actual).isInstanceOf(ForcePrioritySampler::class.java)
-        assertThat((actual as ForcePrioritySampler).prioritySampling).isEqualTo(PrioritySampling.SAMPLER_DROP.toInt())
+        check(actual is ForcePrioritySampler)
+        assertThat(actual.prioritySampling).isEqualTo(PrioritySampling.SAMPLER_DROP.toInt())
         assertThat(actual.samplingMechanism).isEqualTo(SamplingMechanism.DEFAULT.toInt())
     }
 
diff --git a/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/DDSpanTest.kt b/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/DDSpanTest.kt
@@ -513,7 +513,7 @@ internal class DDSpanTest : DDCoreSpecification() {
     }
 
     @Test
-    fun `W drop T unregisterSpan is called`() {
+    fun `M call unregisterSpan W drop is called`() {
         val mockTrace = mock<PendingTrace> {
             on { rootSpan } doReturn mock()
         }
diff --git a/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/PendingTraceTest.kt b/features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/PendingTraceTest.kt
@@ -188,7 +188,7 @@ internal class PendingTraceTest : PendingTraceTestBase() {
     }
 
     @Test
-    fun `do not drop root span when drop is called`() {
+    fun `do not drop root span when unregisterSpan is called`() {
         // Given
         val tracer = mock<CoreTracer>()
         val traceConfig = mock<CoreTracer.ConfigSnapshot>()
diff --git a/features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerBuilderProviderTest.kt b/features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerBuilderProviderTest.kt
@@ -557,7 +557,7 @@ internal class OtelTracerBuilderProviderTest {
         val expectedSpanId = delegateSpan.context().spanId.toString()
 
         // When
-        val scope = delegatedTracer.activateSpan(delegateSpan, false)
+        val scope = delegatedTracer.activateSpan(delegateSpan)
         scope?.close()
         span.end()
 
@@ -594,7 +594,7 @@ internal class OtelTracerBuilderProviderTest {
 
         // When
         val delegateSpan: DatadogSpan = span.delegate
-        val scope = delegatedTracer.activateSpan(delegateSpan, false)
+        val scope = delegatedTracer.activateSpan(delegateSpan)
         scope?.close()
         span.end()
 
diff --git a/features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/opentelemetry/trace/OtelSpanTest.kt b/features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/opentelemetry/trace/OtelSpanTest.kt
@@ -248,14 +248,19 @@ internal class OtelSpanTest {
 
     @Test
     fun `M delegate to AgentSpan W activate`() {
-        // When
-        testedSpan.activate()
-
-        // Then
-        verify(mockAgentTracer).activateSpan(
-            mockAgentSpan,
-            DEFAULT_ASYNC_PROPAGATING
-        )
+        Mockito.mockStatic(DatadogTracingToolkit::class.java).use { mockedStatic ->
+            // When
+            testedSpan.activate()
+            // Then
+            mockedStatic.verify {
+                DatadogTracingToolkit.activateSpan(
+                    mockAgentTracer,
+                    mockAgentSpan,
+                    DEFAULT_ASYNC_PROPAGATING
+                )
+            }
+            mockedStatic.verifyNoMoreInteractions()
+        }
     }
 
     // endregion
diff --git a/features/dd-sdk-android-trace/api/apiSurface b/features/dd-sdk-android-trace/api/apiSurface
@@ -32,6 +32,7 @@ object com.datadog.android.trace.internal.DatadogTracingToolkit
   fun setTraceId128BitGenerationEnabled(com.datadog.android.trace.api.tracer.DatadogTracerBuilder): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
   fun setSdkV2Compatible(com.datadog.android.trace.api.tracer.DatadogTracerBuilder): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
   fun addThrowable(com.datadog.android.trace.api.span.DatadogSpan, Throwable, Byte)
+  fun activateSpan(com.datadog.android.trace.api.tracer.DatadogTracer, com.datadog.android.trace.api.span.DatadogSpan, Boolean): com.datadog.android.trace.api.scope.DatadogScope?
 object com.datadog.android.trace.internal.SpanAttributes
   const val DATADOG_INITIAL_CONTEXT: String
 fun <T> android.database.sqlite.SQLiteDatabase.transactionTraced(String, Boolean = true, com.datadog.android.trace.api.span.DatadogSpan.(android.database.sqlite.SQLiteDatabase) -> T): T
diff --git a/features/dd-sdk-android-trace/api/dd-sdk-android-trace.api b/features/dd-sdk-android-trace/api/dd-sdk-android-trace.api
@@ -65,6 +65,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 static final fun activateSpan (Lcom/datadog/android/trace/api/tracer/DatadogTracer;Lcom/datadog/android/trace/api/span/DatadogSpan;Z)Lcom/datadog/android/trace/api/scope/DatadogScope;
 	public static final fun addThrowable (Lcom/datadog/android/trace/api/span/DatadogSpan;Ljava/lang/Throwable;B)V
 	public final fun getPropagationHelper ()Lcom/datadog/android/trace/internal/DatadogPropagationHelper;
 	public final fun setSdkV2Compatible (Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
diff --git a/features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/GlobalDatadogTracer.kt b/features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/GlobalDatadogTracer.kt
@@ -25,7 +25,6 @@ object GlobalDatadogTracer {
      * @param tracer The tracer to register as the global tracer.
      * @return `true` if the tracer was successfully registered, or `false` if a tracer was already registered.
      */
-    @Synchronized
     fun registerIfAbsent(tracer: DatadogTracer): Boolean {
         return instance.compareAndSet(null, tracer)
     }
@@ -52,7 +51,6 @@ object GlobalDatadogTracer {
      * removing any active tracer currently held in the global state.
      * The general purpose is to use it for test implementation.
      */
-    @Synchronized
     fun clear() {
         instance.set(null)
     }
diff --git a/features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/DatadogPropagationAdapter.kt b/features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/internal/DatadogPropagationAdapter.kt
@@ -42,5 +42,5 @@ internal class DatadogPropagationAdapter(
     }
 
     private fun constructErrorMessage(klass: KClass<*>) = "DatadogPropagationAdapter supports only" +
-        " DatadogSpanContextAdapter instancies for injection but ${klass.simpleName} is given"
+        " DatadogSpanContextAdapter instances for injection but ${klass.simpleName} is given"
 }
diff --git a/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/DatadogTracingTest.kt b/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/DatadogTracingTest.kt
@@ -90,7 +90,7 @@ class DatadogTracingTest {
     }
 
     @Test
-    fun `M log a maintainer error W build { TracingFeature not implementing InternalCoreTracerWriterProvider }`() {
+    fun `M log a maintainer error W build { TracingFeature not implementing InternalCoreWriterProvider }`() {
         // Given
         whenever(mockTracingFeature.unwrap<Feature>()) doReturn mock()
 
diff --git a/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogPropagationAdapterTest.kt b/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogPropagationAdapterTest.kt
@@ -61,7 +61,7 @@ internal class DatadogPropagationAdapterTest {
         mockInternalLogger.verifyLog(
             InternalLogger.Level.ERROR,
             InternalLogger.Target.USER,
-            "DatadogPropagationAdapter supports only DatadogSpanContextAdapter instancies for injection " +
+            "DatadogPropagationAdapter supports only DatadogSpanContextAdapter instances for injection " +
                 "but UnsupportedDatadogSpanContextImplementation is given"
         )
     }
diff --git a/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogSpanContextAdapterTest.kt b/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/internal/DatadogSpanContextAdapterTest.kt
@@ -95,11 +95,12 @@ class DatadogSpanContextAdapterTest {
     fun `M return delegate#traceId W traceId is called`(forge: Forge) {
         // Given
         val ddTraceId = forge.getForgery<DDTraceId>()
+        whenever(mockAgentSpanContext.traceId).thenReturn(ddTraceId)
 
         // When
-        whenever(mockAgentSpanContext.traceId).thenReturn(ddTraceId)
+        val actualTraceId = testedAgentSpanContextAdapter.traceId
 
         // Then
-        assertThat(testedAgentSpanContextAdapter.traceId).isEqualTo(DatadogTraceIdAdapter(ddTraceId))
+        assertThat(actualTraceId).isEqualTo(DatadogTraceIdAdapter(ddTraceId))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ internal class DDSpanTest : DDCoreSpecification() {`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`@Test`
`516`		- fun `W drop T unregisterSpan is called`() {
	`516`	+ fun `M call unregisterSpan W drop is called`() {
`517`	`517`	`val mockTrace = mock<PendingTrace> {`
`518`	`518`	`on { rootSpan } doReturn mock()`
`519`	`519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ internal class PendingTraceTest : PendingTraceTestBase() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`@Test`
`191`		- fun `do not drop root span when drop is called`() {
	`191`	+ fun `do not drop root span when unregisterSpan is called`() {
`192`	`192`	`// Given`
`193`	`193`	`val tracer = mock<CoreTracer>()`
`194`	`194`	`val traceConfig = mock<CoreTracer.ConfigSnapshot>()`