Merge branch 'main' into markushi/chore/speedup-agp-test-matrix

Author: markushi

CHANGELOG.md

@@ -6,6 +6,9 @@
 
 - Session Replay: Use main thread looper to schedule replay capture ([#4542](https://github.com/getsentry/sentry-java/pull/4542))
 - Use single `LifecycleObserver` and multi-cast it to the integrations interested in lifecycle states ([#4567](https://github.com/getsentry/sentry-java/pull/4567))
+- Add `sentry.origin` attribute to logs ([#4618](https://github.com/getsentry/sentry-java/pull/4618))
+  - This helps identify which integration captured a log event
+- Prewarm `SentryExecutorService` for better performance at runtime ([#4606](https://github.com/getsentry/sentry-java/pull/4606))
 
 ### Fixes
 
@@ -22,6 +25,9 @@
   }
   ```
 - Fix abstract method error in `SentrySupportSQLiteDatabase` ([#4597](https://github.com/getsentry/sentry-java/pull/4597))
+- Ensure frame metrics listeners are registered/unregistered on the main thread ([#4582](https://github.com/getsentry/sentry-java/pull/4582))
+- Do not report cached events as lost ([#4575](https://github.com/getsentry/sentry-java/pull/4575))
+  - Previously events were recorded as lost early despite being retried later through the cache
 
 ## 8.18.0
 

sentry-android-core/api/sentry-android-core.api

@@ -483,6 +483,7 @@ public final class io/sentry/android/core/cache/AndroidEnvelopeCache : io/sentry
 	public static fun hasStartupCrashMarker (Lio/sentry/SentryOptions;)Z
 	public static fun lastReportedAnr (Lio/sentry/SentryOptions;)Ljava/lang/Long;
 	public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V
+	public fun storeEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Z
 }
 
 public class io/sentry/android/core/performance/ActivityLifecycleCallbacksAdapter : android/app/Application$ActivityLifecycleCallbacks {

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

@@ -15,6 +15,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.os.Handler;
 import android.util.DisplayMetrics;
 import io.sentry.ILogger;
 import io.sentry.SentryLevel;
@@ -455,8 +456,10 @@ public static boolean appIsLibraryForComposePreview(final @NotNull Context conte
       final @NotNull Context context,
       final @NotNull SentryOptions options,
       final @Nullable BroadcastReceiver receiver,
-      final @NotNull IntentFilter filter) {
-    return registerReceiver(context, new BuildInfoProvider(options.getLogger()), receiver, filter);
+      final @NotNull IntentFilter filter,
+      final @Nullable Handler handler) {
+    return registerReceiver(
+        context, new BuildInfoProvider(options.getLogger()), receiver, filter, handler);
   }
 
   /** Register an exported BroadcastReceiver, independently from platform version. */
@@ -465,15 +468,17 @@ public static boolean appIsLibraryForComposePreview(final @NotNull Context conte
       final @NotNull Context context,
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @Nullable BroadcastReceiver receiver,
-      final @NotNull IntentFilter filter) {
+      final @NotNull IntentFilter filter,
+      final @Nullable Handler handler) {
     if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.TIRAMISU) {
       // From https://developer.android.com/guide/components/broadcasts#context-registered-receivers
       // If this receiver is listening for broadcasts sent from the system or from other apps, even
       // other apps that you own—use the RECEIVER_EXPORTED flag. If instead this receiver is
       // listening only for broadcasts sent by your app, use the RECEIVER_NOT_EXPORTED flag.
-      return context.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED);
+      return context.registerReceiver(
+          receiver, filter, null, handler, Context.RECEIVER_NOT_EXPORTED);
     } else {
-      return context.registerReceiver(receiver, filter);
+      return context.registerReceiver(receiver, filter, null, handler);
     }
   }
 

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

@@ -275,7 +275,7 @@ private Date getBootTime() {
   @Nullable
   private Intent getBatteryIntent() {
     return ContextUtils.registerReceiver(
-        context, buildInfoProvider, null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        context, buildInfoProvider, null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED), null);
   }
 
   /**

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

@@ -8,6 +8,7 @@
 import io.sentry.transport.CurrentDateProvider;
 import io.sentry.transport.ICurrentDateProvider;
 import io.sentry.util.AutoClosableReentrantLock;
+import io.sentry.util.LazyEvaluator;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicLong;
@@ -22,7 +23,7 @@ final class LifecycleWatcher implements AppState.AppStateListener {
   private final long sessionIntervalMillis;
 
   private @Nullable TimerTask timerTask;
-  private final @NotNull Timer timer = new Timer(true);
+  private final @NotNull LazyEvaluator<Timer> timer = new LazyEvaluator<>(() -> new Timer(true));
   private final @NotNull AutoClosableReentrantLock timerLock = new AutoClosableReentrantLock();
   private final @NotNull IScopes scopes;
   private final boolean enableSessionTracking;
@@ -105,21 +106,19 @@ public void onBackground() {
   private void scheduleEndSession() {
     try (final @NotNull ISentryLifecycleToken ignored = timerLock.acquire()) {
       cancelTask();
-      if (timer != null) {
-        timerTask =
-            new TimerTask() {
-              @Override
-              public void run() {
-                if (enableSessionTracking) {
-                  scopes.endSession();
-                }
-                scopes.getOptions().getReplayController().stop();
-                scopes.getOptions().getContinuousProfiler().close(false);
+      timerTask =
+          new TimerTask() {
+            @Override
+            public void run() {
+              if (enableSessionTracking) {
+                scopes.endSession();
               }
-            };
+              scopes.getOptions().getReplayController().stop();
+              scopes.getOptions().getContinuousProfiler().close(false);
+            }
+          };
 
-        timer.schedule(timerTask, sessionIntervalMillis);
-      }
+      timer.getValue().schedule(timerTask, sessionIntervalMillis);
     }
   }
 
@@ -152,6 +151,6 @@ TimerTask getTimerTask() {
   @TestOnly
   @NotNull
   Timer getTimer() {
-    return timer;
+    return timer.getValue();
   }
 }

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

@@ -6,6 +6,7 @@
 import io.sentry.Sentry;
 import io.sentry.SentryLevel;
 import io.sentry.SentryLogLevel;
+import io.sentry.logger.SentryLogParameters;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -56,10 +57,13 @@ private static void addAsLog(
       return;
     }
     final @Nullable String trMessage = tr != null ? tr.getMessage() : null;
+    final @NotNull SentryLogParameters params = new SentryLogParameters();
+    params.setOrigin("auto.log.logcat");
+
     if (tr == null || trMessage == null) {
-      scopes.logger().log(level, msg);
+      scopes.logger().log(level, params, msg);
     } else {
-      scopes.logger().log(level, msg != null ? (msg + "\n" + trMessage) : trMessage);
+      scopes.logger().log(level, params, msg != null ? (msg + "\n" + trMessage) : trMessage);
     }
   }
 

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

@@ -25,6 +25,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Process;
 import io.sentry.Breadcrumb;
 import io.sentry.Hint;
 import io.sentry.IScopes;
@@ -63,6 +66,7 @@ public final class SystemEventsBreadcrumbsIntegration
   private volatile boolean isClosed = false;
   private volatile boolean isStopped = false;
   private volatile IntentFilter filter = null;
+  private volatile HandlerThread handlerThread = null;
   private final @NotNull AtomicBoolean isReceiverRegistered = new AtomicBoolean(false);
   private final @NotNull AutoClosableReentrantLock receiverLock = new AutoClosableReentrantLock();
   // Track previous battery state to avoid duplicate breadcrumbs when values haven't changed
@@ -138,10 +142,19 @@ private void registerReceiver(
                       filter.addAction(item);
                     }
                   }
+                  if (handlerThread == null) {
+                    handlerThread =
+                        new HandlerThread(
+                            "SystemEventsReceiver", Process.THREAD_PRIORITY_BACKGROUND);
+                    handlerThread.start();
+                  }
                   try {
                     // registerReceiver can throw SecurityException but it's not documented in the
                     // official docs
-                    ContextUtils.registerReceiver(context, options, receiver, filter);
+
+                    // onReceive will be called on this handler thread
+                    final @NotNull Handler handler = new Handler(handlerThread.getLooper());
+                    ContextUtils.registerReceiver(context, options, receiver, filter, handler);
                     if (!isReceiverRegistered.getAndSet(true)) {
                       options
                           .getLogger()
@@ -195,6 +208,10 @@ public void close() throws IOException {
     try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
       isClosed = true;
       filter = null;
+      if (handlerThread != null) {
+        handlerThread.quit();
+      }
+      handlerThread = null;
     }
 
     AppState.getInstance().removeAppStateListener(this);
@@ -293,25 +310,15 @@ public void onReceive(final Context context, final @NotNull Intent intent) {
 
       final BatteryState state = batteryState;
       final long now = System.currentTimeMillis();
-      try {
-        options
-            .getExecutorService()
-            .submit(
-                () -> {
-                  final Breadcrumb breadcrumb = createBreadcrumb(now, intent, action, state);
-                  final Hint hint = new Hint();
-                  hint.set(ANDROID_INTENT, intent);
-                  scopes.addBreadcrumb(breadcrumb, hint);
-                });
-      } catch (Throwable t) {
-        // ignored
-      }
+      final Breadcrumb breadcrumb = createBreadcrumb(now, intent, action, state);
+      final Hint hint = new Hint();
+      hint.set(ANDROID_INTENT, intent);
+      scopes.addBreadcrumb(breadcrumb, hint);
     }
 
     // in theory this should be ThreadLocal, but we won't have more than 1 thread accessing it,
     // so we save some memory here and CPU cycles. 64 is because all intent actions we subscribe for
     // are less than 64 chars. We also don't care about encoding as those are always UTF.
-    // TODO: _MULTI_THREADED_EXECUTOR_
     private final char[] buf = new char[64];
 
     @TestOnly
@@ -365,8 +372,8 @@ String getStringAfterDotFast(final @Nullable String str) {
         }
       } else {
         final Bundle extras = intent.getExtras();
-        final Map<String, String> newExtras = new HashMap<>();
         if (extras != null && !extras.isEmpty()) {
+          final Map<String, String> newExtras = new HashMap<>(extras.size());
           for (String item : extras.keySet()) {
             try {
               @SuppressWarnings("deprecation")

sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java

@@ -47,9 +47,19 @@ public AndroidEnvelopeCache(final @NotNull SentryAndroidOptions options) {
     this.currentDateProvider = currentDateProvider;
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
-    super.store(envelope, hint);
+    storeInternalAndroid(envelope, hint);
+  }
+
+  @Override
+  public boolean storeEnvelope(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
+    return storeInternalAndroid(envelope, hint);
+  }
+
+  private boolean storeInternalAndroid(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
+    final boolean didStore = super.storeEnvelope(envelope, hint);
 
     final SentryAndroidOptions options = (SentryAndroidOptions) this.options;
     final TimeSpan sdkInitTimeSpan = AppStartMetrics.getInstance().getSdkInitTimeSpan();
@@ -83,6 +93,7 @@ public void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
 
           writeLastReportedAnrMarker(timestamp);
         });
+    return didStore;
   }
 
   @TestOnly

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/SentryFrameMetricsCollector.java

@@ -38,6 +38,7 @@ public final class SentryFrameMetricsCollector implements Application.ActivityLi
 
   private final @NotNull BuildInfoProvider buildInfoProvider;
   private final @NotNull Set<Window> trackedWindows = new CopyOnWriteArraySet<>();
+
   private final @NotNull ILogger logger;
   private @Nullable Handler handler;
   private @Nullable WeakReference<Window> currentWindow;
@@ -282,17 +283,20 @@ public void stopCollection(final @Nullable String listenerId) {
 
   @SuppressLint("NewApi")
   private void stopTrackingWindow(final @NotNull Window window) {
-    if (trackedWindows.contains(window)) {
-      if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.N) {
-        try {
-          windowFrameMetricsManager.removeOnFrameMetricsAvailableListener(
-              window, frameMetricsAvailableListener);
-        } catch (Exception e) {
-          logger.log(SentryLevel.ERROR, "Failed to remove frameMetricsAvailableListener", e);
-        }
-      }
-      trackedWindows.remove(window);
-    }
+    new Handler(Looper.getMainLooper())
+        .post(
+            () -> {
+              try {
+                // Re-check if we should still remove the listener for this window
+                // in case trackCurrentWindow was called in the meantime
+                if (trackedWindows.remove(window)) {
+                  windowFrameMetricsManager.removeOnFrameMetricsAvailableListener(
+                      window, frameMetricsAvailableListener);
+                }
+              } catch (Throwable e) {
+                logger.log(SentryLevel.ERROR, "Failed to remove frameMetricsAvailableListener", e);
+              }
+            });
   }
 
   private void setCurrentWindow(final @NotNull Window window) {
@@ -305,18 +309,29 @@ private void setCurrentWindow(final @NotNull Window window) {
 
   @SuppressLint("NewApi")
   private void trackCurrentWindow() {
-    Window window = currentWindow != null ? currentWindow.get() : null;
+    @Nullable Window window = currentWindow != null ? currentWindow.get() : null;
     if (window == null || !isAvailable) {
       return;
     }
 
-    if (!trackedWindows.contains(window) && !listenerMap.isEmpty()) {
+    if (listenerMap.isEmpty()) {
+      return;
+    }
 
-      if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.N && handler != null) {
-        trackedWindows.add(window);
-        windowFrameMetricsManager.addOnFrameMetricsAvailableListener(
-            window, frameMetricsAvailableListener, handler);
-      }
+    if (handler != null) {
+      // Ensure the addOnFrameMetricsAvailableListener is called on the main thread
+      new Handler(Looper.getMainLooper())
+          .post(
+              () -> {
+                if (trackedWindows.add(window)) {
+                  try {
+                    windowFrameMetricsManager.addOnFrameMetricsAvailableListener(
+                        window, frameMetricsAvailableListener, handler);
+                  } catch (Throwable e) {
+                    logger.log(SentryLevel.ERROR, "Failed to add frameMetricsAvailableListener", e);
+                  }
+                }
+              });
     }
   }
 
@@ -373,13 +388,19 @@ default void addOnFrameMetricsAvailableListener(
         final @NotNull Window window,
         final @Nullable Window.OnFrameMetricsAvailableListener frameMetricsAvailableListener,
         final @Nullable Handler handler) {
+      if (frameMetricsAvailableListener == null) {
+        return;
+      }
       window.addOnFrameMetricsAvailableListener(frameMetricsAvailableListener, handler);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     default void removeOnFrameMetricsAvailableListener(
         final @NotNull Window window,
         final @Nullable Window.OnFrameMetricsAvailableListener frameMetricsAvailableListener) {
+      if (frameMetricsAvailableListener == null) {
+        return;
+      }
       window.removeOnFrameMetricsAvailableListener(frameMetricsAvailableListener);
     }
   }

sentry-android-core/src/test/java/io/sentry/android/core/AndroidProfilerTest.kt

@@ -80,6 +80,8 @@ class AndroidProfilerTest {
         override fun close(timeoutMillis: Long) {}
 
         override fun isClosed() = false
+
+        override fun prewarm() = Unit
       }
 
     val options =