Unify handling

Author: markushi

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

@@ -462,6 +462,7 @@ public class io/sentry/android/core/performance/AppStartMetrics : io/sentry/andr
 	public fun setAppStartType (Lio/sentry/android/core/performance/AppStartMetrics$AppStartType;)V
 	public fun setClassLoadedUptimeMs (J)V
 	public fun shouldSendStartMeasurements ()Z
+	public fun updateAppStartType (ZJ)V
 }
 
 public final class io/sentry/android/core/performance/AppStartMetrics$AppStartType : java/lang/Enum {

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

@@ -397,7 +397,7 @@ public synchronized void onActivityCreated(
     if (!isAllActivityCallbacksAvailable) {
       onActivityPreCreated(activity, savedInstanceState);
     }
-    setColdStart(savedInstanceState);
+    setColdStart(savedInstanceState != null);
     if (hub != null && options != null && options.isEnableScreenTracking()) {
       final @Nullable String activityClassName = ClassUtil.getClassName(activity);
       hub.configureScope(scope -> scope.setScreen(activityClassName));
@@ -705,24 +705,9 @@ WeakHashMap<Activity, ISpan> getTtfdSpanMap() {
     return ttfdSpanMap;
   }
 
-  private void setColdStart(final @Nullable Bundle savedInstanceState) {
+  private void setColdStart(final boolean hasBundle) {
     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);
-      }
+      AppStartMetrics.getInstance().updateAppStartType(hasBundle, lastPausedUptimeMillis);
     }
   }
 

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

@@ -14,6 +14,8 @@
 import android.os.Looper;
 import android.os.Process;
 import android.os.SystemClock;
+import android.util.Log;
+import androidx.annotation.NonNull;
 import io.sentry.ILogger;
 import io.sentry.ITransactionProfiler;
 import io.sentry.JsonSerializer;
@@ -33,8 +35,8 @@
 import java.io.FileNotFoundException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -52,6 +54,8 @@ public final class SentryPerformanceProvider extends EmptySecureContentProvider
 
   private final @NotNull ILogger logger;
   private final @NotNull BuildInfoProvider buildInfoProvider;
+  private final AtomicInteger activeActivitiesCounter = new AtomicInteger();
+  private final AtomicBoolean firstDrawDone = new AtomicBoolean(false);
 
   @TestOnly
   SentryPerformanceProvider(
@@ -201,35 +205,22 @@ private void onAppLaunched(
     appStartTimespan.setStartedAt(Process.getStartUptimeMillis());
     appStartMetrics.registerApplicationForegroundCheck(app);
 
-    final AtomicBoolean firstDrawDone = new AtomicBoolean(false);
-
     activityCallback =
         new ActivityLifecycleCallbacksAdapter() {
 
           @Override
           public void onActivityCreated(
               @NotNull Activity activity, @Nullable Bundle savedInstanceState) {
+            Log.d("TAG", "onActivityCreated");
+            activeActivitiesCounter.incrementAndGet();
+
             // In case the SDK gets initialized async or the
             // ActivityLifecycleIntegration is not enabled (e.g on RN due to Context not being
             // instanceof Application)
             // the app start type never gets set
-            if (appStartMetrics.getAppStartType() == AppStartMetrics.AppStartType.UNKNOWN) {
-              // We consider pre-loaded application loads as warm starts
-              // This usually happens e.g. due to BroadcastReceivers triggering
-              // Application.onCreate only, but no Activity.onCreate
+            if (!firstDrawDone.get()) {
               final long now = SystemClock.uptimeMillis();
-              final long durationMs =
-                  now - appStartMetrics.getAppStartTimeSpan().getStartUptimeMs();
-              if (durationMs > TimeUnit.SECONDS.toMillis(1)) {
-                appStartMetrics.restartAppStart(now);
-                appStartMetrics.setAppStartType(AppStartMetrics.AppStartType.WARM);
-              } else {
-                // Otherwise a non-null bundle determines the behavior
-                appStartMetrics.setAppStartType(
-                    savedInstanceState == null
-                        ? AppStartMetrics.AppStartType.COLD
-                        : AppStartMetrics.AppStartType.WARM);
-              }
+              AppStartMetrics.getInstance().updateAppStartType(savedInstanceState != null, now);
             }
           }
 
@@ -245,20 +236,26 @@ public void onActivityStarted(@NotNull Activity activity) {
               new Handler(Looper.getMainLooper()).post(() -> onAppStartDone());
             }
           }
+
+          @Override
+          public void onActivityDestroyed(@NonNull Activity activity) {
+            final int remainingActivities = activeActivitiesCounter.decrementAndGet();
+            // if the app is moving into background, reset firstDrawDone
+            // as the next Activity is considered like a new app start
+            if (remainingActivities == 0 && !activity.isChangingConfigurations()) {
+              firstDrawDone.set(false);
+            }
+          }
         };
 
     app.registerActivityLifecycleCallbacks(activityCallback);
   }
 
   synchronized void onAppStartDone() {
-    final @NotNull AppStartMetrics appStartMetrics = AppStartMetrics.getInstance();
-    appStartMetrics.getSdkInitTimeSpan().stop();
-    appStartMetrics.getAppStartTimeSpan().stop();
-
-    if (app != null) {
-      if (activityCallback != null) {
-        app.unregisterActivityLifecycleCallbacks(activityCallback);
-      }
+    if (!firstDrawDone.getAndSet(true)) {
+      final @NotNull AppStartMetrics appStartMetrics = AppStartMetrics.getInstance();
+      appStartMetrics.getSdkInitTimeSpan().stop();
+      appStartMetrics.getAppStartTimeSpan().stop();
     }
   }
 }

sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java

@@ -354,4 +354,26 @@ public static void onContentProviderPostCreate(final @NotNull ContentProvider co
       measurement.setStoppedAt(now);
     }
   }
+
+  /**
+   * @param hasBundle true if the activity onCreate had a non-null bundle
+   * @param lastKnownStart in case the app start is too long, resets the app start timestamp to this
+   *     value
+   */
+  public void updateAppStartType(final boolean hasBundle, final long lastKnownStart) {
+    final @NotNull TimeSpan appStartSpan = 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())
+        || (!getInstance().isColdStartValid())) {
+      getInstance().restartAppStart(lastKnownStart);
+      getInstance().setAppStartType(AppStartMetrics.AppStartType.WARM);
+    } else {
+      getInstance()
+          .setAppStartType(
+              hasBundle ? AppStartMetrics.AppStartType.WARM : AppStartMetrics.AppStartType.COLD);
+    }
+  }
 }