RUM-15138: Move session_sample_rate key to LogAttributes

Replace the internal RumContextKeys object (single-constant file in
dd-sdk-android-trace) with LogAttributes.RUM_SESSION_SAMPLE_RATE in
dd-sdk-android-core, consistent with where the other RUM context
propagation keys (RUM_SESSION_ID, RUM_VIEW_ID, etc.) are defined.

Author: hamorillo

dd-sdk-android-core/api/apiSurface

@@ -448,6 +448,7 @@ object com.datadog.android.log.LogAttributes
   const val RUM_SESSION_ID: String
   const val RUM_VIEW_ID: String
   const val RUM_ACTION_ID: String
+  const val RUM_SESSION_SAMPLE_RATE: String
   const val SERVICE_NAME: String
   const val SOURCE: String
   const val STATUS: String

dd-sdk-android-core/api/dd-sdk-android-core.api

@@ -1081,6 +1081,7 @@ public final class com/datadog/android/log/LogAttributes {
 	public static final field RUM_ACTION_ID Ljava/lang/String;
 	public static final field RUM_APPLICATION_ID Ljava/lang/String;
 	public static final field RUM_SESSION_ID Ljava/lang/String;
+	public static final field RUM_SESSION_SAMPLE_RATE Ljava/lang/String;
 	public static final field RUM_VIEW_ID Ljava/lang/String;
 	public static final field SERVICE Ljava/lang/String;
 	public static final field SERVICE_NAME Ljava/lang/String;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/log/LogAttributes.kt

@@ -279,6 +279,13 @@ object LogAttributes {
      */
     const val RUM_ACTION_ID: String = "user_action.id"
 
+    /**
+     * Key for the RUM session sample rate used for cross-product trace sampling rebasing.
+     * This key is written to spans by [com.datadog.android.trace.internal.RumContextPropagator]
+     * and read by [com.datadog.android.trace.DeterministicTraceSampler].
+     */
+    const val RUM_SESSION_SAMPLE_RATE: String = "session_sample_rate"
+
     /**
      * The name of the application or service generating the log events. (String)
      * This value is filled automatically by the [Logger].

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

@@ -12,10 +12,10 @@ import com.datadog.android.api.feature.FeatureContextUpdateReceiver
 import com.datadog.android.core.configuration.HostsSanitizer
 import com.datadog.android.core.internal.net.DefaultFirstPartyHostHeaderTypeResolver
 import com.datadog.android.core.sampling.Sampler
+import com.datadog.android.log.LogAttributes
 import com.datadog.android.trace.api.span.DatadogSpan
 import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.android.trace.internal.ApmNetworkInstrumentation
-import com.datadog.android.trace.internal.RumContextKeys
 import com.datadog.android.trace.internal.net.TracerProvider
 import java.util.concurrent.atomic.AtomicReference
 
@@ -257,7 +257,7 @@ class ApmNetworkInstrumentationConfiguration internal constructor(
                                 "UnsafeThirdPartyFunctionCall"
                             ) // resolveSessionSampleRate always returns non-null Float
                             cachedSessionSampleRate.set(
-                                resolveSessionSampleRate(context[RumContextKeys.SESSION_SAMPLE_RATE])
+                                resolveSessionSampleRate(context[LogAttributes.RUM_SESSION_SAMPLE_RATE])
                             )
                         }
                     }

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

@@ -9,8 +9,8 @@ package com.datadog.android.trace
 import androidx.annotation.FloatRange
 import com.datadog.android.core.sampling.DeterministicSampler
 import com.datadog.android.internal.sampling.computeSamplingDecision
+import com.datadog.android.log.LogAttributes
 import com.datadog.android.trace.api.span.DatadogSpan
-import com.datadog.android.trace.internal.RumContextKeys
 import com.datadog.android.trace.internal.net.SpanSamplingIdProvider
 
 /**
@@ -125,7 +125,7 @@ open class DeterministicTraceSampler private constructor(
         val providerRateIsValid = providerRate >= 0f && providerRate < DeterministicSampler.SAMPLE_ALL_RATE
         val sessionSampleRate = when {
             providerRateIsValid -> providerRate
-            else -> (item.context().tags[RumContextKeys.SESSION_SAMPLE_RATE] as? Number)?.toFloat()
+            else -> (item.context().tags[LogAttributes.RUM_SESSION_SAMPLE_RATE] as? Number)?.toFloat()
         }
 
         return if (sessionSampleRate != null &&

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

@@ -63,8 +63,8 @@ class RumContextPropagator(private val sdkCoreProvider: () -> FeatureSdkCore?) {
                 instance.setTag(LogAttributes.RUM_VIEW_ID, rumContext["view_id"])
                 instance.setTag(LogAttributes.RUM_ACTION_ID, rumContext["action_id"])
                 instance.setTag(
-                    RumContextKeys.SESSION_SAMPLE_RATE,
-                    rumContext[RumContextKeys.SESSION_SAMPLE_RATE]
+                    LogAttributes.RUM_SESSION_SAMPLE_RATE,
+                    rumContext[LogAttributes.RUM_SESSION_SAMPLE_RATE]
                 )
                 instance.setTag(HttpCodec.RUM_KEY_USER_ID, datadogContext.userInfo.id)
                 instance.setTag(HttpCodec.RUM_KEY_ACCOUNT_ID, datadogContext.accountInfo?.id)

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

@@ -9,6 +9,7 @@ package com.datadog.android.trace.internal.net
 import com.datadog.android.api.SdkCore
 import com.datadog.android.api.feature.Feature
 import com.datadog.android.core.sampling.Sampler
+import com.datadog.android.log.LogAttributes
 import com.datadog.android.trace.ApmNetworkInstrumentationConfiguration
 import com.datadog.android.trace.ApmNetworkInstrumentationConfiguration.Companion.createInstrumentation
 import com.datadog.android.trace.ApmNetworkTracingScope
@@ -18,7 +19,6 @@ import com.datadog.android.trace.TraceContextInjection
 import com.datadog.android.trace.TracingHeaderType
 import com.datadog.android.trace.api.span.DatadogSpan
 import com.datadog.android.trace.api.tracer.DatadogTracer
-import com.datadog.android.trace.internal.RumContextKeys
 import com.datadog.android.utils.forge.Configurator
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.BoolForgery
@@ -309,7 +309,7 @@ internal class ApmInstrumentationConfigurationTest {
         // When
         result.sessionSampleRateReceiver!!.onContextUpdate(
             Feature.RUM_FEATURE_NAME,
-            mapOf(RumContextKeys.SESSION_SAMPLE_RATE to fakeSessionRate)
+            mapOf(LogAttributes.RUM_SESSION_SAMPLE_RATE to fakeSessionRate)
         )
 
         // Then
@@ -332,7 +332,7 @@ internal class ApmInstrumentationConfigurationTest {
         // When
         result.sessionSampleRateReceiver!!.onContextUpdate(
             fakeOtherFeature,
-            mapOf(RumContextKeys.SESSION_SAMPLE_RATE to fakeSessionRate)
+            mapOf(LogAttributes.RUM_SESSION_SAMPLE_RATE to fakeSessionRate)
         )
 
         // Then - no rebasing, rate unchanged