Cleanup

Author: markushi

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

@@ -30,7 +30,6 @@ import io.sentry.android.replay.capture.CaptureStrategy.ReplaySegment
 import io.sentry.android.replay.capture.SessionCaptureStrategy
 import io.sentry.android.replay.gestures.GestureRecorder
 import io.sentry.android.replay.gestures.TouchRecorderCallback
-import io.sentry.android.replay.screenshot.FrameTimingsTracker
 import io.sentry.android.replay.util.MainLooperHandler
 import io.sentry.android.replay.util.appContext
 import io.sentry.android.replay.util.gracefullyShutdown
@@ -103,8 +102,6 @@ public class ReplayIntegration(
   private var gestureRecorder: GestureRecorder? = null
   private val random by lazy { Random() }
   internal val rootViewsSpy by lazy { RootViewsSpy.install() }
-
-  private val framesTracker = FrameTimingsTracker(context)
   private val replayExecutor by lazy {
     Executors.newSingleThreadScheduledExecutor(ReplayExecutorServiceThreadFactory())
   }
@@ -142,7 +139,7 @@ public class ReplayIntegration(
     this.scopes = scopes
     recorder =
       recorderProvider?.invoke()
-        ?: WindowRecorder(options, this, this, mainLooperHandler, replayExecutor, framesTracker)
+        ?: WindowRecorder(options, this, this, mainLooperHandler, replayExecutor)
     gestureRecorder = gestureRecorderProvider?.invoke() ?: GestureRecorder(options, this)
     isEnabled.set(true)
 

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

@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.content.Context
 import android.graphics.Bitmap
-import android.os.SystemClock
-import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
 import io.sentry.ScreenshotStrategyType
@@ -95,10 +93,7 @@ internal class ScreenshotRecorder(
 
     try {
       contentChanged.set(false)
-      val start = SystemClock.uptimeMillis()
       screenshotStrategy.capture(root)
-      val duration = SystemClock.uptimeMillis() - start
-      Log.d("TAG", "Canvas.capture took ${duration}ms")
     } catch (e: Throwable) {
       options.logger.log(WARNING, "Failed to capture replay recording", e)
     }

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

@@ -2,15 +2,12 @@ package io.sentry.android.replay
 
 import android.annotation.TargetApi
 import android.graphics.Point
-import android.os.Build
-import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
 import io.sentry.SentryLevel.DEBUG
 import io.sentry.SentryLevel.ERROR
 import io.sentry.SentryLevel.WARNING
 import io.sentry.SentryOptions
-import io.sentry.android.replay.screenshot.FrameTimingsTracker
 import io.sentry.android.replay.util.MainLooperHandler
 import io.sentry.android.replay.util.addOnPreDrawListenerSafe
 import io.sentry.android.replay.util.hasSize
@@ -27,29 +24,24 @@ internal class WindowRecorder(
   private val windowCallback: WindowCallback,
   private val mainLooperHandler: MainLooperHandler,
   private val replayExecutor: ScheduledExecutorService,
-  private val frameTimingsTracker: FrameTimingsTracker
 ) : Recorder, OnRootViewsChangedListener {
 
   private val isRecording = AtomicBoolean(false)
   private val rootViews = ArrayList<WeakReference<View>>()
   private var lastKnownWindowSize: Point = Point()
   private val rootViewsLock = AutoClosableReentrantLock()
   private val capturerLock = AutoClosableReentrantLock()
-  @Volatile
-  private var capturer: Capturer? = null
+  @Volatile private var capturer: Capturer? = null
 
   private class Capturer(
     private val options: SentryOptions,
     private val mainLooperHandler: MainLooperHandler,
-    private val frameTimingsTracker: FrameTimingsTracker,
   ) : Runnable {
 
     var recorder: ScreenshotRecorder? = null
     var config: ScreenshotRecorderConfig? = null
     private val isRecording = AtomicBoolean(true)
 
-    private val maxCaptureDelayMs = 166L // ~10 frames @ 60fps
-
     private var currentCaptureDelay = 0L
 
     private var rootView = WeakReference<View>(null)
@@ -91,48 +83,22 @@ internal class WindowRecorder(
         return
       }
 
-      var delay = 1000L / (config?.frameRate ?: 1)
-
-      val rootView = rootView.get()
-      val isViewIdle =
-        if (rootView != null) {
-          !rootView.isDirty && !rootView.isLayoutRequested && !rootView.isInLayout
-        } else {
-          false
-        }
-
-      Log.d("TAG", "View is idle: $isViewIdle")
-      val frameTrackerIdle = frameTimingsTracker.isIdle()
-
       try {
-        if ((isViewIdle) || currentCaptureDelay > maxCaptureDelayMs) {
-          if (options.sessionReplay.isDebug) {
-            Log.d("TAG", "Capturing a frame.")
-          }
-          currentCaptureDelay = 0L
-          recorder?.capture()
-        } else {
-          delay = 16
-          currentCaptureDelay += delay
-          if (options.sessionReplay.isDebug) {
-            Log.d("TAG", "Skipping capture of this frame, app is not idle.")
-          }
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-          android.os.Trace.setCounter("sentry.capture_delay", currentCaptureDelay)
+        if (options.sessionReplay.isDebug) {
+          options.logger.log(DEBUG, "Capturing a frame.")
         }
+        recorder?.capture()
       } catch (e: Throwable) {
         options.logger.log(ERROR, "Failed to capture a frame", e)
       }
 
-
       if (options.sessionReplay.isDebug) {
         options.logger.log(
           DEBUG,
           "Posting the capture runnable again, frame rate is ${config?.frameRate ?: 1} fps.",
         )
       }
-      val posted = mainLooperHandler.postDelayed(this, delay)
+      val posted = mainLooperHandler.postDelayed(this, 1000L / (config?.frameRate ?: 1))
       if (!posted) {
         options.logger.log(
           WARNING,
@@ -211,7 +177,7 @@ internal class WindowRecorder(
       capturerLock.acquire().use {
         if (capturer == null) {
           // don't recreate runnable for every config change, just update the config
-          capturer = Capturer(options, mainLooperHandler, frameTimingsTracker)
+          capturer = Capturer(options, mainLooperHandler)
         }
       }
     }
@@ -223,7 +189,7 @@ internal class WindowRecorder(
         options,
         mainLooperHandler,
         replayExecutor,
-        screenshotRecorderCallback
+        screenshotRecorderCallback,
       )
 
     val newRoot = rootViews.lastOrNull()?.get()

sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt

@@ -26,7 +26,6 @@ import android.media.Image
 import android.media.ImageReader
 import android.os.Handler
 import android.os.HandlerThread
-import android.os.Trace
 import android.view.View
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
@@ -111,7 +110,6 @@ internal class CanvasStrategy(
 
   @SuppressLint("UnclosedTrace")
   override fun capture(root: View) {
-    Trace.beginSection("Canvas.capture")
     val holder: PictureReaderHolder? =
       synchronized(freePictures) {
         when {
@@ -134,7 +132,6 @@ internal class CanvasStrategy(
     synchronized(unprocessedPictures) { unprocessedPictures.add(holder) }
 
     executor.submitSafely(options, "screenshot_recorder.canvas", pictureRenderTask)
-    Trace.endSection()
   }
 
   override fun onContentChanged() {

sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/FrameTimingsTracker.kt

@@ -141,10 +141,13 @@ public enum SentryReplayQuality {
 
   /**
    * The screenshot strategy to use for capturing screenshots during replay recording. Defaults to
-   * PIXEL_COPY for better performance and quality.
+   * {@link ScreenshotStrategyType#PIXEL_COPY}. If set to {@link ScreenshotStrategyType#CANVAS}, the
+   * SDK will use the Canvas API to capture screenshots, which will always mask all Texts and
+   * Bitmaps drawn on the screen, causing {@link #addMaskViewClass} and {@link #addUnmaskViewClass}
+   * to be ignored.
    */
-  @ApiStatus.Internal
-  private ScreenshotStrategyType screenshotStrategy = ScreenshotStrategyType.CANVAS;
+  @ApiStatus.Experimental
+  private @NotNull ScreenshotStrategyType screenshotStrategy = ScreenshotStrategyType.PIXEL_COPY;
 
   public SentryReplayOptions(final boolean empty, final @Nullable SdkVersion sdkVersion) {
     if (!empty) {