Merge pull request #2669 from DataDog/nogorodnikov/minor-cleanup-230525

Minor cleanup

Author: 0xnm

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt

@@ -472,20 +472,9 @@ internal class RumViewScopeTest {
     ) {
         // Given
         val fakeEvent = forge.anElementFrom(
-            RumRawEvent.AddLongTask(durationNs = forge.aPositiveLong(), target = forge.aString()),
-            RumRawEvent.AddError(
-                message = forge.aString(),
-                sourceType = forge.getForgery(),
-                source = forge.getForgery(),
-                throwable = null,
-                stacktrace = null,
-                isFatal = true,
-                threads = emptyList(),
-                attributes = forge.exhaustiveAttributes()
-            ),
-            RumRawEvent.AddCustomTiming(
-                name = forge.aString()
-            )
+            forge.addLongTaskEvent(),
+            forge.addErrorEvent(),
+            forge.addCustomTimingEvent()
         )
         val datadogContextWithReplay = fakeDatadogContext.copy(
             featuresContext = fakeDatadogContext.featuresContext +

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/SessionReplay.kt

@@ -10,7 +10,7 @@ import androidx.annotation.VisibleForTesting
 import com.datadog.android.Datadog
 import com.datadog.android.api.InternalLogger
 import com.datadog.android.api.SdkCore
-import com.datadog.android.api.feature.Feature.Companion.SESSION_REPLAY_FEATURE_NAME
+import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.sessionreplay.internal.SessionReplayFeature
 import com.datadog.android.sessionreplay.internal.TouchPrivacyManager
@@ -81,7 +81,7 @@ object SessionReplay {
         sdkCore: SdkCore = Datadog.getInstance()
     ) {
         val sessionReplayFeature = (sdkCore as? FeatureSdkCore)
-            ?.getFeature(SESSION_REPLAY_FEATURE_NAME)?.let {
+            ?.getFeature(Feature.SESSION_REPLAY_FEATURE_NAME)?.let {
                 it.unwrap() as? SessionReplayFeature
             }
 
@@ -97,7 +97,7 @@ object SessionReplay {
         sdkCore: SdkCore = Datadog.getInstance()
     ) {
         val sessionReplayFeature = (sdkCore as? FeatureSdkCore)
-            ?.getFeature(SESSION_REPLAY_FEATURE_NAME)?.let {
+            ?.getFeature(Feature.SESSION_REPLAY_FEATURE_NAME)?.let {
                 it.unwrap() as? SessionReplayFeature
             }
 

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/NoOpRecordCallback.kt

@@ -7,6 +7,7 @@
 package com.datadog.android.sessionreplay.internal
 
 import android.content.Context
+import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.api.feature.StorageBackedFeature
 import com.datadog.android.api.net.RequestFactory
@@ -30,7 +31,7 @@ internal class ResourcesFeature(
 
     // region Feature
 
-    override val name: String = SESSION_REPLAY_RESOURCES_FEATURE_NAME
+    override val name: String = Feature.SESSION_REPLAY_RESOURCES_FEATURE_NAME
 
     override val requestFactory: RequestFactory = ResourcesRequestFactory(
         customEndpointUrl = customEndpointUrl,
@@ -66,7 +67,5 @@ internal class ResourcesFeature(
                 maxItemSize = 10 * 1024 * 1024,
                 maxBatchSize = 10 * 1024 * 1024
             )
-
-        internal const val SESSION_REPLAY_RESOURCES_FEATURE_NAME = "session-replay-resources"
     }
 }

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/ResourcesFeature.kt

@@ -131,7 +131,7 @@ internal class SessionReplayFeature(
         }
 
         this.appContext = appContext
-        sdkCore.setEventReceiver(SESSION_REPLAY_FEATURE_NAME, this)
+        sdkCore.setEventReceiver(Feature.SESSION_REPLAY_FEATURE_NAME, this)
 
         val resourcesFeature = registerResourceFeature(sdkCore)
 
@@ -153,7 +153,7 @@ internal class SessionReplayFeature(
             )
         sessionReplayRecorder.registerCallbacks()
         initialized.set(true)
-        sdkCore.updateFeatureContext(SESSION_REPLAY_FEATURE_NAME) {
+        sdkCore.updateFeatureContext(Feature.SESSION_REPLAY_FEATURE_NAME) {
             it[SESSION_REPLAY_SAMPLE_RATE_KEY] = rateBasedSampler.getSampleRate()?.toLong()
             it[SESSION_REPLAY_START_IMMEDIATE_RECORDING_KEY] = startRecordingImmediately
             it[SESSION_REPLAY_TOUCH_PRIVACY_KEY] = touchPrivacy.toString().lowercase(Locale.US)
@@ -355,7 +355,7 @@ internal class SessionReplayFeature(
     internal fun startRecording() {
         // Check initialization again so we don't forget to do it when this method is made public
         if (checkIfInitialized() && !isRecording.getAndSet(true)) {
-            sdkCore.updateFeatureContext(SESSION_REPLAY_FEATURE_NAME) {
+            sdkCore.updateFeatureContext(Feature.SESSION_REPLAY_FEATURE_NAME) {
                 it[SESSION_REPLAY_ENABLED_KEY] = true
             }
             sessionReplayRecorder.resumeRecorders()
@@ -372,7 +372,7 @@ internal class SessionReplayFeature(
      */
     internal fun stopRecording() {
         if (isRecording.getAndSet(false)) {
-            sdkCore.updateFeatureContext(SESSION_REPLAY_FEATURE_NAME) {
+            sdkCore.updateFeatureContext(Feature.SESSION_REPLAY_FEATURE_NAME) {
                 it[SESSION_REPLAY_ENABLED_KEY] = false
             }
             sessionReplayRecorder.stopRecorders()
@@ -425,7 +425,6 @@ internal class SessionReplayFeature(
             " are either missing or have wrong type."
         internal const val CANNOT_START_RECORDING_NOT_INITIALIZED =
             "Cannot start session recording, because Session Replay feature is not initialized."
-        const val SESSION_REPLAY_FEATURE_NAME = "session-replay"
         const val SESSION_REPLAY_BUS_MESSAGE_TYPE_KEY = "type"
         const val RUM_SESSION_RENEWED_BUS_MESSAGE = "rum_session_renewed"
         const val RUM_KEEP_SESSION_BUS_MESSAGE_KEY = "keepSession"

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeature.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.android.sessionreplay.internal
 
+import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.sessionreplay.internal.processor.EnrichedRecord
 
@@ -17,7 +18,7 @@ internal class SessionReplayRecordCallback(
     override fun onRecordForViewSent(record: EnrichedRecord) {
         val recordsSize = record.records.size
         if (recordsSize > 0) {
-            featureSdkCore.updateFeatureContext(SessionReplayFeature.SESSION_REPLAY_FEATURE_NAME) {
+            featureSdkCore.updateFeatureContext(Feature.SESSION_REPLAY_FEATURE_NAME) {
                 val viewId = record.viewId
                 val viewMetadata = (it[viewId] as? MutableMap<String, Any?>) ?: mutableMapOf()
                 viewMetadata[HAS_REPLAY_KEY] = true

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayRecordCallback.kt

@@ -7,13 +7,13 @@
 package com.datadog.android.sessionreplay.internal.resources
 
 import android.text.format.DateUtils
+import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.api.storage.datastore.DataStoreReadCallback
 import com.datadog.android.api.storage.datastore.DataStoreWriteCallback
 import com.datadog.android.core.internal.persistence.Deserializer
 import com.datadog.android.core.persistence.Serializer
 import com.datadog.android.core.persistence.datastore.DataStoreContent
-import com.datadog.android.sessionreplay.internal.ResourcesFeature.Companion.SESSION_REPLAY_RESOURCES_FEATURE_NAME
 import com.datadog.android.sessionreplay.model.ResourceHashesEntry
 import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
@@ -91,7 +91,7 @@ internal class ResourceDataStoreManager(
         )
 
         featureSdkCore.getFeature(
-            SESSION_REPLAY_RESOURCES_FEATURE_NAME
+            Feature.SESSION_REPLAY_RESOURCES_FEATURE_NAME
         )?.dataStore?.setValue(
             data = data,
             key = DATASTORE_HASHES_ENTRY_NAME,
@@ -104,7 +104,7 @@ internal class ResourceDataStoreManager(
         onFetchFailure: () -> Unit
     ) {
         featureSdkCore.getFeature(
-            SESSION_REPLAY_RESOURCES_FEATURE_NAME
+            Feature.SESSION_REPLAY_RESOURCES_FEATURE_NAME
         )?.dataStore?.value(
             key = DATASTORE_HASHES_ENTRY_NAME,
             deserializer = resourceHashesDeserializer,
@@ -122,7 +122,7 @@ internal class ResourceDataStoreManager(
 
     private fun deleteStoredHashesEntry(callback: DataStoreWriteCallback) =
         featureSdkCore.getFeature(
-            SESSION_REPLAY_RESOURCES_FEATURE_NAME
+            Feature.SESSION_REPLAY_RESOURCES_FEATURE_NAME
         )?.dataStore?.removeValue(
             key = DATASTORE_HASHES_ENTRY_NAME,
             callback = callback

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/async/NoopDataQueueHandler.kt

@@ -6,19 +6,19 @@
 
 package com.datadog.android.sessionreplay.internal.storage
 
+import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.api.storage.EventType
 import com.datadog.android.api.storage.RawBatchEvent
 import com.datadog.android.sessionreplay.internal.RecordCallback
-import com.datadog.android.sessionreplay.internal.SessionReplayFeature
 import com.datadog.android.sessionreplay.internal.processor.EnrichedRecord
 
 internal class SessionReplayRecordWriter(
     private val sdkCore: FeatureSdkCore,
     private val recordCallback: RecordCallback
 ) : RecordWriter {
     override fun write(record: EnrichedRecord) {
-        sdkCore.getFeature(SessionReplayFeature.SESSION_REPLAY_FEATURE_NAME)
+        sdkCore.getFeature(Feature.SESSION_REPLAY_FEATURE_NAME)
             ?.withWriteContext { _, writeScope ->
                 writeScope {
                     val serializedRecord = record.toJson().toByteArray(Charsets.UTF_8)