RUM-8098: improving LocalAttribute documentation & params

satween · satween · commit a7839ec62a51 · 2025-02-14T14:22:39.000Z
RUM-8098: post-review fixes
diff --git a/dd-sdk-android-core/api/dd-sdk-android-core.api b/dd-sdk-android-core/api/dd-sdk-android-core.api
@@ -728,7 +728,7 @@ public final class com/datadog/android/core/internal/attributes/LocalAttribute$K
 	public static final field CREATION_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
 	public static final field REPORTING_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
 	public static final field VIEW_SCOPE_INSTRUMENTATION_TYPE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
-	public final fun getString ()Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
 	public static fun values ()[Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
 }
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/LocalAttribute.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/LocalAttribute.kt
@@ -18,22 +18,23 @@ interface LocalAttribute {
      * Enumeration of all local attributes keys used in the application.
      * Made via **enum** to make sure that all such attributes will be removed before sending the event to the backend.
      *
-     * @property string - Unique string value for a local attribute key.
+     * @param string - Unique string value for a local attribute key.
      */
     @InternalApi
     enum class Key(
-        val string: String
+        private val string: String
     ) {
-        /* Some of the metrics like [PerformanceMetric] being sampled on the
-         * metric creation place and then reported with 100% probability.
-         * In such cases we need to use *creationSampleRate* to compute effectiveSampleRate correctlyThe sampling
-         * rate is used when creating metrics.
-         * Creation(head) sampling rate exist only for long-lived metrics like method performance.
-         * Created metric still could not be sent it depends on [REPORTING_SAMPLING_RATE] sampling rate
+        /*
+         * Some of the metrics such as [PerformanceMetric] are sampled at the point of
+         * metric creation and then reported with 100% probability.
+         * In such cases we need to use *creationSampleRate* to correctly calculate effectiveSampleRate.
+         * The creation(head) sample rate only exists for long-lived metrics such as method performance.
+         * Created metric still could not be sent, it depends on the [REPORTING_SAMPLING_RATE] sample rate.
          */
         CREATION_SAMPLING_RATE("_dd.local.head_sampling_rate_key"),
 
-        /* Sampling rate that is used to decide to send or not to send the metric.
+        /*
+         * Sampling rate that is used to decide to send or not to send the metric.
          * Each metric should have reporting(tail) sampling rate.
          * It's possible that metric has only reporting(tail) sampling rate.
          */
@@ -43,7 +44,11 @@ interface LocalAttribute {
          * Indicates which instrumentation was used to track the view scope.
          * See [ViewScopeInstrumentationType] for possible values.
          */
-        VIEW_SCOPE_INSTRUMENTATION_TYPE("_dd.local.view_instrumentation_type_key")
+        VIEW_SCOPE_INSTRUMENTATION_TYPE("_dd.local.view_instrumentation_type_key");
+
+        override fun toString(): String {
+            return string
+        }
     }
 
     /**
@@ -56,9 +61,6 @@ interface LocalAttribute {
     interface Constant {
         /** Constant attribute key. For enum constants will be same for all values. */
         val key: Key
-
-        /** Constant attribute value. One item from set of possible finite values for a given constant attribute.*/
-        val value: Any
     }
 }
 
@@ -99,5 +101,5 @@ fun MutableMap<String, Any?>.enrichWithLocalAttribute(
     key: LocalAttribute.Key,
     value: Any?
 ) = apply {
-    this[key.string] = value
+    this[key.toString()] = value
 }
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/ViewScopeInstrumentationType.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/ViewScopeInstrumentationType.kt
@@ -11,20 +11,18 @@ import com.datadog.android.lint.InternalApi
  * A set of constants describing the instrumentation that were used to define the view scope.
  */
 @InternalApi
