Read SR system requirement synchronously with strict mode allowance

DataDog · Oct 4, 2024 · ebf4c8e · ebf4c8e
1 parent 7ebe827
commit ebf4c8e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 52 deletions.
diff --git a/...android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/SessionReplay.kt b/...android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/SessionReplay.kt
@@ -6,8 +6,6 @@
 
 package com.datadog.android.sessionreplay
 
-import android.os.Handler
-import android.os.Looper
 import com.datadog.android.Datadog
 import com.datadog.android.api.SdkCore
 import com.datadog.android.api.feature.Feature.Companion.SESSION_REPLAY_FEATURE_NAME
@@ -31,22 +29,10 @@ object SessionReplay {
     fun enable(
         sessionReplayConfiguration: SessionReplayConfiguration,
         sdkCore: SdkCore = Datadog.getInstance()
-    ) {
-        enable(sessionReplayConfiguration, Handler(Looper.getMainLooper()), sdkCore)
-    }
-
-    internal fun enable(
-        sessionReplayConfiguration: SessionReplayConfiguration,
-        uiHandler: Handler,
-        sdkCore: SdkCore = Datadog.getInstance()
     ) {
         val featureSdkCore = sdkCore as FeatureSdkCore
-        sessionReplayConfiguration.systemRequirementsConfiguration.let {
-            it.runIfRequirementsMet(
-                sdkCore = sdkCore,
-                uiHandler = uiHandler,
-                featureSdkCore.internalLogger
-            ) {
+        sessionReplayConfiguration.systemRequirementsConfiguration
+            .runIfRequirementsMet(featureSdkCore.internalLogger) {
                 val sessionReplayFeature = SessionReplayFeature(
                     sdkCore = featureSdkCore,
                     customEndpointUrl = sessionReplayConfiguration.customEndpointUrl,
@@ -62,7 +48,6 @@ object SessionReplay {
                 )
                 sdkCore.registerFeature(sessionReplayFeature)
             }
-        }
     }
 
     /**

diff --git a/...play/src/main/kotlin/com/datadog/android/sessionreplay/SystemRequirementsConfiguration.kt b/...play/src/main/kotlin/com/datadog/android/sessionreplay/SystemRequirementsConfiguration.kt
@@ -6,11 +6,7 @@
 
 package com.datadog.android.sessionreplay
 
-import android.os.Handler
 import com.datadog.android.api.InternalLogger
-import com.datadog.android.api.feature.FeatureSdkCore
-import com.datadog.android.core.InternalSdkCore
-import com.datadog.android.core.internal.utils.submitSafe
 import com.datadog.android.sessionreplay.internal.prerequisite.CPURequirementChecker
 import com.datadog.android.sessionreplay.internal.prerequisite.MemoryRequirementChecker
 import com.datadog.android.sessionreplay.internal.prerequisite.SystemRequirementChecker
@@ -24,36 +20,30 @@ class SystemRequirementsConfiguration internal constructor(
 ) {
 
     internal fun runIfRequirementsMet(
-        sdkCore: FeatureSdkCore,
-        uiHandler: Handler,
         internalLogger: InternalLogger,
         runnable: () -> Unit
     ) {
         val checkers = listOf(
             CPURequirementChecker(minCPUCores, internalLogger = internalLogger),
             MemoryRequirementChecker(minRAMSizeMb, internalLogger = internalLogger)
         )
-        (sdkCore as InternalSdkCore).getPersistenceExecutorService().submitSafe(OPERATION_NAME, internalLogger) {
-            val checkResult = checkers.all {
-                it.checkMinimumRequirement()
-            }
+        val checkResult = checkers.all {
+            it.checkMinimumRequirement()
+        }
 
-            if (checkResult) {
-                uiHandler.post {
-                    runnable()
-                }
-            } else {
-                internalLogger.log(
-                    level = InternalLogger.Level.INFO,
-                    listOf(InternalLogger.Target.TELEMETRY, InternalLogger.Target.USER),
-                    messageBuilder = {
-                        "Session replay is disabled because the system doesn't meet the minimum " +
-                            "Session Replay requirements"
-                    },
-                    onlyOnce = true,
-                    additionalProperties = getCheckerReport(checkers)
-                )
-            }
+        if (checkResult) {
+            runnable()
+        } else {
+            internalLogger.log(
+                level = InternalLogger.Level.INFO,
+                listOf(InternalLogger.Target.TELEMETRY, InternalLogger.Target.USER),
+                messageBuilder = {
+                    "Session replay is disabled because the system doesn't meet the minimum " +
+                        "Session Replay requirements"
+                },
+                onlyOnce = true,
+                additionalProperties = getCheckerReport(checkers)
+            )
         }
     }
 
@@ -107,7 +97,6 @@ class SystemRequirementsConfiguration internal constructor(
     companion object {
 
         private const val ATTRIBUTE_DEVICE_STATS_KEY = "device_stats"
-        private const val OPERATION_NAME = "Check Session Replay requirements"
 
         /**
          * A preconfigured instance representing the basic system requirements for enabling the Session Replay feature.

diff --git a/...n/kotlin/com/datadog/android/sessionreplay/internal/prerequisite/CPURequirementChecker.kt b/...n/kotlin/com/datadog/android/sessionreplay/internal/prerequisite/CPURequirementChecker.kt
@@ -7,6 +7,7 @@
 package com.datadog.android.sessionreplay.internal.prerequisite
 
 import com.datadog.android.api.InternalLogger
+import com.datadog.android.core.allowThreadDiskReads
 import com.datadog.android.core.internal.persistence.file.listFilesSafe
 import java.io.File
 
@@ -22,7 +23,10 @@ internal class CPURequirementChecker(
         if (minCPUCores == 0) {
             return true
         }
-        return readCPUCoreNumber() >= minCPUCores
+        val actualCPUCoreNumber = allowThreadDiskReads {
+            readCPUCoreNumber()
+        }
+        return actualCPUCoreNumber >= minCPUCores
     }
 
     override fun name(): String = CPU_CHECK_NAME

diff --git a/...otlin/com/datadog/android/sessionreplay/internal/prerequisite/MemoryRequirementChecker.kt b/...otlin/com/datadog/android/sessionreplay/internal/prerequisite/MemoryRequirementChecker.kt
@@ -7,6 +7,7 @@
 package com.datadog.android.sessionreplay.internal.prerequisite
 
 import com.datadog.android.api.InternalLogger
+import com.datadog.android.core.allowThreadDiskReads
 import com.datadog.android.core.internal.persistence.file.canReadSafe
 import com.datadog.android.core.internal.persistence.file.existsSafe
 import com.datadog.android.core.internal.persistence.file.readLinesSafe
@@ -24,7 +25,10 @@ internal class MemoryRequirementChecker(
         if (minRamSizeMb == 0) {
             return true
         }
-        return getMaxRAMSize() >= minRamSizeMb
+        val actualMaxRamSizeMb = allowThreadDiskReads {
+            getMaxRAMSize()
+        }
+        return actualMaxRamSizeMb >= minRamSizeMb
     }
 
     override fun name(): String = MEMORY_CHECK_NAME

diff --git a/...oid-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/SessionReplayTest.kt b/...oid-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/SessionReplayTest.kt
@@ -28,7 +28,6 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
@@ -63,11 +62,9 @@ internal class SessionReplayTest {
             systemRequirementsConfiguration = mockSystemRequirementsConfiguration
         )
         whenever(
-            mockSystemRequirementsConfiguration.runIfRequirementsMet(
-                eq(mockSdkCore), any(), any(), any()
-            )
+            mockSystemRequirementsConfiguration.runIfRequirementsMet(any(), any())
         ) doAnswer {
-            it.getArgument<() -> Unit>(3).invoke()
+            it.getArgument<() -> Unit>(1).invoke()
         }
         SessionReplay.enable(
             fakeSessionReplayConfigurationWithMockRequirement,

diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
@@ -217,7 +217,7 @@ class SampleApplication : Application() {
 
     private fun initializeSessionReplay() {
         val shouldUseFgm = SecureRandom().nextInt(100) < USE_FGM_PCT
-        val systemRequirementsConfiguration = SystemRequirementsConfiguration.BASIC
+        val systemRequirementsConfiguration = SystemRequirementsConfiguration.NONE
 
         @Suppress("DEPRECATION")
         val sessionReplayConfig = SessionReplayConfiguration.Builder(SAMPLE_IN_ALL_SESSIONS)