fix(sessions): Finalize previous session even when auto session tracking is disabled

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Finalize previous session even when auto session tracking is disabled ([#5154](https://github.com/getsentry/sentry-java/pull/5154))
+
 ## 8.34.0
 
 ### Features

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

@@ -1,7 +1,6 @@
 package io.sentry.android.core;
 
 import static io.sentry.Sentry.getCurrentScopes;
-import static io.sentry.SentryLevel.DEBUG;
 import static io.sentry.SentryLevel.INFO;
 import static io.sentry.SentryLevel.WARNING;
 
@@ -291,13 +290,6 @@ private static void deleteCurrentSessionFile(final @NotNull SentryOptions option
       return;
     }
 
-    if (!options.isEnableAutoSessionTracking()) {
-      options
-          .getLogger()
-          .log(DEBUG, "Session tracking is disabled, bailing from deleting current session file.");
-      return;
-    }
-
     final File sessionFile = EnvelopeCache.getCurrentSessionFile(cacheDirPath);
     if (!sessionFile.delete()) {
       options.getLogger().log(WARNING, "Failed to delete the current session file.");

sentry/src/main/java/io/sentry/MovePreviousSession.java

@@ -1,6 +1,5 @@
 package io.sentry;
 
-import static io.sentry.SentryLevel.DEBUG;
 import static io.sentry.SentryLevel.INFO;
 
 import io.sentry.cache.EnvelopeCache;
@@ -24,13 +23,6 @@ public void run() {
       return;
     }
 
-    if (!options.isEnableAutoSessionTracking()) {
-      options
-          .getLogger()
-          .log(DEBUG, "Session tracking is disabled, bailing from previous session mover.");
-      return;
-    }
-
     final IEnvelopeCache cache = options.getEnvelopeDiskCache();
     if (cache instanceof EnvelopeCache) {
       final File currentSessionFile = EnvelopeCache.getCurrentSessionFile(cacheDirPath);

sentry/src/main/java/io/sentry/PreviousSessionFinalizer.java

@@ -48,13 +48,6 @@ public void run() {
       return;
     }
 
-    if (!options.isEnableAutoSessionTracking()) {
-      options
-          .getLogger()
-          .log(DEBUG, "Session tracking is disabled, bailing from previous session finalizer.");
-      return;
-    }
-
     final IEnvelopeCache cache = options.getEnvelopeDiskCache();
     if (cache instanceof EnvelopeCache) {
       if (!((EnvelopeCache) cache).waitPreviousSessionFlush()) {

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

@@ -65,13 +65,21 @@ class MovePreviousSessionTest {
   }
 
   @Test
-  fun `when session tracking is disabled, logs and returns early`() {
-    val sut = fixture.getSUT(isEnableSessionTracking = false, envelopeCache = fixture.cache)
+  fun `when session tracking is disabled, still moves previous session`() {
+    val sut = fixture.getSUT(isEnableSessionTracking = false)
+
+    val currentSessionFile = EnvelopeCache.getCurrentSessionFile(fixture.options.cacheDirPath!!)
+    val previousSessionFile = EnvelopeCache.getPreviousSessionFile(fixture.options.cacheDirPath!!)
+
+    currentSessionFile.createNewFile()
+    currentSessionFile.writeText("session content")
 
     sut.run()
 
-    verify(fixture.cache, never()).movePreviousSession(any(), any())
-    verify(fixture.cache, never()).flushPreviousSession()
+    (fixture.options.envelopeDiskCache as EnvelopeCache).waitPreviousSessionFlush()
+
+    assertFalse(currentSessionFile.exists())
+    assertTrue(previousSessionFile.exists())
   }
 
   @Test

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

@@ -210,27 +210,16 @@ class PreviousSessionFinalizerTest {
   }
 
   @Test
-  fun `if session tracking is disabled, does not wait for previous session flush`() {
+  fun `if session tracking is disabled, still finalizes previous session`() {
     val finalizer =
       fixture.getSut(
         tmpDir,
-        flushTimeoutMillis = 500L,
+        session = Session(null, null, null, "io.sentry.sample@1.0"),
         sessionTrackingEnabled = false,
-        shouldAwait = true,
       )
     finalizer.run()
 
-    verify(fixture.logger, never())
-      .log(
-        any(),
-        argThat {
-          startsWith(
-            "Timed out waiting to flush previous session to its own file in session finalizer."
-          )
-        },
-        any<Any>(),
-      )
-    verify(fixture.scopes, never()).captureEnvelope(any())
+    verify(fixture.scopes).captureEnvelope(any())
   }
 
   @Test