Merge branch 'main' into feat/anr-native-symbolication

Author: romtsn

CHANGELOG.md

@@ -10,6 +10,11 @@
 ### Fixes
 
 - Reduce excessive CPU usage when serializing breadcrumbs to disk for ANRs ([#4181](https://github.com/getsentry/sentry-java/pull/4181))
+- Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4250](https://github.com/getsentry/sentry-java/pull/4250))
+
+### Behavioral Changes
+
+- The user's `device.name` is not reported anymore via the device context, even if `options.isSendDefaultPii` is enabled ([#4179](https://github.com/getsentry/sentry-java/pull/4179))
 
 ### Dependencies
 

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

@@ -471,15 +471,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

@@ -9,7 +9,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.SystemClock;
 import io.sentry.FullyDisplayedReporter;
 import io.sentry.IScope;
 import io.sentry.IScopes;
@@ -83,7 +82,6 @@ public final class ActivityLifecycleIntegration
   private final @NotNull WeakHashMap<Activity, ActivityLifecycleSpanHelper> activitySpanHelpers =
       new WeakHashMap<>();
   private @NotNull SentryDate lastPausedTime = new SentryNanotimeDate(new Date(0), 0);
-  private long lastPausedUptimeMillis = 0;
   private @Nullable Future<?> ttfdAutoCloseFuture = null;
 
   // WeakHashMap isn't thread safe but ActivityLifecycleCallbacks is only called from the
@@ -400,7 +398,6 @@ public void onActivityPreCreated(
         scopes != null
             ? scopes.getOptions().getDateProvider().now()
             : AndroidDateUtils.getCurrentSentryDateTime();
-    lastPausedUptimeMillis = SystemClock.uptimeMillis();
     helper.setOnCreateStartTimestamp(lastPausedTime);
   }
 
@@ -411,7 +408,6 @@ public void onActivityCreated(
       onActivityPreCreated(activity, savedInstanceState);
     }
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
-      setColdStart(savedInstanceState);
       if (scopes != null && options != null && options.isEnableScreenTracking()) {
         final @Nullable String activityClassName = ClassUtil.getClassName(activity);
         scopes.configureScope(scope -> scope.setScreen(activityClassName));
@@ -516,7 +512,6 @@ public void onActivityPrePaused(@NotNull Activity activity) {
         scopes != null
             ? scopes.getOptions().getDateProvider().now()
             : AndroidDateUtils.getCurrentSentryDateTime();
-    lastPausedUptimeMillis = SystemClock.uptimeMillis();
   }
 
   @Override
@@ -577,7 +572,7 @@ public 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();
       }
     }
@@ -586,7 +581,6 @@ public void onActivityDestroyed(final @NotNull Activity activity) {
   private void clear() {
     firstActivityCreated = false;
     lastPausedTime = new SentryNanotimeDate(new Date(0), 0);
-    lastPausedUptimeMillis = 0;
     activitySpanHelpers.clear();
   }
 
@@ -728,27 +722,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/AnrV2EventProcessor.java

@@ -639,9 +639,6 @@ private void setDevice(final @NotNull SentryBaseEvent event) {
   @SuppressLint("NewApi")
   private @NotNull Device getDevice() {
     Device device = new Device();
-    if (options.isSendDefaultPii()) {
-      device.setName(ContextUtils.getDeviceName(context));
-    }
     device.setManufacturer(Build.MANUFACTURER);
     device.setBrand(Build.BRAND);
     device.setFamily(ContextUtils.getFamily(options.getLogger()));

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

@@ -14,7 +14,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.provider.Settings;
 import android.util.DisplayMetrics;
 import io.sentry.ILogger;
 import io.sentry.SentryLevel;
@@ -90,10 +89,6 @@ private ContextUtils() {}
   // to avoid doing a bunch of Binder calls we use LazyEvaluator to cache the values that are static
   // during the app process running
 
-  private static final @NotNull AndroidLazyEvaluator<String> deviceName =
-      new AndroidLazyEvaluator<>(
-          (context) -> Settings.Global.getString(context.getContentResolver(), "device_name"));
-
   private static final @NotNull LazyEvaluator<Boolean> isForegroundImportance =
       new LazyEvaluator<>(
           () -> {
@@ -403,10 +398,6 @@ public static boolean isForegroundImportance() {
     }
   }
 
-  static @Nullable String getDeviceName(final @NotNull Context context) {
-    return deviceName.getValue(context);
-  }
-
   static @NotNull String[] getArchitectures() {
     return Build.SUPPORTED_ABIS;
   }
@@ -521,7 +512,6 @@ public static Context getApplicationContext(final @NotNull Context context) {
 
   @TestOnly
   static void resetInstance() {
-    deviceName.resetValue();
     isForegroundImportance.resetValue();
     staticPackageInfo33.resetValue();
     staticPackageInfo.resetValue();

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

@@ -101,10 +101,6 @@ public Device collectDeviceInformation(
       final boolean collectDeviceIO, final boolean collectDynamicData) {
     // TODO: missing usable memory
     final @NotNull Device device = new Device();
-
-    if (options.isSendDefaultPii()) {
-      device.setName(ContextUtils.getDeviceName(context));
-    }
     device.setManufacturer(Build.MANUFACTURER);
     device.setBrand(Build.BRAND);
     device.setFamily(ContextUtils.getFamily(options.getLogger()));

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

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

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

@@ -174,8 +174,9 @@ private void onAppLaunched(
 
     // performance v2: Uses Process.getStartUptimeMillis()
     // requires API level 24+
-    if (buildInfoProvider.getSdkInfoVersion() < android.os.Build.VERSION_CODES.N) {
-      return;
+    if (buildInfoProvider.getSdkInfoVersion() >= android.os.Build.VERSION_CODES.N) {
+      final @NotNull TimeSpan appStartTimespan = appStartMetrics.getAppStartTimeSpan();
+      appStartTimespan.setStartedAt(Process.getStartUptimeMillis());
     }
 
     if (context instanceof Application) {
@@ -185,8 +186,6 @@ private void onAppLaunched(
       return;
     }
 
-    final @NotNull TimeSpan appStartTimespan = appStartMetrics.getAppStartTimeSpan();
-    appStartTimespan.setStartedAt(Process.getStartUptimeMillis());
-    appStartMetrics.registerApplicationForegroundCheck(app);
+    appStartMetrics.registerLifecycleCallbacks(app);
   }
 }