Merge branch '7.x.x' into kw-fix-not-registering-app-integrations-on-context-wrappers

Author: krystofwoldrich

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 7.22.5
+
+### Fixes
+
+- Session Replay: Change bitmap config to `ARGB_8888` for screenshots ([#4282](https://github.com/getsentry/sentry-java/pull/4282))
+
+## 7.22.4
+
+### Fixes
+
+- Session Replay: Fix crash when a navigation breadcrumb does not have "to" destination ([#4185](https://github.com/getsentry/sentry-java/pull/4185))
+- Session Replay: Cap video segment duration to maximum 5 minutes to prevent endless video encoding in background ([#4185](https://github.com/getsentry/sentry-java/pull/4185))
+- Avoid logging an error when a float is passed in the manifest ([#4266](https://github.com/getsentry/sentry-java/pull/4266))
+
+## 7.22.3
+
+### Fixes
+
+- Reduce excessive CPU usage when serializing breadcrumbs to disk for ANRs ([#4181](https://github.com/getsentry/sentry-java/pull/4181))
+
+## 7.22.2
+
+### Fixes
+
+- Fix AbstractMethodError when using SentryTraced for Jetpack Compose ([#4256](https://github.com/getsentry/sentry-java/pull/4256))
+
+## 7.22.1
+
+### Fixes
+
+- Fix Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4216](https://github.com/getsentry/sentry-java/pull/4216))
+- Fix properly reset application/content-provider timespans for warm app starts ([#4244](https://github.com/getsentry/sentry-java/pull/4244))
+
 ## 7.22.0
 
 ### Fixes

buildSrc/src/main/java/Config.kt

@@ -202,6 +202,7 @@ object Config {
         val msgpack = "org.msgpack:msgpack-core:0.9.8"
         val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
         val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:$composeVersion"
+        val okio = "com.squareup.okio:okio:1.13.0"
     }
 
     object QualityPlugins {

gradle.properties

@@ -13,7 +13,7 @@ android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true
 
 # Release information
-versionName=7.22.0
+versionName=7.22.5
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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

@@ -447,15 +447,15 @@ public class io/sentry/android/core/performance/AppStartMetrics : io/sentry/andr
 	public static fun getInstance ()Lio/sentry/android/core/performance/AppStartMetrics;
 	public fun getSdkInitTimeSpan ()Lio/sentry/android/core/performance/TimeSpan;
 	public fun isAppLaunchedInForeground ()Z
-	public fun isColdStartValid ()Z
 	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
+	public fun onActivityDestroyed (Landroid/app/Activity;)V
+	public fun onActivityStarted (Landroid/app/Activity;)V
 	public fun onAppStartSpansSent ()V
 	public static fun onApplicationCreate (Landroid/app/Application;)V
 	public static fun onApplicationPostCreate (Landroid/app/Application;)V
 	public static fun onContentProviderCreate (Landroid/content/ContentProvider;)V
 	public static fun onContentProviderPostCreate (Landroid/content/ContentProvider;)V
-	public fun registerApplicationForegroundCheck (Landroid/app/Application;)V
-	public fun restartAppStart (J)V
+	public fun registerLifecycleCallbacks (Landroid/app/Application;)V
 	public fun setAppLaunchedInForeground (Z)V
 	public fun setAppStartProfiler (Lio/sentry/ITransactionProfiler;)V
 	public fun setAppStartSamplingDecision (Lio/sentry/TracesSamplingDecision;)V

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

@@ -397,7 +397,6 @@ public synchronized void onActivityCreated(
     if (!isAllActivityCallbacksAvailable) {
       onActivityPreCreated(activity, savedInstanceState);
     }
-    setColdStart(savedInstanceState);
     if (hub != null && options != null && options.isEnableScreenTracking()) {
       final @Nullable String activityClassName = ClassUtil.getClassName(activity);
       hub.configureScope(scope -> scope.setScreen(activityClassName));
@@ -554,15 +553,13 @@ public synchronized void onActivityDestroyed(final @NotNull Activity activity) {
     // if the activity is opened again and not in memory, transactions will be created normally.
     activitiesWithOngoingTransactions.remove(activity);
 
-    if (activitiesWithOngoingTransactions.isEmpty()) {
+    if (activitiesWithOngoingTransactions.isEmpty() && !activity.isChangingConfigurations()) {
       clear();
     }
   }
 
   private void clear() {
     firstActivityCreated = false;
-    lastPausedTime = new SentryNanotimeDate(new Date(0), 0);
-    lastPausedUptimeMillis = 0;
     activityLifecycleMap.clear();
   }
 
@@ -705,27 +702,6 @@ WeakHashMap<Activity, ISpan> getTtfdSpanMap() {
     return ttfdSpanMap;
   }
 
-  private void setColdStart(final @Nullable Bundle savedInstanceState) {
-    if (!firstActivityCreated) {
-      final @NotNull TimeSpan appStartSpan = AppStartMetrics.getInstance().getAppStartTimeSpan();
-      // If the app start span already started and stopped, it means the app restarted without
-      //  killing the process, so we are in a warm start
-      // If the app has an invalid cold start, it means it was started in the background, like
-      //  via BroadcastReceiver, so we consider it a warm start
-      if ((appStartSpan.hasStarted() && appStartSpan.hasStopped())
-          || (!AppStartMetrics.getInstance().isColdStartValid())) {
-        AppStartMetrics.getInstance().restartAppStart(lastPausedUptimeMillis);
-        AppStartMetrics.getInstance().setAppStartType(AppStartMetrics.AppStartType.WARM);
-      } else {
-        AppStartMetrics.getInstance()
-            .setAppStartType(
-                savedInstanceState == null
-                    ? AppStartMetrics.AppStartType.COLD
-                    : AppStartMetrics.AppStartType.WARM);
-      }
-    }
-  }
-
   private @NotNull String getTtidDesc(final @NotNull String activityName) {
     return activityName + " initial display";
   }

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

@@ -143,6 +143,11 @@ static void initializeIntegrationsAndProcessors(
           new AndroidConnectionStatusProvider(context, options.getLogger(), buildInfoProvider));
     }
 
+    if (options.getCacheDirPath() != null) {
+      options.addScopeObserver(new PersistingScopeObserver(options));
+      options.addOptionsObserver(new PersistingOptionsObserver(options));
+    }
+
     options.addEventProcessor(new DeduplicateMultithreadedEventProcessor(options));
     options.addEventProcessor(
         new DefaultAndroidEventProcessor(context, buildInfoProvider, options));
@@ -221,13 +226,6 @@ static void initializeIntegrationsAndProcessors(
       }
     }
     options.setTransactionPerformanceCollector(new DefaultTransactionPerformanceCollector(options));
-
-    if (options.getCacheDirPath() != null) {
-      if (options.isEnableScopePersistence()) {
-        options.addScopeObserver(new PersistingScopeObserver(options));
-      }
-      options.addOptionsObserver(new PersistingOptionsObserver(options));
-    }
   }
 
   static void installDefaultIntegrations(
@@ -273,6 +271,8 @@ static void installDefaultIntegrations(
     // AppLifecycleIntegration has to be installed before AnrIntegration, because AnrIntegration
     // relies on AppState set by it
     options.addIntegration(new AppLifecycleIntegration());
+    // AnrIntegration must be installed before ReplayIntegration, as ReplayIntegration relies on
+    // it to set the replayId in case of an ANR
     options.addIntegration(AnrIntegrationFactory.create(context, buildInfoProvider));
 
     // registerActivityLifecycleCallbacks is only available on AppContext

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

@@ -33,6 +33,7 @@
 import io.sentry.SentryEvent;
 import io.sentry.SentryExceptionFactory;
 import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
 import io.sentry.SentryStackTraceFactory;
 import io.sentry.SpanContext;
 import io.sentry.android.core.internal.util.CpuInfoUtils;
@@ -83,13 +84,16 @@ public final class AnrV2EventProcessor implements BackfillingEventProcessor {
 
   private final @NotNull SentryExceptionFactory sentryExceptionFactory;
 
+  private final @Nullable PersistingScopeObserver persistingScopeObserver;
+
   public AnrV2EventProcessor(
       final @NotNull Context context,
       final @NotNull SentryAndroidOptions options,
       final @NotNull BuildInfoProvider buildInfoProvider) {
     this.context = ContextUtils.getApplicationContext(context);
     this.options = options;
     this.buildInfoProvider = buildInfoProvider;
+    this.persistingScopeObserver = options.findPersistingScopeObserver();
 
     final SentryStackTraceFactory sentryStackTraceFactory =
         new SentryStackTraceFactory(this.options);
@@ -188,8 +192,7 @@ private boolean sampleReplay(final @NotNull SentryEvent event) {
   }
 
   private void setReplayId(final @NotNull SentryEvent event) {
-    @Nullable
-    String persistedReplayId = PersistingScopeObserver.read(options, REPLAY_FILENAME, String.class);
+    @Nullable String persistedReplayId = readFromDisk(options, REPLAY_FILENAME, String.class);
     final @NotNull File replayFolder =
         new File(options.getCacheDirPath(), "replay_" + persistedReplayId);
     if (!replayFolder.exists()) {
@@ -224,8 +227,7 @@ private void setReplayId(final @NotNull SentryEvent event) {
   }
 
   private void setTrace(final @NotNull SentryEvent event) {
-    final SpanContext spanContext =
-        PersistingScopeObserver.read(options, TRACE_FILENAME, SpanContext.class);
+    final SpanContext spanContext = readFromDisk(options, TRACE_FILENAME, SpanContext.class);
     if (event.getContexts().getTrace() == null) {
       if (spanContext != null
           && spanContext.getSpanId() != null
@@ -236,8 +238,7 @@ private void setTrace(final @NotNull SentryEvent event) {
   }
 
   private void setLevel(final @NotNull SentryEvent event) {
-    final SentryLevel level =
-        PersistingScopeObserver.read(options, LEVEL_FILENAME, SentryLevel.class);
+    final SentryLevel level = readFromDisk(options, LEVEL_FILENAME, SentryLevel.class);
     if (event.getLevel() == null) {
       event.setLevel(level);
     }
@@ -246,7 +247,7 @@ private void setLevel(final @NotNull SentryEvent event) {
   @SuppressWarnings("unchecked")
   private void setFingerprints(final @NotNull SentryEvent event, final @NotNull Object hint) {
     final List<String> fingerprint =
-        (List<String>) PersistingScopeObserver.read(options, FINGERPRINT_FILENAME, List.class);
+        (List<String>) readFromDisk(options, FINGERPRINT_FILENAME, List.class);
     if (event.getFingerprints() == null) {
       event.setFingerprints(fingerprint);
     }
@@ -262,16 +263,14 @@ private void setFingerprints(final @NotNull SentryEvent event, final @NotNull Ob
   }
 
   private void setTransaction(final @NotNull SentryEvent event) {
-    final String transaction =
-        PersistingScopeObserver.read(options, TRANSACTION_FILENAME, String.class);
+    final String transaction = readFromDisk(options, TRANSACTION_FILENAME, String.class);
     if (event.getTransaction() == null) {
       event.setTransaction(transaction);
     }
   }
 
   private void setContexts(final @NotNull SentryBaseEvent event) {
-    final Contexts persistedContexts =
-        PersistingScopeObserver.read(options, CONTEXTS_FILENAME, Contexts.class);
+    final Contexts persistedContexts = readFromDisk(options, CONTEXTS_FILENAME, Contexts.class);
     if (persistedContexts == null) {
       return;
     }
@@ -291,7 +290,7 @@ private void setContexts(final @NotNull SentryBaseEvent event) {
   @SuppressWarnings("unchecked")
   private void setExtras(final @NotNull SentryBaseEvent event) {
     final Map<String, Object> extras =
-        (Map<String, Object>) PersistingScopeObserver.read(options, EXTRAS_FILENAME, Map.class);
+        (Map<String, Object>) readFromDisk(options, EXTRAS_FILENAME, Map.class);
     if (extras == null) {
       return;
     }
@@ -309,14 +308,12 @@ private void setExtras(final @NotNull SentryBaseEvent event) {
   @SuppressWarnings("unchecked")
   private void setBreadcrumbs(final @NotNull SentryBaseEvent event) {
     final List<Breadcrumb> breadcrumbs =
-        (List<Breadcrumb>)
-            PersistingScopeObserver.read(
-                options, BREADCRUMBS_FILENAME, List.class, new Breadcrumb.Deserializer());
+        (List<Breadcrumb>) readFromDisk(options, BREADCRUMBS_FILENAME, List.class);
     if (breadcrumbs == null) {
       return;
     }
     if (event.getBreadcrumbs() == null) {
-      event.setBreadcrumbs(new ArrayList<>(breadcrumbs));
+      event.setBreadcrumbs(breadcrumbs);
     } else {
       event.getBreadcrumbs().addAll(breadcrumbs);
     }
@@ -326,7 +323,7 @@ private void setBreadcrumbs(final @NotNull SentryBaseEvent event) {
   private void setScopeTags(final @NotNull SentryBaseEvent event) {
     final Map<String, String> tags =
         (Map<String, String>)
-            PersistingScopeObserver.read(options, PersistingScopeObserver.TAGS_FILENAME, Map.class);
+            readFromDisk(options, PersistingScopeObserver.TAGS_FILENAME, Map.class);
     if (tags == null) {
       return;
     }
@@ -343,19 +340,29 @@ private void setScopeTags(final @NotNull SentryBaseEvent event) {
 
   private void setUser(final @NotNull SentryBaseEvent event) {
     if (event.getUser() == null) {
-      final User user = PersistingScopeObserver.read(options, USER_FILENAME, User.class);
+      final User user = readFromDisk(options, USER_FILENAME, User.class);
       event.setUser(user);
     }
   }
 
   private void setRequest(final @NotNull SentryBaseEvent event) {
     if (event.getRequest() == null) {
-      final Request request =
-          PersistingScopeObserver.read(options, REQUEST_FILENAME, Request.class);
+      final Request request = readFromDisk(options, REQUEST_FILENAME, Request.class);
       event.setRequest(request);
     }
   }
 
+  private <T> @Nullable T readFromDisk(
+      final @NotNull SentryOptions options,
+      final @NotNull String fileName,
+      final @NotNull Class<T> clazz) {
+    if (persistingScopeObserver == null) {
+      return null;
+    }
+
+    return persistingScopeObserver.read(options, fileName, clazz);
+  }
+
   // endregion
 
   // region options persisted values

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

@@ -494,7 +494,10 @@ private static boolean readBool(
   private static @NotNull Double readDouble(
       final @NotNull Bundle metadata, final @NotNull ILogger logger, final @NotNull String key) {
     // manifest meta-data only reads float
-    final Double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
+    double value = ((Float) metadata.getFloat(key, -1)).doubleValue();
+    if (value == -1) {
+      value = ((Integer) metadata.getInt(key, -1)).doubleValue();
+    }
     logger.log(SentryLevel.DEBUG, key + " read: " + value);
     return value;
   }

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

@@ -152,7 +152,7 @@ public static synchronized void init(
               }
             }
             if (context.getApplicationContext() instanceof Application) {
-              appStartMetrics.registerApplicationForegroundCheck(
+              appStartMetrics.registerLifecycleCallbacks(
                   (Application) context.getApplicationContext());
             }
             final @NotNull TimeSpan sdkInitTimeSpan = appStartMetrics.getSdkInitTimeSpan();