Merge branch 'rz/feat/session-replay' into rz/feat/session-replay-breadcrumbs-v2

Author: romtsn

sentry-android-replay/src/main/java/io/sentry/android/replay/WindowRecorder.kt

@@ -137,7 +137,7 @@ internal class WindowRecorder(
     ) : FixedWindowCallback(delegate) {
         override fun dispatchTouchEvent(event: MotionEvent?): Boolean {
             if (event != null) {
-                val copy: MotionEvent = MotionEvent.obtain(event)
+                val copy: MotionEvent = MotionEvent.obtainNoHistory(event)
                 try {
                     touchRecorderCallback?.onTouchEvent(copy)
                 } catch (e: Throwable) {

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt

@@ -31,7 +31,7 @@ import io.sentry.transport.ICurrentDateProvider
 import io.sentry.util.FileUtils
 import java.io.File
 import java.util.Date
-import java.util.concurrent.CopyOnWriteArrayList
+import java.util.LinkedList
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.ThreadFactory
@@ -72,7 +72,8 @@ internal abstract class BaseCaptureStrategy(
     override val currentSegment = AtomicInteger(0)
     override val replayCacheDir: File? get() = cache?.replayCacheDir
 
-    protected val currentEvents = CopyOnWriteArrayList<RRWebEvent>()
+    protected val currentEvents = LinkedList<RRWebEvent>()
+    private val currentEventsLock = Any()
     private val currentPositions = mutableListOf<Position>()
     private var touchMoveBaseline = 0L
     private var lastCapturedMoveEvent = 0L
@@ -295,11 +296,11 @@ internal abstract class BaseCaptureStrategy(
                 }
             }
         }
-        currentEvents.removeAll {
-            if (it.timestamp > segmentTimestamp.time && it.timestamp < endTimestamp.time) {
-                recordingPayload += it
+
+        rotateCurrentEvents(endTimestamp.time) { event ->
+            if (event.timestamp >= segmentTimestamp.time) {
+                recordingPayload += event
             }
-            it.timestamp < endTimestamp.time
         }
 
         val recording = ReplayRecording().apply {
@@ -321,14 +322,30 @@ internal abstract class BaseCaptureStrategy(
     override fun onTouchEvent(event: MotionEvent) {
         val rrwebEvent = event.toRRWebIncrementalSnapshotEvent()
         if (rrwebEvent != null) {
-            currentEvents += rrwebEvent
+            synchronized(currentEventsLock) {
+                currentEvents += rrwebEvent
+            }
         }
     }
 
     override fun close() {
         replayExecutor.gracefullyShutdown(options)
     }
 
+    protected fun rotateCurrentEvents(
+        until: Long,
+        callback: ((RRWebEvent) -> Unit)? = null
+    ) {
+        synchronized(currentEventsLock) {
+            var event = currentEvents.peek()
+            while (event != null && event.timestamp <= until) {
+                callback?.invoke(event)
+                currentEvents.remove()
+                event = currentEvents.peek()
+            }
+        }
+    }
+
     private class ReplayExecutorServiceThreadFactory : ThreadFactory {
         private var cnt = 0
         override fun newThread(r: Runnable): Thread {

sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt

@@ -176,6 +176,6 @@ internal class BufferCaptureStrategy(
     override fun onTouchEvent(event: MotionEvent) {
         super.onTouchEvent(event)
         val bufferLimit = dateProvider.currentTimeMillis - options.experimental.sessionReplay.errorReplayDuration
-        currentEvents.removeAll { it.timestamp < bufferLimit }
+        rotateCurrentEvents(bufferLimit)
     }
 }

sentry/src/main/java/io/sentry/ReplayRecording.java

@@ -148,6 +148,7 @@ public static final class Deserializer implements JsonDeserializer<ReplayRecordi
                 final RRWebEventType type = RRWebEventType.values()[(int) value];
                 switch (type) {
                   case IncrementalSnapshot:
+                    @Nullable
                     Map<String, Object> incrementalData =
                         (Map<String, Object>) eventMap.get("data");
                     if (incrementalData == null) {
@@ -187,6 +188,7 @@ public static final class Deserializer implements JsonDeserializer<ReplayRecordi
                     payload.add(metaEvent);
                     break;
                   case Custom:
+                    @Nullable
                     Map<String, Object> customData = (Map<String, Object>) eventMap.get("data");
                     if (customData == null) {
                       customData = Collections.emptyMap();