Merge 7f78fee into 4ada96f

getsentry · Apr 2, 2024 · b53cf2b · b53cf2b
2 parents 4ada96f + 7f78fee
commit b53cf2b
Show file tree

Hide file tree

Showing 23 changed files with 349 additions and 145 deletions.
diff --git a/sentry-android-core/api/sentry-android-core.api b/sentry-android-core/api/sentry-android-core.api
@@ -245,10 +245,6 @@ public final class io/sentry/android/core/SentryAndroid {
 	public static fun init (Landroid/content/Context;Lio/sentry/ILogger;)V
 	public static fun init (Landroid/content/Context;Lio/sentry/ILogger;Lio/sentry/Sentry$OptionsConfiguration;)V
 	public static fun init (Landroid/content/Context;Lio/sentry/Sentry$OptionsConfiguration;)V
-	public static fun pauseReplay ()V
-	public static fun resumeReplay ()V
-	public static fun startReplay ()V
-	public static fun stopReplay ()V
 }
 
 public final class io/sentry/android/core/SentryAndroidDateProvider : io/sentry/SentryDateProvider {

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java
@@ -299,7 +299,10 @@ static void installDefaultIntegrations(
     options.addIntegration(new TempSensorBreadcrumbsIntegration(context));
     options.addIntegration(new PhoneStateBreadcrumbsIntegration(context));
     if (isReplayAvailable) {
-      options.addIntegration(new ReplayIntegration(context, CurrentDateProvider.getInstance()));
+      final ReplayIntegration replay =
+          new ReplayIntegration(context, CurrentDateProvider.getInstance());
+      options.addIntegration(replay);
+      options.setReplayController(replay);
     }
   }
 

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java b/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java
@@ -93,10 +93,10 @@ private void startSession() {
         addSessionBreadcrumb("start");
         hub.startSession();
       }
-      SentryAndroid.startReplay();
+      hub.getOptions().getReplayController().start();
     } else if (!isFreshSession.getAndSet(false)) {
       // only resume if it's not a fresh session, which has been started in SentryAndroid.init
-      SentryAndroid.resumeReplay();
+      hub.getOptions().getReplayController().resume();
     }
     this.lastUpdatedSession.set(currentTimeMillis);
   }
@@ -108,7 +108,7 @@ public void onStop(final @NotNull LifecycleOwner owner) {
     final long currentTimeMillis = currentDateProvider.getCurrentTimeMillis();
     this.lastUpdatedSession.set(currentTimeMillis);
 
-    SentryAndroid.pauseReplay();
+    hub.getOptions().getReplayController().pause();
     scheduleEndSession();
 
     AppState.getInstance().setInBackground(true);
@@ -127,7 +127,7 @@ public void run() {
                   addSessionBreadcrumb("end");
                   hub.endSession();
                 }
-                SentryAndroid.stopReplay();
+                hub.getOptions().getReplayController().stop();
               }
             };
 

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java
@@ -15,8 +15,6 @@
 import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.android.core.performance.TimeSpan;
 import io.sentry.android.fragment.FragmentLifecycleIntegration;
-import io.sentry.android.replay.ReplayIntegration;
-import io.sentry.android.replay.ReplayIntegrationKt;
 import io.sentry.android.timber.SentryTimberIntegration;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -160,7 +158,7 @@ public static synchronized void init(
           hub.addBreadcrumb(BreadcrumbFactory.forSession("session.start"));
           hub.startSession();
         }
-        startReplay();
+        hub.getOptions().getReplayController().start();
       }
     } catch (IllegalAccessException e) {
       logger.log(SentryLevel.FATAL, "Fatal error during SentryAndroid.init(...)", e);
@@ -225,59 +223,4 @@ private static void deduplicateIntegrations(
       }
     }
   }
-
-  public static synchronized void startReplay() {
-    if (!ensureReplayIntegration("starting")) {
-      return;
-    }
-    final @NotNull IHub hub = Sentry.getCurrentHub();
-    ReplayIntegrationKt.getReplayIntegration(hub).start();
-  }
-
-  public static synchronized void stopReplay() {
-    if (!ensureReplayIntegration("stopping")) {
-      return;
-    }
-    final @NotNull IHub hub = Sentry.getCurrentHub();
-    ReplayIntegrationKt.getReplayIntegration(hub).stop();
-  }
-
-  public static synchronized void resumeReplay() {
-    if (!ensureReplayIntegration("resuming")) {
-      return;
-    }
-    final @NotNull IHub hub = Sentry.getCurrentHub();
-    ReplayIntegrationKt.getReplayIntegration(hub).resume();
-  }
-
-  public static synchronized void pauseReplay() {
-    if (!ensureReplayIntegration("pausing")) {
-      return;
-    }
-    final @NotNull IHub hub = Sentry.getCurrentHub();
-    ReplayIntegrationKt.getReplayIntegration(hub).pause();
-  }
-
-  private static boolean ensureReplayIntegration(final @NotNull String actionName) {
-    final @NotNull IHub hub = Sentry.getCurrentHub();
-    if (isReplayAvailable) {
-      final ReplayIntegration replay = ReplayIntegrationKt.getReplayIntegration(hub);
-      if (replay != null) {
-        return true;
-      } else {
-        hub.getOptions()
-            .getLogger()
-            .log(
-                SentryLevel.INFO,
-                "Session Replay wasn't registered yet, not " + actionName + " the replay");
-      }
-    } else {
-      hub.getOptions()
-          .getLogger()
-          .log(
-              SentryLevel.INFO,
-              "Session Replay wasn't found on classpath, not " + actionName + " the replay");
-    }
-    return false;
-  }
 }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt
