Merge branch 'feat/unhandled-sessions-cache' into feat/unhandled-sessions-internal-api

Author: buenaflor

sentry/api/sentry.api

@@ -4295,7 +4295,6 @@ public final class io/sentry/Session : io/sentry/JsonSerializable, io/sentry/Jso
 	public fun recordNonTerminatingUnhandledError ()Z
 	public fun serialize (Lio/sentry/ObjectWriter;Lio/sentry/ILogger;)V
 	public fun setInitAsTrue ()V
-	public fun setNonTerminatingUnhandledError (Z)V
 	public fun setUnknown (Ljava/util/Map;)V
 	public fun update (Lio/sentry/Session$State;Ljava/lang/String;Z)Z
 	public fun update (Lio/sentry/Session$State;Ljava/lang/String;ZLjava/lang/String;)Z

sentry/src/main/java/io/sentry/Session.java

@@ -209,18 +209,6 @@ public boolean hasNonTerminatingUnhandledError() {
     return nonTerminatingUnhandledError;
   }
 
-  /**
-   * Restores the flag when rebuilding a session, i.e. from {@link #clone()} or the deserializer.
-   *
-   * <p>Not for use on a live session: unlike {@link #recordNonTerminatingUnhandledError()} this
-   * neither counts the error nor advances the session's sequence, so a session mutated through this
-   * setter would be sent as an out-of-date update.
-   */
-  @ApiStatus.Internal
-  public void setNonTerminatingUnhandledError(final boolean nonTerminatingUnhandledError) {
-    this.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
-  }
-
   /**
    * Records that an active session experienced an unhandled error which did not terminate the
    * process, counting the error and advancing the session's sequence without ending it. On {@link
@@ -396,7 +384,7 @@ private long getSequenceTimestamp(final @NotNull Date timestamp) {
             environment,
             release,
             abnormalMechanism);
-    session.setNonTerminatingUnhandledError(nonTerminatingUnhandledError);
+    session.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
     return session;
   }
 
@@ -617,7 +605,7 @@ public static final class Deserializer implements JsonDeserializer<Session> {
               environment,
               release,
               abnormalMechanism);
-      session.setNonTerminatingUnhandledError(nonTerminatingUnhandledError);
+      session.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
       session.setUnknown(unknown);
       reader.endObject();
       return session;

sentry/src/test/java/io/sentry/PreviousSessionFinalizerTest.kt

@@ -207,7 +207,7 @@ class PreviousSessionFinalizerTest {
         tmpDir,
         session =
           Session(null, null, null, "io.sentry.sample@1.0").apply {
-            setNonTerminatingUnhandledError(true)
+            recordNonTerminatingUnhandledError()
           },
       )
     finalizer.run()
@@ -230,7 +230,7 @@ class PreviousSessionFinalizerTest {
         tmpDir,
         session =
           Session(null, null, null, "io.sentry.sample@1.0").apply {
-            setNonTerminatingUnhandledError(true)
+            recordNonTerminatingUnhandledError()
           },
         nativeCrashTimestamp = DateUtils.getDateTime("2023-10-01T00:00:00.000Z"),
       )

sentry/src/test/java/io/sentry/SessionTest.kt

@@ -61,7 +61,7 @@ class SessionTest {
     val session = okSession()
     assertThat(session.hasNonTerminatingUnhandledError()).isFalse()
 
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
     session.end()
 
     assertThat(session.status).isEqualTo(Session.State.Unhandled)
@@ -71,7 +71,7 @@ class SessionTest {
   @Test
   fun `end with a non-terminating unhandled error keeps Abnormal as Abnormal`() {
     val session = okSession()
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
     session.update(Session.State.Abnormal, null, false, "anr")
 
     session.end()
@@ -83,7 +83,7 @@ class SessionTest {
   @Test
   fun `end with a non-terminating unhandled error keeps Crashed as Crashed`() {
     val session = okSession()
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
     session.update(Session.State.Crashed, null, false)
 
     session.end()
@@ -95,7 +95,7 @@ class SessionTest {
   @Test
   fun `updating to Crashed clears a non-terminating unhandled error and end stays Crashed`() {
     val session = okSession()
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
 
     session.update(Session.State.Crashed, null, true)
     session.end()
@@ -107,7 +107,7 @@ class SessionTest {
   @Test
   fun `clone preserves a non-terminating unhandled error`() {
     val session = okSession()
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
 
     val clone = session.clone()
 
@@ -118,7 +118,7 @@ class SessionTest {
   fun `serialization round-trips a non-terminating unhandled error and Unhandled status`() {
     val logger = mock<ILogger>()
     val session = okSession()
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
     session.end()
     assertThat(session.status).isEqualTo(Session.State.Unhandled)
 

sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt

@@ -559,7 +559,7 @@ class EnvelopeCacheTest {
     val cache = fixture.getSUT()
 
     val previousSessionFile = EnvelopeCache.getPreviousSessionFile(fixture.options.cacheDirPath!!)
-    val session = createSession().apply { setNonTerminatingUnhandledError(true) }
+    val session = createSession().apply { recordNonTerminatingUnhandledError() }
     fixture.options.serializer.serialize(session, previousSessionFile.bufferedWriter())
 
     val envelope = SentryEnvelope.from(fixture.options.serializer, SentryEvent(), null)
@@ -643,7 +643,7 @@ class EnvelopeCacheTest {
     val cache = fixture.getSUT()
 
     val previousSessionFile = EnvelopeCache.getPreviousSessionFile(fixture.options.cacheDirPath!!)
-    val session = createSession().apply { setNonTerminatingUnhandledError(true) }
+    val session = createSession().apply { recordNonTerminatingUnhandledError() }
     fixture.options.serializer.serialize(session, previousSessionFile.bufferedWriter())
 
     val nativeCrashTimestamp = session.started!!.time + TimeUnit.HOURS.toMillis(1)

sentry/src/test/java/io/sentry/protocol/SessionSerializationTest.kt

@@ -56,7 +56,7 @@ class SessionSerializationTest {
   @Test
   fun `serialize and deserialize round-trips Unhandled status and non-terminating flag`() {
     val session = Session(null, null, "environment", "release")
-    session.setNonTerminatingUnhandledError(true)
+    session.recordNonTerminatingUnhandledError()
     session.end()
     assertEquals(Session.State.Unhandled, session.status)