-enum class ViewScopeInstrumentationType(
-    override val value: String
-) : LocalAttribute.Constant {
+enum class ViewScopeInstrumentationType : LocalAttribute.Constant {
     /** Tracked manually through the RUMMonitor API. */
-    MANUAL("manual"),
+    MANUAL,
 
     /** Tracked through ComposeNavigationObserver instrumentation. */
-    COMPOSE("compose"),
+    COMPOSE,
 
     /** Tracked through ActivityViewTrackingStrategy instrumentation. */
-    ACTIVITY("activity"),
+    ACTIVITY,
 
     /** Tracked through FragmentViewTrackingStrategy instrumentation. */
-    FRAGMENT("fragment");
+    FRAGMENT;
 
     /** @inheritdoc */
     override val key: LocalAttribute.Key = LocalAttribute.Key.VIEW_SCOPE_INSTRUMENTATION_TYPE
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/logger/SdkInternalLoggerTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/logger/SdkInternalLoggerTest.kt
@@ -453,7 +453,7 @@ internal class SdkInternalLoggerTest {
         // Given
         val samplingRate = 100.0f
         val fakeAdditionalProperties = forge.exhaustiveAttributes().also {
-            it[LocalAttribute.Key.REPORTING_SAMPLING_RATE.string] = samplingRate
+            it[LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString()] = samplingRate
         }
         val mockLambda: () -> String = mock()
         whenever(mockLambda.invoke()) doReturn fakeMessage
@@ -505,13 +505,13 @@ internal class SdkInternalLoggerTest {
             val metricEvent = firstValue as InternalTelemetryEvent.Metric
 
             assertThat(
-                metricEvent.additionalProperties?.get(LocalAttribute.Key.CREATION_SAMPLING_RATE.string)
+                metricEvent.additionalProperties?.get(LocalAttribute.Key.CREATION_SAMPLING_RATE.toString())
             ).isEqualTo(
                 expectedCreationSampleRate
             )
 
             assertThat(
-                metricEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.string)
+                metricEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString())
             ).isEqualTo(
                 samplingRate
             )
@@ -544,11 +544,11 @@ internal class SdkInternalLoggerTest {
             assertThat(
                 apiUsageEvent.additionalProperties
             ).doesNotContainKeys(
-                LocalAttribute.Key.CREATION_SAMPLING_RATE.string
+                LocalAttribute.Key.CREATION_SAMPLING_RATE.toString()
             )
 
             assertThat(
-                apiUsageEvent.additionalProperties[LocalAttribute.Key.REPORTING_SAMPLING_RATE.string]
+                apiUsageEvent.additionalProperties[LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString()]
             ).isEqualTo(
                 samplingRate
             )
@@ -569,7 +569,7 @@ internal class SdkInternalLoggerTest {
             ),
             target = InternalLogger.Target.TELEMETRY,
             messageBuilder = { forge.aString() },
-            additionalProperties = mapOf(LocalAttribute.Key.REPORTING_SAMPLING_RATE.string to samplingRate)
+            additionalProperties = mapOf(LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString() to samplingRate)
         )
 
         // Then
@@ -581,11 +581,11 @@ internal class SdkInternalLoggerTest {
             assertThat(
                 debugEvent.additionalProperties
             ).doesNotContainKeys(
-                LocalAttribute.Key.CREATION_SAMPLING_RATE.string
+                LocalAttribute.Key.CREATION_SAMPLING_RATE.toString()
             )
 
             assertThat(
-                debugEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.string)
+                debugEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString())
             ).isEqualTo(
                 samplingRate
             )
@@ -604,7 +604,7 @@ internal class SdkInternalLoggerTest {
             target = InternalLogger.Target.TELEMETRY,
             throwable = forge.aThrowable(),
             messageBuilder = { forge.aString() },
-            additionalProperties = mapOf(LocalAttribute.Key.REPORTING_SAMPLING_RATE.string to samplingRate)
+            additionalProperties = mapOf(LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString() to samplingRate)
         )
 
         // Then
@@ -616,11 +616,11 @@ internal class SdkInternalLoggerTest {
             assertThat(
                 debugEvent.additionalProperties
             ).doesNotContainKeys(
-                LocalAttribute.Key.CREATION_SAMPLING_RATE.string
+                LocalAttribute.Key.CREATION_SAMPLING_RATE.toString()
             )
 
             assertThat(
-                debugEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.string)
+                debugEvent.additionalProperties?.get(LocalAttribute.Key.REPORTING_SAMPLING_RATE.toString())
             ).isEqualTo(
                 samplingRate
             )
diff --git a/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt b/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt
@@ -1434,7 +1434,7 @@ internal open class RumViewScope(
         }
 
         private fun RumRawEvent.StartView.tryResolveInstrumentationType() =
-            attributes[LocalAttribute.Key.VIEW_SCOPE_INSTRUMENTATION_TYPE.string] as? ViewScopeInstrumentationType
+            attributes[LocalAttribute.Key.VIEW_SCOPE_INSTRUMENTATION_TYPE.toString()] as? ViewScopeInstrumentationType
 
         @Suppress("CommentOverPrivateFunction")
         /**
diff --git a/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt b/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt
@@ -498,10 +498,10 @@ internal class TelemetryEventHandler(
         return (effectiveSampleRate * HUNDRED).toFloat()
     }
 
-    private fun Map<String, Any?>.getFloat(key: LocalAttribute.Key) = get(key.string) as? Float
+    private fun Map<String, Any?>.getFloat(key: LocalAttribute.Key) = get(key.toString()) as? Float
 
     private fun Map<String, Any?>.cleanUpInternalAttributes() = toMutableMap().apply {
-        LocalAttribute.Key.values().forEach { key -> remove(key.string) }
+        LocalAttribute.Key.values().forEach { key -> remove(key.toString()) }
     }
 
     // endregion
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/ActivityViewTrackingStrategyTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/ActivityViewTrackingStrategyTest.kt
@@ -107,7 +107,7 @@ internal class ActivityViewTrackingStrategyTest :
         verify(rumMonitor.mockInstance).startView(
             mockActivity,
             mockActivity.resolveViewName(),
-            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)
+            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)
         )
     }
 
@@ -163,7 +163,7 @@ internal class ActivityViewTrackingStrategyTest :
         val expectedAttributes = mapOf<String, Any?>(
             "view.intent.action" to action,
             "view.intent.uri" to uri,
-            ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY
+            ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY
         )
 
         testedStrategy.register(rumMonitor.mockSdkCore, mockActivity)
@@ -223,7 +223,7 @@ internal class ActivityViewTrackingStrategyTest :
         verify(rumMonitor.mockInstance).startView(
             mockActivity,
             fakeName,
-            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)
+            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)
         )
     }
 
@@ -244,7 +244,7 @@ internal class ActivityViewTrackingStrategyTest :
         verify(rumMonitor.mockInstance).startView(
             mockActivity,
             mockActivity.resolveViewName(),
-            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)
+            mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)
         )
     }
 
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/metric/ViewEndedMetricDispatcherTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/metric/ViewEndedMetricDispatcherTest.kt
@@ -88,7 +88,7 @@ internal class ViewEndedMetricDispatcherTest {
             )
         }
 
-        fakeInstrumentationType = instrumentationType?.value
+        fakeInstrumentationType = instrumentationType?.name?.lowercase()
 
         dispatcherUnderTest = ViewEndedMetricDispatcher(
             viewType = fakeViewType,
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/tracking/FragmentViewTrackingStrategyTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/tracking/FragmentViewTrackingStrategyTest.kt
@@ -261,7 +261,7 @@ internal class FragmentViewTrackingStrategyTest : ObjectTest<FragmentViewTrackin
         testedStrategy.register(rumMonitor.mockSdkCore, mockAppContext)
         val mockFragment: Fragment = mockFragmentWithArguments(forge)
         val expectedAttrs = mapOf(
-            ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT
+            ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT
         )
         val argumentCaptor = argumentCaptor<FragmentManager.FragmentLifecycleCallbacks>()
 
@@ -478,7 +478,7 @@ internal class FragmentViewTrackingStrategyTest : ObjectTest<FragmentViewTrackin
         )
         testedStrategy.register(rumMonitor.mockSdkCore, mockAppContext)
         val expectedAttrs = mapOf(
-            ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT
+            ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT
         )
         val mockFragment: android.app.Fragment = mockDeprecatedFragmentWithArguments(forge)
         val argumentCaptor =
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/tracking/NavigationViewTrackingStrategyTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/tracking/NavigationViewTrackingStrategyTest.kt
@@ -314,7 +314,7 @@ internal class NavigationViewTrackingStrategyTest {
         verify(rumMonitor.mockInstance).startView(
             mockNavDestination,
             fakeDestinationName,
-            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)
+            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)
         )
     }
 
@@ -341,7 +341,7 @@ internal class NavigationViewTrackingStrategyTest {
         verify(rumMonitor.mockInstance).startView(
             mockNavDestination,
             customName,
-            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)
+            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)
         )
     }
 
@@ -352,7 +352,7 @@ internal class NavigationViewTrackingStrategyTest {
         whenever(mockPredicate.accept(mockNavDestination)) doReturn true
         val arguments = Bundle()
         val expectedAttrs = mutableMapOf<String, Any?>(
-            ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT
+            ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT
         )
         repeat(10) {
             val key = forge.anAlphabeticalString()
@@ -391,7 +391,7 @@ internal class NavigationViewTrackingStrategyTest {
         verify(rumMonitor.mockInstance).startView(
             mockNavDestination,
             fakeDestinationName,
-            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)
+            mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)
         )
     }
 
@@ -413,12 +413,12 @@ internal class NavigationViewTrackingStrategyTest {
             verify(rumMonitor.mockInstance).startView(
                 mockNavDestination,
                 fakeDestinationName,
-                mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)
+                mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)
             )
             verify(rumMonitor.mockInstance).startView(
                 newDestination,
                 newDestinationName,
-                mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)
+                mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)
             )
         }
     }
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt
diff --git a/integrations/dd-sdk-android-compose/src/test/kotlin/com/datadog/android/compose/internal/ComposeNavigationObserverTest.kt b/integrations/dd-sdk-android-compose/src/test/kotlin/com/datadog/android/compose/internal/ComposeNavigationObserverTest.kt

Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ public final class com/datadog/android/core/internal/attributes/LocalAttribute$K`
`728`	`728`	`public static final field CREATION_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;`
`729`	`729`	`public static final field REPORTING_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;`
`730`	`730`	`public static final field VIEW_SCOPE_INSTRUMENTATION_TYPE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;`
`731`		`- public final fun getString ()Ljava/lang/String;`
	`731`	`+ public fun toString ()Ljava/lang/String;`
`732`	`732`	`public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;`
`733`	`733`	`public static fun values ()[Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;`
`734`	`734`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1434,7 +1434,7 @@ internal open class RumViewScope(`
`1434`	`1434`	`}`
`1435`	`1435`
`1436`	`1436`	`private fun RumRawEvent.StartView.tryResolveInstrumentationType() =`
`1437`		`- attributes[LocalAttribute.Key.VIEW_SCOPE_INSTRUMENTATION_TYPE.string] as? ViewScopeInstrumentationType`
	`1437`	`+ attributes[LocalAttribute.Key.VIEW_SCOPE_INSTRUMENTATION_TYPE.toString()] as? ViewScopeInstrumentationType`
`1438`	`1438`
`1439`	`1439`	`@Suppress("CommentOverPrivateFunction")`
`1440`	`1440`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -498,10 +498,10 @@ internal class TelemetryEventHandler(`
`498`	`498`	`return (effectiveSampleRate * HUNDRED).toFloat()`
`499`	`499`	`}`
`500`	`500`
`501`		`- private fun Map<String, Any?>.getFloat(key: LocalAttribute.Key) = get(key.string) as? Float`
	`501`	`+ private fun Map<String, Any?>.getFloat(key: LocalAttribute.Key) = get(key.toString()) as? Float`
`502`	`502`
`503`	`503`	`private fun Map<String, Any?>.cleanUpInternalAttributes() = toMutableMap().apply {`
`504`		`- LocalAttribute.Key.values().forEach { key -> remove(key.string) }`
	`504`	`+ LocalAttribute.Key.values().forEach { key -> remove(key.toString()) }`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`// endregion`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ internal class ActivityViewTrackingStrategyTest :`
`107`	`107`	`verify(rumMonitor.mockInstance).startView(`
`108`	`108`	`mockActivity,`
`109`	`109`	`mockActivity.resolveViewName(),`
`110`		`- mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)`
	`110`	`+ mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)`
`111`	`111`	`)`
`112`	`112`	`}`
`113`	`113`
`@@ -163,7 +163,7 @@ internal class ActivityViewTrackingStrategyTest :`
`163`	`163`	`val expectedAttributes = mapOf<String, Any?>(`
`164`	`164`	`"view.intent.action" to action,`
`165`	`165`	`"view.intent.uri" to uri,`
`166`		`- ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY`
	`166`	`+ ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY`
`167`	`167`	`)`
`168`	`168`
`169`	`169`	`testedStrategy.register(rumMonitor.mockSdkCore, mockActivity)`
`@@ -223,7 +223,7 @@ internal class ActivityViewTrackingStrategyTest :`
`223`	`223`	`verify(rumMonitor.mockInstance).startView(`
`224`	`224`	`mockActivity,`
`225`	`225`	`fakeName,`
`226`		`- mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)`
	`226`	`+ mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)`
`227`	`227`	`)`
`228`	`228`	`}`
`229`	`229`
`@@ -244,7 +244,7 @@ internal class ActivityViewTrackingStrategyTest :`
`244`	`244`	`verify(rumMonitor.mockInstance).startView(`
`245`	`245`	`mockActivity,`
`246`	`246`	`mockActivity.resolveViewName(),`
`247`		`- mapOf(ViewScopeInstrumentationType.ACTIVITY.key.string to ViewScopeInstrumentationType.ACTIVITY)`
	`247`	`+ mapOf(ViewScopeInstrumentationType.ACTIVITY.key.toString() to ViewScopeInstrumentationType.ACTIVITY)`
`248`	`248`	`)`
`249`	`249`	`}`
`250`	`250`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ internal class ViewEndedMetricDispatcherTest {`
`88`	`88`	`)`
`89`	`89`	`}`
`90`	`90`
`91`		`- fakeInstrumentationType = instrumentationType?.value`
	`91`	`+ fakeInstrumentationType = instrumentationType?.name?.lowercase()`
`92`	`92`
`93`	`93`	`dispatcherUnderTest = ViewEndedMetricDispatcher(`
`94`	`94`	`viewType = fakeViewType,`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ internal class FragmentViewTrackingStrategyTest : ObjectTest<FragmentViewTrackin`
`261`	`261`	`testedStrategy.register(rumMonitor.mockSdkCore, mockAppContext)`
`262`	`262`	`val mockFragment: Fragment = mockFragmentWithArguments(forge)`
`263`	`263`	`val expectedAttrs = mapOf(`
`264`		`- ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT`
	`264`	`+ ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT`
`265`	`265`	`)`
`266`	`266`	`val argumentCaptor = argumentCaptor<FragmentManager.FragmentLifecycleCallbacks>()`
`267`	`267`
`@@ -478,7 +478,7 @@ internal class FragmentViewTrackingStrategyTest : ObjectTest<FragmentViewTrackin`
`478`	`478`	`)`
`479`	`479`	`testedStrategy.register(rumMonitor.mockSdkCore, mockAppContext)`
`480`	`480`	`val expectedAttrs = mapOf(`
`481`		`- ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT`
	`481`	`+ ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT`
`482`	`482`	`)`
`483`	`483`	`val mockFragment: android.app.Fragment = mockDeprecatedFragmentWithArguments(forge)`
`484`	`484`	`val argumentCaptor =`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ internal class NavigationViewTrackingStrategyTest {`
`314`	`314`	`verify(rumMonitor.mockInstance).startView(`
`315`	`315`	`mockNavDestination,`
`316`	`316`	`fakeDestinationName,`
`317`		`- mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)`
	`317`	`+ mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)`
`318`	`318`	`)`
`319`	`319`	`}`
`320`	`320`
`@@ -341,7 +341,7 @@ internal class NavigationViewTrackingStrategyTest {`
`341`	`341`	`verify(rumMonitor.mockInstance).startView(`
`342`	`342`	`mockNavDestination,`
`343`	`343`	`customName,`
`344`		`- mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)`
	`344`	`+ mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)`
`345`	`345`	`)`
`346`	`346`	`}`
`347`	`347`
`@@ -352,7 +352,7 @@ internal class NavigationViewTrackingStrategyTest {`
`352`	`352`	`whenever(mockPredicate.accept(mockNavDestination)) doReturn true`
`353`	`353`	`val arguments = Bundle()`
`354`	`354`	`val expectedAttrs = mutableMapOf<String, Any?>(`
`355`		`- ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT`
	`355`	`+ ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT`
`356`	`356`	`)`
`357`	`357`	`repeat(10) {`
`358`	`358`	`val key = forge.anAlphabeticalString()`
`@@ -391,7 +391,7 @@ internal class NavigationViewTrackingStrategyTest {`
`391`	`391`	`verify(rumMonitor.mockInstance).startView(`
`392`	`392`	`mockNavDestination,`
`393`	`393`	`fakeDestinationName,`
`394`		`- mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)`
	`394`	`+ mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)`
`395`	`395`	`)`
`396`	`396`	`}`
`397`	`397`
`@@ -413,12 +413,12 @@ internal class NavigationViewTrackingStrategyTest {`
`413`	`413`	`verify(rumMonitor.mockInstance).startView(`
`414`	`414`	`mockNavDestination,`
`415`	`415`	`fakeDestinationName,`
`416`		`- mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)`
	`416`	`+ mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)`
`417`	`417`	`)`
`418`	`418`	`verify(rumMonitor.mockInstance).startView(`
`419`	`419`	`newDestination,`
`420`	`420`	`newDestinationName,`
`421`		`- mapOf(ViewScopeInstrumentationType.FRAGMENT.key.string to ViewScopeInstrumentationType.FRAGMENT)`
	`421`	`+ mapOf(ViewScopeInstrumentationType.FRAGMENT.key.toString() to ViewScopeInstrumentationType.FRAGMENT)`
`422`	`422`	`)`
`423`	`423`	`}`
`424`	`424`	`}`