@@ -7,6 +7,7 @@ import io.sentry.IHub
 import io.sentry.IScope
 import io.sentry.ScopeCallback
 import io.sentry.SentryLevel
+import io.sentry.SentryOptions
 import io.sentry.Session
 import io.sentry.Session.State
 import io.sentry.transport.ICurrentDateProvider
@@ -34,6 +35,7 @@ class LifecycleWatcherTest {
         val ownerMock = mock<LifecycleOwner>()
         val hub = mock<IHub>()
         val dateProvider = mock<ICurrentDateProvider>()
+        val options = SentryOptions()
 
         fun getSUT(
             sessionIntervalMillis: Long = 0L,
@@ -47,6 +49,7 @@ class LifecycleWatcherTest {
             whenever(hub.configureScope(argumentCaptor.capture())).thenAnswer {
                 argumentCaptor.value.run(scope)
             }
+            whenever(hub.options).thenReturn(options)
 
             return LifecycleWatcher(
                 hub,

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt
@@ -342,6 +342,7 @@ class SentryAndroidTest {
                 options.release = "prod"
                 options.dsn = "https://key@sentry.io/123"
                 options.isEnableAutoSessionTracking = true
+                options.experimental.replayOptions.errorSampleRate = 1.0
             }
 
             var session: Session? = null

diff --git a/sentry-android-replay/api/sentry-android-replay.api b/sentry-android-replay/api/sentry-android-replay.api
@@ -27,24 +27,20 @@ public final class io/sentry/android/replay/ReplayCache : java/io/Closeable {
 	public fun close ()V
 	public final fun createVideoOf (JJILjava/io/File;)Lio/sentry/android/replay/GeneratedVideo;
 	public static synthetic fun createVideoOf$default (Lio/sentry/android/replay/ReplayCache;JJILjava/io/File;ILjava/lang/Object;)Lio/sentry/android/replay/GeneratedVideo;
+	public final fun rotate (J)V
 }
 
-public final class io/sentry/android/replay/ReplayIntegration : io/sentry/Integration, io/sentry/android/replay/ScreenshotRecorderCallback, java/io/Closeable {
-	public static final field Companion Lio/sentry/android/replay/ReplayIntegration$Companion;
-	public static final field VIDEO_BUFFER_DURATION J
-	public static final field VIDEO_SEGMENT_DURATION J
+public final class io/sentry/android/replay/ReplayIntegration : io/sentry/Integration, io/sentry/ReplayController, io/sentry/android/replay/ScreenshotRecorderCallback, java/io/Closeable {
 	public fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;)V
 	public fun close ()V
 	public final fun isRecording ()Z
 	public fun onScreenshotRecorded (Landroid/graphics/Bitmap;)V
-	public final fun pause ()V
+	public fun pause ()V
 	public fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
-	public final fun resume ()V
-	public final fun start ()V
-	public final fun stop ()V
-}
-
-public final class io/sentry/android/replay/ReplayIntegration$Companion {
+	public fun resume ()V
+	public fun sendReplayForEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)V
+	public fun start ()V
+	public fun stop ()V
 }
 
 public final class io/sentry/android/replay/ReplayIntegrationKt {

diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt
@@ -128,13 +128,7 @@ public class ReplayCache internal constructor(
             encoder = null
         }
 
-        frames.removeAll {
-            if (it.timestamp < (from + duration)) {
-                deleteFile(it.screenshot)
-                return@removeAll true
-            }
-            return@removeAll false
-        }
+        rotate(until = (from + duration))
 
         return GeneratedVideo(videoFile, frameCount, videoDuration)
     }
@@ -163,6 +157,16 @@ public class ReplayCache internal constructor(
         }
     }
 
+    fun rotate(until: Long) {
+        frames.removeAll {
+            if (it.timestamp < until) {
+                deleteFile(it.screenshot)
+                return@removeAll true
+            }
+            return@removeAll false
+        }
+    }
+
     override fun close() {
         synchronized(encoderLock) {
             encoder?.release()