Merge branch 'main' into abhishek-900-patch-1

romtsn · web-flow · commit 5a92f48ef1f2 · 2026-03-05T14:39:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@
 
 ### Fixes
 
+- Common: Finalize previous session even when auto session tracking is disabled ([#5154](https://github.com/getsentry/sentry-java/pull/5154))
 - Android: Add `filterTouchesWhenObscured` to prevent Tapjacking on user feedback dialog ([#5155](https://github.com/getsentry/sentry-java/pull/5155))
+- Android: Add proguard rules to prevent error about missing Replay classes ([#5153](https://github.com/getsentry/sentry-java/pull/5153))
 
 ## 8.34.0
 
diff --git a/sentry-android-core/proguard-rules.pro b/sentry-android-core/proguard-rules.pro
@@ -80,6 +80,10 @@
 ##---------------Begin: proguard configuration for sentry-android-replay  ----------
 -dontwarn io.sentry.android.replay.ReplayIntegration
 -dontwarn io.sentry.android.replay.DefaultReplayBreadcrumbConverter
+-dontwarn io.sentry.android.replay.util.MaskRenderer
+-dontwarn io.sentry.android.replay.util.ViewsKt
+-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode$Companion
+-dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode
 -keepnames class io.sentry.android.replay.ReplayIntegration
 ##---------------End: proguard configuration for sentry-android-replay  ----------
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java b/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.");
diff --git a/sentry-android-integration-tests/metrics-test.yml b/sentry-android-integration-tests/metrics-test.yml
@@ -10,7 +10,3 @@ startupTimeTest:
   runs: 50
   diffMin: 0
   diffMax: 150
-
-binarySizeTest:
-  diffMin: 600 KiB
-  diffMax: 850 KiB
diff --git a/sentry-android-integration-tests/sentry-uitest-android/proguard-rules.pro b/sentry-android-integration-tests/sentry-uitest-android/proguard-rules.pro
@@ -40,8 +40,4 @@
 -dontwarn org.mockito.internal.**
 -dontwarn org.jetbrains.annotations.**
 -dontwarn io.sentry.android.replay.ReplayIntegration
--dontwarn io.sentry.android.replay.util.MaskRenderer
--dontwarn io.sentry.android.replay.util.ViewsKt
--dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode$Companion
--dontwarn io.sentry.android.replay.viewhierarchy.ViewHierarchyNode
 -keep class curtains.** { *; }
diff --git a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt
@@ -7,6 +7,9 @@ import io.sentry.SentryLogLevel
 import io.sentry.SentryOptions
 import io.sentry.checkEvent
 import io.sentry.checkLogs
+import io.sentry.logger.ILoggerBatchProcessorFactory
+import io.sentry.logger.LoggerBatchProcessor
+import io.sentry.test.ImmediateExecutorService
 import io.sentry.test.applyTestOptions
 import io.sentry.test.initForTest
 import io.sentry.transport.ITransport
@@ -45,6 +48,9 @@ class SentryHandlerTest {
       val options = SentryOptions()
       options.dsn = "http://key@localhost/proj"
       options.setTransportFactory { _, _ -> transport }
+      options.logs.loggerBatchProcessorFactory = ILoggerBatchProcessorFactory { options, client ->
+        LoggerBatchProcessor(options, client, ImmediateExecutorService())
+      }
       applyTestOptions(options)
       contextTags?.forEach { options.addContextTag(it) }
       logger = Logger.getLogger("jul.SentryHandlerTest")
diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java
@@ -164,25 +164,37 @@ public SentryAppender(
 
   @Override
   public void start() {
+    start(getOptionsConfiguration(null));
+  }
+
+  @NotNull
+  Sentry.OptionsConfiguration<SentryOptions> getOptionsConfiguration(
+      final @Nullable Sentry.OptionsConfiguration<SentryOptions> additionalOptionsConfiguration) {
+    return options -> {
+      options.setEnableExternalConfiguration(true);
+      options.setInitPriority(InitPriority.LOWEST);
+      options.setDsn(dsn);
+      if (debug != null) {
+        options.setDebug(debug);
+      }
+      options.setSentryClientName(
+          BuildConfig.SENTRY_LOG4J2_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
+      options.setSdkVersion(createSdkVersion(options));
+      if (contextTags != null) {
+        for (final String contextTag : contextTags) {
+          options.addContextTag(contextTag);
+        }
+      }
+      Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
+      if (additionalOptionsConfiguration != null) {
+        additionalOptionsConfiguration.configure(options);
+      }
+    };
+  }
+
+  void start(final @NotNull Sentry.OptionsConfiguration<SentryOptions> optionsConfiguration) {
     try {
-      Sentry.init(
-          options -> {
-            options.setEnableExternalConfiguration(true);
-            options.setInitPriority(InitPriority.LOWEST);
-            options.setDsn(dsn);
-            if (debug != null) {
-              options.setDebug(debug);
-            }
-            options.setSentryClientName(
-                BuildConfig.SENTRY_LOG4J2_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
-            options.setSdkVersion(createSdkVersion(options));
-            if (contextTags != null) {
-              for (final String contextTag : contextTags) {
-                options.addContextTag(contextTag);
-              }
-            }
-            Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
-          });
+      Sentry.init(optionsConfiguration);
     } catch (IllegalArgumentException e) {
       final @Nullable String errorMessage = e.getMessage();
       if (errorMessage == null || !errorMessage.startsWith("DSN is required.")) {
@@ -235,14 +247,13 @@ protected void captureLog(@NotNull LogEvent loggingEvent) {
     }
 
     final @NotNull Map<String, String> contextData = loggingEvent.getContextData().toMap();
-    final @NotNull List<String> contextTags =
-        ScopesAdapter.getInstance().getOptions().getContextTags();
+    final @NotNull List<String> contextTags = scopes.getOptions().getContextTags();
     LoggerPropertiesUtil.applyPropertiesToAttributes(attributes, contextTags, contextData);
 
     final @NotNull SentryLogParameters params = SentryLogParameters.create(attributes);
     params.setOrigin("auto.log.log4j2");
 
-    Sentry.logger().log(sentryLevel, params, formattedMessage, arguments);
+    scopes.logger().log(sentryLevel, params, formattedMessage, arguments);
   }
 
   /**
diff --git a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt
@@ -8,6 +8,9 @@ import io.sentry.SentryLevel
 import io.sentry.SentryLogLevel
 import io.sentry.checkEvent
 import io.sentry.checkLogs
+import io.sentry.logger.ILoggerBatchProcessorFactory
+import io.sentry.logger.LoggerBatchProcessor
+import io.sentry.test.ImmediateExecutorService
 import io.sentry.test.initForTest
 import io.sentry.transport.ITransport
 import java.time.Instant
@@ -93,7 +96,14 @@ class SentryAppenderTest {
 
       loggerContext.updateLoggers(config)
 
-      appender.start()
+      appender.start(
+        appender.getOptionsConfiguration { options ->
+          options.logs.loggerBatchProcessorFactory =
+            ILoggerBatchProcessorFactory { options, client ->
+              LoggerBatchProcessor(options, client, ImmediateExecutorService())
+            }
+        }
+      )
       loggerContext.start()
 
       return LogManager.getContext().getLogger(SentryAppenderTest::class.java.name)
diff --git a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt
@@ -18,6 +18,9 @@ import io.sentry.SentryLogLevel
 import io.sentry.SentryOptions
 import io.sentry.checkEvent
 import io.sentry.checkLogs
+import io.sentry.logger.ILoggerBatchProcessorFactory
+import io.sentry.logger.LoggerBatchProcessor
+import io.sentry.test.ImmediateExecutorService
 import io.sentry.test.applyTestOptions
 import io.sentry.test.initForTest
 import io.sentry.transport.ITransport
@@ -69,6 +72,9 @@ class SentryAppenderTest {
       options.dsn = dsn
       options.isSendDefaultPii = sendDefaultPii
       options.logs.isEnabled = enableLogs
+      options.logs.loggerBatchProcessorFactory = ILoggerBatchProcessorFactory { options, client ->
+        LoggerBatchProcessor(options, client, ImmediateExecutorService())
+      }
       applyTestOptions(options)
       contextTags?.forEach { options.addContextTag(it) }
       appender.setOptions(options)
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -5259,6 +5259,7 @@ public class io/sentry/logger/LoggerBatchProcessor : io/sentry/logger/ILoggerBat
 	public static final field MAX_QUEUE_SIZE I
 	protected final field options Lio/sentry/SentryOptions;
 	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/ISentryClient;)V
+	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/ISentryClient;Lio/sentry/ISentryExecutorService;)V
 	public fun add (Lio/sentry/SentryLogEvent;)V
 	public fun close (Z)V
 	public fun flush (J)V
diff --git a/sentry/src/main/java/io/sentry/MovePreviousSession.java b/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);
diff --git a/sentry/src/main/java/io/sentry/PreviousSessionFinalizer.java b/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()) {
diff --git a/sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java b/sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java
@@ -21,8 +21,10 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 @Open
 public class LoggerBatchProcessor implements ILoggerBatchProcessor {
@@ -44,10 +46,19 @@ public class LoggerBatchProcessor implements ILoggerBatchProcessor {
 
   public LoggerBatchProcessor(
       final @NotNull SentryOptions options, final @NotNull ISentryClient client) {
+    this(options, client, new SentryExecutorService(options));
+  }
+
+  @ApiStatus.Internal
+  @TestOnly
+  public LoggerBatchProcessor(
+      final @NotNull SentryOptions options,
+      final @NotNull ISentryClient client,
+      final @NotNull ISentryExecutorService executorService) {
     this.options = options;
     this.client = client;
     this.queue = new ConcurrentLinkedQueue<>();
-    this.executorService = new SentryExecutorService(options);
+    this.executorService = executorService;
   }
 
   @Override
diff --git a/sentry/src/test/java/io/sentry/MovePreviousSessionTest.kt b/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
diff --git a/sentry/src/test/java/io/sentry/PreviousSessionFinalizerTest.kt b/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
