RUM-10930: ignore sample priority in metrics in case if not set

Author: satween

features/dd-sdk-android-trace-internal/src/test/kotlin/com/datadog/trace/core/DDSpanTest.kt

@@ -499,7 +499,7 @@ internal class DDSpanTest : DDCoreSpecification() {
 
         // Then
         val expectedLimit = if (limit == Int.MAX_VALUE) null else limit
-        assertThat(span.spanSamplingPriority).isEqualTo(PrioritySampling.UNSET.toInt())
+        assertThat(span.traceSamplingPriority).isNull()
 
         // When
         span.setSpanSamplingPriority(rate, limit)
@@ -509,7 +509,7 @@ internal class DDSpanTest : DDCoreSpecification() {
             .isEqualTo(SamplingMechanism.SPAN_SAMPLING_RATE)
         assertThat(span.getTag(DDSpanContext.SPAN_SAMPLING_RULE_RATE_TAG)).isEqualTo(rate)
         assertThat(span.getTag(DDSpanContext.SPAN_SAMPLING_MAX_PER_SECOND_TAG)).isEqualTo(expectedLimit)
-        assertThat(span.spanSamplingPriority).isEqualTo(PrioritySampling.UNSET.toInt())
+        assertThat(span.traceSamplingPriority).isNull()
     }
 
     @Test

features/dd-sdk-android-trace-otel/src/test/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerBuilderProviderTest.kt

@@ -369,11 +369,11 @@ internal class OtelTracerBuilderProviderTest {
 
         // Then
         val priority = delegateSpan.samplingPriority
-        assertThat(priority).isEqualTo(DatadogTracingConstants.PrioritySampling.USER_KEEP.toInt())
+        assertThat(priority).isEqualTo(DatadogTracingConstants.PrioritySampling.SAMPLER_KEEP)
     }
 
     @Test
-    fun `M use user-drop priority W buildSpan { provide not keep sample rate }`() {
+    fun `M use sampler-drop priority W buildSpan { provide not keep sample rate }`() {
         // Given
         val tracer = testedOtelTracerProviderBuilder
             .setPartialFlushThreshold(1)
@@ -392,11 +392,11 @@ internal class OtelTracerBuilderProviderTest {
 
         // Then
         val priority = delegateSpan.samplingPriority
-        assertThat(priority).isEqualTo(DatadogTracingConstants.PrioritySampling.USER_DROP)
+        assertThat(priority).isEqualTo(DatadogTracingConstants.PrioritySampling.SAMPLER_DROP)
     }
 
     @Test
-    fun `M use user-keep or user-not-keep priority W buildSpan { provided random sample rate }`(
+    fun `M use sampler-keep or sampler-not-keep priority W buildSpan { provided random sample rate }`(
         @DoubleForgery(min = 0.0, max = 100.0) sampleRate: Double,
         forge: Forge
     ) {
@@ -423,9 +423,9 @@ internal class OtelTracerBuilderProviderTest {
         }
         spans.forEach { it.end() }
         val droppedSpans =
-            delegatedSpans.filter { it.samplingPriority == DatadogTracingConstants.PrioritySampling.USER_DROP.toInt() }
+            delegatedSpans.filter { it.samplingPriority == DatadogTracingConstants.PrioritySampling.SAMPLER_DROP }
         val keptSpans =
-            delegatedSpans.filter { it.samplingPriority == DatadogTracingConstants.PrioritySampling.USER_KEEP.toInt() }
+            delegatedSpans.filter { it.samplingPriority == DatadogTracingConstants.PrioritySampling.SAMPLER_KEEP }
 
         // Then
         assertThat(droppedSpans.size + keptSpans.size).isEqualTo(numberOfSpans)

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

@@ -65,10 +65,11 @@ internal class CoreTracerSpanToSpanEventMapper(
     // 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 {
-            if (event.spanSamplingPriority != PrioritySampling.UNSET.toInt()) {
+            val spanSamplingPriority = event.spanSamplingPriority
+            if (spanSamplingPriority != PrioritySampling.UNSET.toInt()) {
                 // This required for backward compatibility with AndroidTracer that
                 // don't add the sampling priority if it not set for current span.
-                this[DDSpanContext.PRIORITY_SAMPLING_KEY] = event.spanSamplingPriority
+                this[DDSpanContext.PRIORITY_SAMPLING_KEY] = spanSamplingPriority
             }
         }
         return SpanEvent.Metrics(

features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/utils/forge/CoreDDSpanForgeryFactory.kt

@@ -60,7 +60,7 @@ internal class CoreDDSpanForgeryFactory : ForgeryFactory<DDSpan> {
             whenever(it.parentId).thenReturn(parentId)
             whenever(it.baggage).thenReturn(baggageItems)
             whenever(it.tags).thenReturn(tagsAndMetrics)
-            whenever(it.spanSamplingPriority).thenReturn(samplingPriority)
+            whenever(it.traceSamplingPriority).thenReturn(samplingPriority)
             whenever(it.links).thenReturn(spanLinks)
         }
         return mockDDSpan

reliability/single-fit/okhttp/src/test/kotlin/com/datadog/android/okhttp/SpanExtIntegrationTest.kt

@@ -96,7 +96,6 @@ class SpanExtIntegrationTest {
         mockServer.shutdown()
     }
 
-
     @Test
     fun `M return expected events W withinSpan {two composite spans}`() {
         registerTracer(partialFlushMinSpans = 1)
@@ -115,7 +114,6 @@ class SpanExtIntegrationTest {
         val rootSpanJson = eventsWritten[0].asJson()
         val childSpanJson = eventsWritten[1].asJson()
 
-
         assertThat(isCalled).isTrue
         SpansPayloadAssert.assertThat(rootSpanJson)
             .hasEnv(expectedEnv)
@@ -175,7 +173,6 @@ class SpanExtIntegrationTest {
         val child1Json = checkNotNull(eventsJson[level1ChildSpanId])
         val child2Json = checkNotNull(eventsJson[level2ChildSpanId])
 
-
         assertThat(isCalled).isTrue
         SpansPayloadAssert.assertThat(rootSpanJson)
             .hasEnv(expectedEnv)
@@ -242,7 +239,6 @@ class SpanExtIntegrationTest {
         val rootSpanJson = eventsWritten[0].asJson()
         val childSpanJson = eventsWritten[1].asJson()
 
-
         assertThat(isCalled).isTrue
         SpansPayloadAssert.assertThat(rootSpanJson)
             .hasEnv(expectedEnv)

reliability/single-fit/okhttp/src/test/kotlin/com/datadog/android/okhttp/tests/assertj/SpansPayloadAssert.kt

@@ -116,7 +116,6 @@ internal class SpansPayloadAssert(actual: JsonObject) :
             return this
         }
 
-
         fun hasResource(resource: String): SpanAssert {
             val actualResource = actualSpan.getString(RESOURCE_KEY)
             assertThat(actualResource).overridingErrorMessage(