Remove the reset event

embrace-io · Dec 31, 2024 · 5698c9f · 5698c9f
1 parent ef7f7bb
commit 5698c9f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 58 deletions.
diff --git a/...ain/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadEventListener.kt b/...ain/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadEventListener.kt
@@ -77,10 +77,4 @@ interface UiLoadEventListener {
      * or after it has loaded. Calls to this for a given instance should be idempotent.
      */
     fun exit(instanceId: Int, activityName: String, timestampMs: Long)
-
-    /**
-     * When the app is no longer in a state where it is trying to open up UI. All traces should be abandoned and
-     * Any events received after this should assume the app is emerging or have emerged from a background state.
-     */
-    fun reset(lastInstanceId: Int)
 }
diff --git a/...ures/src/main/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadExt.kt b/...ures/src/main/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadExt.kt
@@ -81,10 +81,6 @@ private class ActivityLoadEventEmitter(
     override fun onActivityPrePaused(activity: Activity) {
         lifecycleEventEmitter.pause(activity)
     }
-
-    override fun onActivityStopped(activity: Activity) {
-        lifecycleEventEmitter.stop(activity)
-    }
 }
 
 /**
@@ -117,10 +113,6 @@ private class LegacyActivityLoadEventEmitter(
     override fun onActivityPaused(activity: Activity) {
         lifecycleEventEmitter.pause(activity)
     }
-
-    override fun onActivityStopped(activity: Activity) {
-        lifecycleEventEmitter.stop(activity)
-    }
 }
 
 /**
@@ -186,12 +178,6 @@ private class LifecycleEventEmitter(
         )
     }
 
-    fun stop(activity: Activity) {
-        uiLoadEventListener.reset(
-            lastInstanceId = traceInstanceId(activity),
-        )
-    }
-
     private fun traceInstanceId(activity: Activity): Int = activity.hashCode()
 
     private fun nowMs(): Long = clock.now().nanosToMillis()

diff --git a/...main/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadTraceEmitter.kt b/...main/kotlin/io/embrace/android/embracesdk/internal/capture/activity/UiLoadTraceEmitter.kt
@@ -162,9 +162,6 @@ class UiLoadTraceEmitter(
         )
     }
 
-    override fun reset(lastInstanceId: Int) {
-    }
-
     private fun startTrace(
         uiLoadType: UiLoadType,
         instanceId: Int,
@@ -174,8 +171,7 @@ class UiLoadTraceEmitter(
     ) {
         if (!activeTraces.containsKey(instanceId)) {
             val newInstance = UiInstance(activityName, instanceId)
-            val previousInstance = currentInstance.getAndSet(newInstance)
-            if (previousInstance != null) {
+            currentInstance.getAndSet(newInstance)?.let { previousInstance ->
                 exit(previousInstance.id, previousInstance.name, timestampMs)
             }
 

diff --git a/...es/src/test/java/io/embrace/android/embracesdk/internal/capture/activity/UiLoadExtTest.kt b/...es/src/test/java/io/embrace/android/embracesdk/internal/capture/activity/UiLoadExtTest.kt
@@ -85,9 +85,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + (POST_DURATION + STATE_DURATION + PRE_DURATION) * 3 + PRE_DURATION
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }
@@ -118,9 +115,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + (POST_DURATION + STATE_DURATION + PRE_DURATION) * 2 + PRE_DURATION
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }
@@ -136,9 +130,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + (POST_DURATION + STATE_DURATION + PRE_DURATION) * 3 + PRE_DURATION
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }
@@ -173,9 +164,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + STATE_DURATION * 4
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }
@@ -206,9 +194,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + STATE_DURATION * 3
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }
@@ -224,9 +209,6 @@ internal class UiLoadExtTest {
                     stage = "abandon",
                     timestampMs = startTimeMs + STATE_DURATION * 4
                 ),
-                createEvent(
-                    stage = "reset",
-                ),
             )
         )
     }

diff --git a/...st/java/io/embrace/android/embracesdk/internal/capture/activity/UiLoadTraceEmitterTest.kt b/...st/java/io/embrace/android/embracesdk/internal/capture/activity/UiLoadTraceEmitterTest.kt
@@ -337,12 +337,6 @@ internal class UiLoadTraceEmitterTest {
                     instanceId = lastInstanceId,
                     firePreAndPost = firePreAndPost,
                 )
-                traceEmitter.exit(
-                    instanceId = lastInstanceId,
-                    activityName = lastActivityName,
-                    timestampMs = lastActivityExitMs
-                )
-                traceEmitter.reset(lastInstanceId)
             }
 
             PreviousState.FROM_INTERRUPTED_LOAD -> {

diff --git a/...test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeUiLoadEventListener.kt b/...test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeUiLoadEventListener.kt
@@ -16,15 +16,6 @@ class FakeUiLoadEventListener : UiLoadEventListener {
         )
     }
 
-    override fun reset(lastInstanceId: Int) {
-        events.add(
-            EventData(
-                stage = "reset",
-                instanceId = lastInstanceId,
-            )
-        )
-    }
-
     override fun create(instanceId: Int, activityName: String, timestampMs: Long, manualEnd: Boolean) {
         events.add(
             EventData(