Prepare feature flags and defaults for nav state dark mode

bidetofevil · bidetofevil · commit 7ad771c092bc · 2026-04-20T11:31:58.000-07:00
diff --git a/embrace-android-config-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/behavior/FakeAutoDataCaptureBehavior.kt b/embrace-android-config-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/behavior/FakeAutoDataCaptureBehavior.kt
@@ -15,7 +15,7 @@ class FakeAutoDataCaptureBehavior(
     private val uiLoadTracingEnabled: Boolean = true,
     private val uiLoadTracingTraceAll: Boolean = true,
     private val endStartupWithAppReady: Boolean = false,
-    private val enableStateCapture: Boolean = false,
+    private val enableStateCapture: Boolean = true,
     private val networkCallbackConnectivityServiceEnabled: Boolean = false,
     private val navigationStateCaptureEnabled: Boolean = true,
 ) : AutoDataCaptureBehavior {
diff --git a/embrace-android-config-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/config/FakeEnabledFeatureConfig.kt b/embrace-android-config-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/config/FakeEnabledFeatureConfig.kt
@@ -31,7 +31,6 @@ class FakeEnabledFeatureConfig(
     private val uiLoadTracingTraceAll: Boolean = base.isUiLoadTracingTraceAll(),
     private val endStartupWithAppReady: Boolean = base.isEndStartupWithAppReadyEnabled(),
     private val otelKotlinSdkEnabled: Boolean = base.isOtelKotlinSdkEnabled(),
-    private val stateCaptureEnabled: Boolean = base.isStateCaptureEnabled(),
 ) : EnabledFeatureConfig {
 
     override fun isActivityBreadcrumbCaptureEnabled(): Boolean = activityBreadcrumbCapture
@@ -58,5 +57,4 @@ class FakeEnabledFeatureConfig(
     override fun isUiLoadTracingTraceAll(): Boolean = uiLoadTracingTraceAll
     override fun isEndStartupWithAppReadyEnabled(): Boolean = endStartupWithAppReady
     override fun isOtelKotlinSdkEnabled(): Boolean = otelKotlinSdkEnabled
-    override fun isStateCaptureEnabled(): Boolean = stateCaptureEnabled
 }
diff --git a/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImpl.kt b/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImpl.kt
@@ -16,6 +16,8 @@ class AutoDataCaptureBehaviorImpl(
     private companion object {
         const val THERMAL_STATUS_ENABLED_DEFAULT = true
         const val UI_LOAD_REMOTE_ENABLED_DEFAULT = true
+        const val STATE_CAPTURE_ENABLED_DEFAULT = true
+        const val NAVIGATION_STATE_CAPTURE_ENABLED_DEFAULT = true
     }
 
     private val local = local.enabledFeatures
@@ -47,11 +49,11 @@ class AutoDataCaptureBehaviorImpl(
 
     override fun isEndStartupWithAppReadyEnabled(): Boolean = local.isEndStartupWithAppReadyEnabled()
     override fun isStateCaptureEnabled(): Boolean =
-        thresholdCheck.isBehaviorEnabled(remote?.pctStateCaptureEnabledV2) ?: local.isStateCaptureEnabled()
+        thresholdCheck.isBehaviorEnabled(remote?.pctStateCaptureEnabledV2) ?: STATE_CAPTURE_ENABLED_DEFAULT
 
     override fun isNetworkCallbackConnectivityServiceEnabled(): Boolean =
         thresholdCheck.isBehaviorEnabled(remote?.pctNetworkCallbackConnectivityServiceEnabled) ?: false
 
     override fun isNavigationStateCaptureEnabled(): Boolean =
-        thresholdCheck.isBehaviorEnabled(remote?.pctNavigationStateCaptureEnabled) ?: true
+        thresholdCheck.isBehaviorEnabled(remote?.pctNavigationStateCaptureEnabled) ?: NAVIGATION_STATE_CAPTURE_ENABLED_DEFAULT
 }
diff --git a/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImplTest.kt b/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImplTest.kt
@@ -38,7 +38,7 @@ internal class AutoDataCaptureBehaviorImplTest {
             assertTrue(isUiLoadTracingTraceAll())
             assertTrue(isThermalStatusCaptureEnabled())
             assertFalse(isEndStartupWithAppReadyEnabled())
-            assertFalse(isStateCaptureEnabled())
+            assertTrue(isStateCaptureEnabled())
             assertFalse(isNetworkCallbackConnectivityServiceEnabled())
             assertTrue(isNavigationStateCaptureEnabled())
         }
@@ -129,24 +129,11 @@ internal class AutoDataCaptureBehaviorImplTest {
         assertFalse(behavior.isUiLoadTracingTraceAll())
     }
 
-    @Test
-    fun `enable state capture`() {
-        val behavior = createBehavior(
-            localUiLoadTracingEnabled = true,
-            localUiLoadTracingTraceAllEnabled = true,
-            stateCaptureEnabled = true,
-            remote = remote
-        )
-
-        assertTrue(behavior.isStateCaptureEnabled())
-    }
-
     @Test
     fun `enable state capture remotely`() {
         val behavior = createBehavior(
             localUiLoadTracingEnabled = true,
             localUiLoadTracingTraceAllEnabled = true,
-            stateCaptureEnabled = false,
             remote = remote.copy(pctStateCaptureEnabledV2 = 100.0f)
         )
 
@@ -158,7 +145,6 @@ internal class AutoDataCaptureBehaviorImplTest {
         val behavior = createBehavior(
             localUiLoadTracingEnabled = true,
             localUiLoadTracingTraceAllEnabled = true,
-            stateCaptureEnabled = true,
             remote = remote.copy(pctStateCaptureEnabledV2 = 0.0f)
         )
 
@@ -188,13 +174,6 @@ internal class AutoDataCaptureBehaviorImplTest {
         )
     }
 
-    @Test
-    fun `navigation state capture enabled by default when remote pct is null`() {
-        assertTrue(
-            createBehavior(remote = RemoteConfig()).isNavigationStateCaptureEnabled()
-        )
-    }
-
     @Test
     fun `navigation state capture enabled when pct is 100`() {
         assertTrue(
@@ -216,15 +195,13 @@ internal class AutoDataCaptureBehaviorImplTest {
     private fun createBehavior(
         localUiLoadTracingEnabled: Boolean = true,
         localUiLoadTracingTraceAllEnabled: Boolean = true,
-        stateCaptureEnabled: Boolean = false,
         remote: RemoteConfig,
     ) = AutoDataCaptureBehaviorImpl(
         thresholdCheck = BehaviorThresholdCheck { FAKE_DEVICE_ID },
         local = FakeInstrumentedConfig(
             enabledFeatures = FakeEnabledFeatureConfig(
                 uiLoadTracingTraceAll = localUiLoadTracingTraceAllEnabled,
                 uiLoadTracingEnabled = localUiLoadTracingEnabled,
-                stateCaptureEnabled = stateCaptureEnabled,
             )
         ),
         remote = remote
diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/config/instrumented/schema/EnabledFeatureConfig.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/config/instrumented/schema/EnabledFeatureConfig.kt
@@ -168,9 +168,4 @@ interface EnabledFeatureConfig {
      * sdk_config.otel.enable_otel_kotlin_sdk
      */
     fun isOtelKotlinSdkEnabled(): Boolean = false
-
-    /**
-     * Gates whether the state feature is enabled. This is never set to true in production.
-     */
-    fun isStateCaptureEnabled(): Boolean = false
 }
diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/config/remote/RemoteConfig.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/config/remote/RemoteConfig.kt
@@ -104,7 +104,7 @@ data class RemoteConfig(
     @Json(name = "pct_network_callback_connectivity_service_enabled")
     val pctNetworkCallbackConnectivityServiceEnabled: Float? = null,
 
-    @Json(name = "pct_navigation_state_capture_enabled")
+    @Json(name = "pct_screen_tracking_enabled")
     val pctNavigationStateCaptureEnabled: Float? = null,
 
     @Json(name = "user_session")
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalLoggerTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalLoggerTest.kt
@@ -7,14 +7,14 @@ import io.embrace.android.embracesdk.fakes.FakeLogRecordExporter
 import io.embrace.android.embracesdk.fakes.config.FakeEnabledFeatureConfig
 import io.embrace.android.embracesdk.fakes.config.FakeInstrumentedConfig
 import io.embrace.android.embracesdk.fakes.config.FakeProjectConfig
-import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.internal.arch.attrs.toEmbraceAttributeName
 import io.embrace.android.embracesdk.internal.arch.state.AppState
 import io.embrace.android.embracesdk.internal.clock.millisToNanos
 import io.embrace.android.embracesdk.internal.config.remote.OtelKotlinSdkConfig
 import io.embrace.android.embracesdk.internal.config.remote.RemoteConfig
 import io.embrace.android.embracesdk.internal.otel.payload.toEmbracePayload
 import io.embrace.android.embracesdk.internal.toStringMap
+import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.embrace.android.embracesdk.testframework.actions.EmbraceActionInterface
 import io.embrace.android.embracesdk.testframework.actions.EmbraceOtelExportAssertionInterface
@@ -48,7 +48,6 @@ internal class ExternalLoggerTest {
     private val instrumentedConfig = FakeInstrumentedConfig(
         enabledFeatures = FakeEnabledFeatureConfig(
             bgActivityCapture = true,
-            stateCaptureEnabled = true
         ),
         project = FakeProjectConfig(
             appId = "abcde",
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalOtelJavaLoggerTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalOtelJavaLoggerTest.kt
@@ -7,7 +7,6 @@ import io.embrace.android.embracesdk.fakes.FakeOtelJavaLogRecordExporter
 import io.embrace.android.embracesdk.fakes.config.FakeEnabledFeatureConfig
 import io.embrace.android.embracesdk.fakes.config.FakeInstrumentedConfig
 import io.embrace.android.embracesdk.fakes.config.FakeProjectConfig
-import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.internal.arch.attrs.toEmbraceAttributeName
 import io.embrace.android.embracesdk.internal.arch.state.AppState
 import io.embrace.android.embracesdk.internal.clock.millisToNanos
@@ -17,6 +16,7 @@ import io.embrace.android.embracesdk.internal.payload.Log
 import io.embrace.android.embracesdk.internal.toStringMap
 import io.embrace.android.embracesdk.otel.java.addJavaLogRecordExporter
 import io.embrace.android.embracesdk.otel.java.getJavaOpenTelemetry
+import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.embrace.android.embracesdk.testframework.actions.EmbraceActionInterface
 import io.embrace.android.embracesdk.testframework.actions.EmbracePreSdkStartInterface
@@ -49,7 +49,6 @@ internal class ExternalOtelJavaLoggerTest {
     private val instrumentedConfig = FakeInstrumentedConfig(
         enabledFeatures = FakeEnabledFeatureConfig(
             bgActivityCapture = true,
-            stateCaptureEnabled = true
         ),
         project = FakeProjectConfig(
             appId = "abcde",
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/UserSessionApiTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/UserSessionApiTest.kt
@@ -4,10 +4,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.embrace.android.embracesdk.assertions.toMap
 import io.embrace.android.embracesdk.fakes.config.FakeEnabledFeatureConfig
 import io.embrace.android.embracesdk.fakes.config.FakeInstrumentedConfig
-import io.embrace.android.embracesdk.semconv.EmbTelemetryAttributes
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
 import io.embrace.android.embracesdk.internal.otel.sdk.findAttributeValue
 import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
+import io.embrace.android.embracesdk.semconv.EmbTelemetryAttributes
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.opentelemetry.kotlin.semconv.SessionAttributes
 import org.junit.Assert.assertEquals
@@ -32,7 +32,12 @@ internal class UserSessionApiTest {
         var startTime: Long = -1
 
         testRule.runTest(
-            instrumentedConfig = FakeInstrumentedConfig(enabledFeatures = FakeEnabledFeatureConfig(diskUsageCapture = false, bgActivityCapture = true)),
+            instrumentedConfig = FakeInstrumentedConfig(
+                enabledFeatures = FakeEnabledFeatureConfig(
+                    diskUsageCapture = false,
+                    bgActivityCapture = true
+                )
+            ),
             testCaseAction = {
                 startTime = recordSession {
                     embrace.setUserIdentifier("some id")
@@ -80,7 +85,7 @@ internal class UserSessionApiTest {
                     "emb.usage.set_username" to "1",
                     "emb.usage.set_user_email" to "1",
                     "emb.usage.set_user_identifier" to "1",
-                    EmbSessionAttributes.EMB_PRIVATE_SEQUENCE_ID to "5",
+                    EmbSessionAttributes.EMB_PRIVATE_SEQUENCE_ID to "9",
                     EmbSessionAttributes.EMB_STARTUP_DURATION to "0"
                 ).toSortedMap()
 
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/LowPowerFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/LowPowerFeatureTest.kt
@@ -91,7 +91,6 @@ internal class LowPowerFeatureTest {
         testRule.runTest(
             instrumentedConfig = FakeInstrumentedConfig(
                 enabledFeatures = FakeEnabledFeatureConfig(
-                    stateCaptureEnabled = true,
                     bgActivityCapture = false,
                     powerSaveCapture = true
                 )
@@ -139,7 +138,6 @@ internal class LowPowerFeatureTest {
         testRule.runTest(
             instrumentedConfig = FakeInstrumentedConfig(
                 enabledFeatures = FakeEnabledFeatureConfig(
-                    stateCaptureEnabled = true,
                     powerSaveCapture = false
                 )
             ),
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NativeCrashFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NativeCrashFeatureTest.kt
@@ -54,15 +54,13 @@ internal class NativeCrashFeatureTest {
     private val config = FakeInstrumentedConfig(
         enabledFeatures = FakeEnabledFeatureConfig(
             nativeCrashCapture = true,
-            stateCaptureEnabled = true
         ),
         symbols = createNativeSymbolsForCurrentArch(fakeSymbols)
     )
 
     private val disabledConfig = FakeInstrumentedConfig(
         enabledFeatures = FakeEnabledFeatureConfig(
             nativeCrashCapture = false,
-            stateCaptureEnabled = true
         )
     )
 
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NavigationComplexDestinationAndRouteTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NavigationComplexDestinationAndRouteTest.kt
@@ -10,8 +10,6 @@ import io.embrace.android.embracesdk.fakes.DialogNavHostFragmentActivity
 import io.embrace.android.embracesdk.fakes.FqcnRouteActivityNavHost
 import io.embrace.android.embracesdk.fakes.NestedGraphNavHostFragmentActivity
 import io.embrace.android.embracesdk.fakes.SerializableRouteNavHostFragmentActivity
-import io.embrace.android.embracesdk.fakes.config.FakeEnabledFeatureConfig
-import io.embrace.android.embracesdk.fakes.config.FakeInstrumentedConfig
 import io.embrace.android.embracesdk.internal.config.remote.RemoteConfig
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.embrace.android.embracesdk.testframework.actions.AppExecutionTimestamps
@@ -30,20 +28,12 @@ internal class NavigationComplexDestinationAndRouteTest {
     @JvmField
     val testRule: SdkIntegrationTestRule = SdkIntegrationTestRule()
 
-    private val enabledConfig = FakeInstrumentedConfig(
-        enabledFeatures = FakeEnabledFeatureConfig(
-            stateCaptureEnabled = true,
-            bgActivityCapture = false,
-        ),
-    )
-
     private val enabledRemoteConfig = RemoteConfig(pctNavigationStateCaptureEnabled = 100.0f)
 
     @Test
     fun `routes with argument templates use the template not the resolved value`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 timestamps = simulateNavHostFragmentActivityNavigation<ArgTemplateNavHostFragmentActivity>(
@@ -71,7 +61,6 @@ internal class NavigationComplexDestinationAndRouteTest {
     fun `dialog destinations tracked like fragment destinations`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 timestamps = simulateNavHostFragmentActivityNavigation<DialogNavHostFragmentActivity>(
@@ -97,7 +86,6 @@ internal class NavigationComplexDestinationAndRouteTest {
     fun `nested graph destinations use inner destination route`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 timestamps = simulateNavHostFragmentActivityNavigation<NestedGraphNavHostFragmentActivity>(
@@ -124,7 +112,6 @@ internal class NavigationComplexDestinationAndRouteTest {
     fun `back navigation triggers destination change`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 val activityController = Robolectric.buildActivity(BasicNavHostFragmentActivity::class.java)
@@ -169,7 +156,6 @@ internal class NavigationComplexDestinationAndRouteTest {
     fun `Serializable routes with SerialName use the serial name template not resolved args`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 val activityController = Robolectric.buildActivity(SerializableRouteNavHostFragmentActivity::class.java)
@@ -205,7 +191,6 @@ internal class NavigationComplexDestinationAndRouteTest {
     fun `Serializable routes without SerialName use fully qualified class name with template not resolved as state value`() {
         var timestamps: AppExecutionTimestamps? = null
         testRule.runTest(
-            instrumentedConfig = enabledConfig,
             persistedRemoteConfig = enabledRemoteConfig,
             testCaseAction = {
                 val activityController = Robolectric.buildActivity(FqcnRouteActivityNavHost::class.java)
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NavigationStateFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NavigationStateFeatureTest.kt
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NetworkStateFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NetworkStateFeatureTest.kt
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/StateFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/StateFeatureTest.kt
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/session/BackgroundActivityDisabledTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/session/BackgroundActivityDisabledTest.kt
