refactor(extend-app-start): Name app start branching booleans by intent

buenaflor · claude · buenaflor · commit c861ba9dc989 · 2026-06-29T13:42:31.000+02:00
Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
@@ -265,23 +265,23 @@ private void startTracing(final @NotNull Activity activity) {
         transactionOptions.setAppStartTransaction(appStartSamplingDecision != null);
         setSpanOrigin(transactionOptions);
 
-        // Guards the headless-start check below with !extensionActive so the eager extension's
+        // Guards the headless-start check below with !isExtensionActive so the eager extension's
         // stored trace id isn't mistaken for a finished headless start.
-        final boolean extensionActive =
+        final boolean isExtensionActive =
             AppStartMetrics.getInstance().getAppStartExtension().isActive();
 
         final @Nullable SentryId storedAppStartTraceId =
             AppStartMetrics.getInstance().getAppStartTraceId();
         final boolean isFollowingHeadlessAppStart =
-            !extensionActive && (storedAppStartTraceId != null);
+            !isExtensionActive && (storedAppStartTraceId != null);
 
         final boolean isAppStart =
             !(firstActivityCreated || appStartTime == null || coldStart == null);
         final boolean createStandaloneAppStart =
             isAppStart
                 && options.isEnableStandaloneAppStartTracing()
                 && !isFollowingHeadlessAppStart
-                && !extensionActive;
+                && !isExtensionActive;
 
         if (createStandaloneAppStart) {
           final TransactionOptions appStartTransactionOptions = new TransactionOptions();
@@ -312,7 +312,7 @@ private void startTracing(final @NotNull Activity activity) {
           continueSentryTrace = appStartTransaction.toSentryTrace().getValue();
           final @Nullable BaggageHeader baggageHeader = appStartTransaction.toBaggageHeader(null);
           continueBaggage = baggageHeader == null ? null : baggageHeader.getValue();
-        } else if (extensionActive
+        } else if (isExtensionActive
             || (isFollowingHeadlessAppStart && isWithinAppStartContinuationWindow(ttidStartTime))) {
           continueSentryTrace = AppStartMetrics.getInstance().getAppStartSentryTraceHeader();
           continueBaggage = AppStartMetrics.getInstance().getAppStartBaggageHeader();
@@ -321,7 +321,7 @@ private void startTracing(final @NotNull Activity activity) {
           continueBaggage = null;
         }
 
-        if (extensionActive && isAppStart) {
+        if (isExtensionActive && isAppStart) {
           // Only the launch activity sets the screen, so a later activity can't overwrite it. A
           // screen also keeps the processor from classifying the eager app.start as headless.
           AppStartMetrics.getInstance()
@@ -348,7 +348,7 @@ private void startTracing(final @NotNull Activity activity) {
                   transactionOptions);
         }
 
-        if (isFollowingHeadlessAppStart || extensionActive) {
+        if (isFollowingHeadlessAppStart || isExtensionActive) {
           // Consume the stored app-start trace so a later activity doesn't reuse it.
           AppStartMetrics.getInstance().setAppStartTraceId(null);
           AppStartMetrics.getInstance().setAppStartSentryTraceHeader(null);
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java
@@ -106,8 +106,8 @@ public SentryEvent process(@NotNull SentryEvent event, @NotNull Hint hint) {
           final long naturalDurationMs = appStartTimeSpan.getDurationMs();
 
           final long appStartUpDurationMs;
-          // Not ready (duration 0 on a non-extended start) leaves it for a later transaction.
-          final boolean appStartReady;
+          final boolean shouldAttachAppStartSpans;
+          final boolean reportAppStartMeasurement;
           final @NotNull AppStartExtension extension = appStartMetrics.getAppStartExtension();
           if (extension.isExtended()) {
             final @Nullable SentryDate extendedEnd = extension.getExtendedEndTime();
@@ -118,20 +118,23 @@ public SentryEvent process(@NotNull SentryEvent event, @NotNull Hint hint) {
                   TimeUnit.NANOSECONDS.toMillis(extendedEnd.nanoTimestamp())
                       - appStartTimeSpan.getStartTimestampMs();
               appStartUpDurationMs = Math.max(naturalDurationMs, extendedDurationMs);
-              appStartReady = appStartUpDurationMs != 0;
+              shouldAttachAppStartSpans = appStartUpDurationMs != 0;
+              reportAppStartMeasurement = shouldAttachAppStartSpans;
             } else {
-              // Deadline (null) or no valid start: suppress the measurement to avoid an inflated
-              // value, but still finalize the spans.
+              // Deadline (null) or no valid start: attach the spans but suppress the measurement so
+              // it isn't inflated.
               appStartUpDurationMs = 0;
-              appStartReady = appStartTimeSpan.hasStarted();
+              shouldAttachAppStartSpans = appStartTimeSpan.hasStarted();
+              reportAppStartMeasurement = false;
             }
           } else {
             appStartUpDurationMs = naturalDurationMs;
-            appStartReady = appStartUpDurationMs != 0;
+            shouldAttachAppStartSpans = appStartUpDurationMs != 0;
+            reportAppStartMeasurement = shouldAttachAppStartSpans;
           }
 
-          if (appStartReady) {
-            if (appStartUpDurationMs != 0) {
+          if (shouldAttachAppStartSpans) {
+            if (reportAppStartMeasurement) {
               final MeasurementValue value =
                   new MeasurementValue(
                       (float) appStartUpDurationMs, MeasurementUnit.Duration.MILLISECOND.apiName());
