Add Continuous Profiling isStartProfilerOnAppStart option

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

@@ -70,6 +70,8 @@ final class ManifestMetadataReader {
 
   static final String PROFILE_LIFECYCLE = "io.sentry.traces.profiling.lifecycle";
 
+  static final String PROFILER_START_ON_APP_START = "io.sentry.traces.profiling.start-on-app-start";
+
   @ApiStatus.Experimental static final String TRACE_SAMPLING = "io.sentry.traces.trace-sampling";
   static final String TRACE_PROPAGATION_TARGETS = "io.sentry.traces.trace-propagation-targets";
 
@@ -137,7 +139,7 @@ static void applyMetadata(
         options.setDebug(readBool(metadata, logger, DEBUG, options.isDebug()));
 
         if (options.isDebug()) {
-          final String level =
+          final @Nullable String level =
               readString(
                   metadata,
                   logger,
@@ -159,7 +161,7 @@ static void applyMetadata(
                 options.isEnableAutoSessionTracking()));
 
         if (options.getSampleRate() == null) {
-          final Double sampleRate = readDouble(metadata, logger, SAMPLE_RATE);
+          final double sampleRate = readDouble(metadata, logger, SAMPLE_RATE);
           if (sampleRate != -1) {
             options.setSampleRate(sampleRate);
           }
@@ -178,7 +180,7 @@ static void applyMetadata(
         options.setAttachAnrThreadDump(
             readBool(metadata, logger, ANR_ATTACH_THREAD_DUMPS, options.isAttachAnrThreadDump()));
 
-        final String dsn = readString(metadata, logger, DSN, options.getDsn());
+        final @Nullable String dsn = readString(metadata, logger, DSN, options.getDsn());
         final boolean enabled = readBool(metadata, logger, ENABLE_SENTRY, options.isEnabled());
 
         if (!enabled || (dsn != null && dsn.isEmpty())) {
@@ -291,7 +293,7 @@ static void applyMetadata(
                 options.isCollectAdditionalContext()));
 
         if (options.getTracesSampleRate() == null) {
-          final Double tracesSampleRate = readDouble(metadata, logger, TRACES_SAMPLE_RATE);
+          final double tracesSampleRate = readDouble(metadata, logger, TRACES_SAMPLE_RATE);
           if (tracesSampleRate != -1) {
             options.setTracesSampleRate(tracesSampleRate);
           }
@@ -315,7 +317,7 @@ static void applyMetadata(
                 options.isEnableActivityLifecycleTracingAutoFinish()));
 
         if (options.getProfilesSampleRate() == null) {
-          final Double profilesSampleRate = readDouble(metadata, logger, PROFILES_SAMPLE_RATE);
+          final double profilesSampleRate = readDouble(metadata, logger, PROFILES_SAMPLE_RATE);
           if (profilesSampleRate != -1) {
             options.setProfilesSampleRate(profilesSampleRate);
           }
@@ -329,7 +331,7 @@ static void applyMetadata(
           }
         }
 
-        final String profileLifecycle =
+        final @Nullable String profileLifecycle =
             readString(
                 metadata,
                 logger,
@@ -342,6 +344,15 @@ static void applyMetadata(
                   ProfileLifecycle.valueOf(profileLifecycle.toUpperCase(Locale.ROOT)));
         }
 
+        options
+            .getExperimental()
+            .setStartProfilerOnAppStart(
+                readBool(
+                    metadata,
+                    logger,
+                    PROFILER_START_ON_APP_START,
+                    options.isStartProfilerOnAppStart()));
+
         options.setEnableUserInteractionTracing(
             readBool(metadata, logger, TRACES_UI_ENABLE, options.isEnableUserInteractionTracing()));
 
@@ -382,6 +393,7 @@ static void applyMetadata(
 
         // sdkInfo.addIntegration();
 
+        @Nullable
         List<String> integrationsFromGradlePlugin =
             readList(metadata, logger, SENTRY_GRADLE_PLUGIN_INTEGRATIONS);
         if (integrationsFromGradlePlugin != null) {
@@ -407,15 +419,15 @@ static void applyMetadata(
                 metadata, logger, ENABLE_SCOPE_PERSISTENCE, options.isEnableScopePersistence()));
 
         if (options.getExperimental().getSessionReplay().getSessionSampleRate() == null) {
-          final Double sessionSampleRate =
+          final double sessionSampleRate =
               readDouble(metadata, logger, REPLAYS_SESSION_SAMPLE_RATE);
           if (sessionSampleRate != -1) {
             options.getExperimental().getSessionReplay().setSessionSampleRate(sessionSampleRate);
           }
         }
 
         if (options.getExperimental().getSessionReplay().getOnErrorSampleRate() == null) {
-          final Double onErrorSampleRate = readDouble(metadata, logger, REPLAYS_ERROR_SAMPLE_RATE);
+          final double onErrorSampleRate = readDouble(metadata, logger, REPLAYS_ERROR_SAMPLE_RATE);
           if (onErrorSampleRate != -1) {
             options.getExperimental().getSessionReplay().setOnErrorSampleRate(onErrorSampleRate);
           }
@@ -501,10 +513,10 @@ private static boolean readBool(
     }
   }
 
-  private static @NotNull Double readDouble(
+  private static 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();
+    final double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
     logger.log(SentryLevel.DEBUG, key + " read: " + value);
     return value;
   }

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

@@ -139,7 +139,8 @@ private void launchAppStartProfiler(final @NotNull AppStartMetrics appStartMetri
         return;
       }
 
-      if (profilingOptions.isContinuousProfilingEnabled()) {
+      if (profilingOptions.isContinuousProfilingEnabled()
+          && profilingOptions.isStartProfilerOnAppStart()) {
         createAndStartContinuousProfiler(context, profilingOptions, appStartMetrics);
         return;
       }
@@ -150,8 +151,9 @@ private void launchAppStartProfiler(final @NotNull AppStartMetrics appStartMetri
         return;
       }
 
-      createAndStartTransactionProfiler(context, profilingOptions, appStartMetrics);
-
+      if (profilingOptions.isEnableAppStartProfiling()) {
+        createAndStartTransactionProfiler(context, profilingOptions, appStartMetrics);
+      }
     } catch (FileNotFoundException e) {
       logger.log(SentryLevel.ERROR, "App start profiling config file not found. ", e);
     } catch (Throwable e) {

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

@@ -868,6 +868,31 @@ class ManifestMetadataReaderTest {
         assertEquals(ProfileLifecycle.TRACE, fixture.options.profileLifecycle)
     }
 
+    @Test
+    fun `applyMetadata without specifying isStartProfilerOnAppStart, stays false`() {
+        // Arrange
+        val context = fixture.getContext()
+
+        // Act
+        ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+        // Assert
+        assertFalse(fixture.options.isStartProfilerOnAppStart)
+    }
+
+    @Test
+    fun `applyMetadata reads isStartProfilerOnAppStart from metadata`() {
+        // Arrange
+        val bundle = bundleOf(ManifestMetadataReader.PROFILER_START_ON_APP_START to true)
+        val context = fixture.getContext(metaData = bundle)
+
+        // Act
+        ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+        // Assert
+        assertTrue(fixture.options.isStartProfilerOnAppStart)
+    }
+
     @Test
     fun `applyMetadata reads tracePropagationTargets to options`() {
         // Arrange

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

@@ -326,6 +326,22 @@ class SentryPerformanceProviderTest {
         assertFalse(AppStartMetrics.getInstance().appStartProfiler!!.isRunning)
     }
 
+    @Test
+    fun `when isEnableAppStartProfiling is false, transaction profiler is not started`() {
+        fixture.getSut { config ->
+            writeConfig(config, profilingEnabled = true, continuousProfilingEnabled = false, isEnableAppStartProfiling = false)
+        }
+        assertNull(AppStartMetrics.getInstance().appStartProfiler)
+    }
+
+    @Test
+    fun `when isStartProfilerOnAppStart is false, continuous profiler is not started`() {
+        fixture.getSut { config ->
+            writeConfig(config, profilingEnabled = false, continuousProfilingEnabled = true, isStartProfilerOnAppStart = false)
+        }
+        assertNull(AppStartMetrics.getInstance().appStartContinuousProfiler)
+    }
+
     @Test
     fun `when provider is closed, continuous profiler is stopped`() {
         val provider = fixture.getSut { config ->
@@ -345,6 +361,8 @@ class SentryPerformanceProviderTest {
         profileSampled: Boolean = true,
         profileSampleRate: Double = 1.0,
         continuousProfileSampled: Boolean = true,
+        isEnableAppStartProfiling: Boolean = true,
+        isStartProfilerOnAppStart: Boolean = true,
         profilingTracesDirPath: String = traceDir.absolutePath
     ) {
         val appStartProfilingOptions = SentryAppStartProfilingOptions()
@@ -357,6 +375,8 @@ class SentryPerformanceProviderTest {
         appStartProfilingOptions.isContinuousProfileSampled = continuousProfileSampled
         appStartProfilingOptions.profilingTracesDirPath = profilingTracesDirPath
         appStartProfilingOptions.profilingTracesHz = 101
+        appStartProfilingOptions.isEnableAppStartProfiling = isEnableAppStartProfiling
+        appStartProfilingOptions.isStartProfilerOnAppStart = isStartProfilerOnAppStart
         JsonSerializer(SentryOptions.empty()).serialize(appStartProfilingOptions, FileWriter(configFile))
     }
     //endregion

sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml

@@ -112,8 +112,12 @@
         <!--    how to enable profiling when starting transactions -->
 <!--        <meta-data android:name="io.sentry.traces.profiling.sample-rate" android:value="1.0" />-->
 
-        <!--    how to enable app start profiling -->
-        <meta-data android:name="io.sentry.traces.profiling.enable-app-start" android:value="true" />
+        <!-- Enable profiling, adjust in production env -->
+        <meta-data android:name="io.sentry.traces.profiling.session-sample-rate" android:value="1.0" />
+        <!-- Set profiling lifecycle, can be `manual` or `trace` -->
+        <meta-data android:name="io.sentry.traces.profiling.lifecycle" android:value="manual" />
+        <!-- Enable profiling on app start -->
+        <meta-data android:name="io.sentry.traces.profiling.start-on-app-start" android:value="true" />
 
         <!--    how to disable the Activity auto instrumentation for tracing-->
         <!--    <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />-->

sentry/api/sentry.api

@@ -446,9 +446,11 @@ public final class io/sentry/ExperimentalOptions {
 	public fun getProfileLifecycle ()Lio/sentry/ProfileLifecycle;
 	public fun getProfileSessionSampleRate ()Ljava/lang/Double;
 	public fun getSessionReplay ()Lio/sentry/SentryReplayOptions;
+	public fun isStartProfilerOnAppStart ()Z
 	public fun setProfileLifecycle (Lio/sentry/ProfileLifecycle;)V
 	public fun setProfileSessionSampleRate (Ljava/lang/Double;)V
 	public fun setSessionReplay (Lio/sentry/SentryReplayOptions;)V
+	public fun setStartProfilerOnAppStart (Z)V
 }
 
 public final class io/sentry/ExternalOptions {
@@ -2506,18 +2508,22 @@ public final class io/sentry/SentryAppStartProfilingOptions : io/sentry/JsonSeri
 	public fun getUnknown ()Ljava/util/Map;
 	public fun isContinuousProfileSampled ()Z
 	public fun isContinuousProfilingEnabled ()Z
+	public fun isEnableAppStartProfiling ()Z
 	public fun isProfileSampled ()Z
 	public fun isProfilingEnabled ()Z
+	public fun isStartProfilerOnAppStart ()Z
 	public fun isTraceSampled ()Z
 	public fun serialize (Lio/sentry/ObjectWriter;Lio/sentry/ILogger;)V
 	public fun setContinuousProfileSampled (Z)V
 	public fun setContinuousProfilingEnabled (Z)V
+	public fun setEnableAppStartProfiling (Z)V
 	public fun setProfileLifecycle (Lio/sentry/ProfileLifecycle;)V
 	public fun setProfileSampleRate (Ljava/lang/Double;)V
 	public fun setProfileSampled (Z)V
 	public fun setProfilingEnabled (Z)V
 	public fun setProfilingTracesDirPath (Ljava/lang/String;)V
 	public fun setProfilingTracesHz (I)V
+	public fun setStartProfilerOnAppStart (Z)V
 	public fun setTraceSampleRate (Ljava/lang/Double;)V
 	public fun setTraceSampled (Z)V
 	public fun setUnknown (Ljava/util/Map;)V
@@ -2532,7 +2538,9 @@ public final class io/sentry/SentryAppStartProfilingOptions$Deserializer : io/se
 public final class io/sentry/SentryAppStartProfilingOptions$JsonKeys {
 	public static final field CONTINUOUS_PROFILE_SAMPLED Ljava/lang/String;
 	public static final field IS_CONTINUOUS_PROFILING_ENABLED Ljava/lang/String;
+	public static final field IS_ENABLE_APP_START_PROFILING Ljava/lang/String;
 	public static final field IS_PROFILING_ENABLED Ljava/lang/String;
+	public static final field IS_START_PROFILER_ON_APP_START Ljava/lang/String;
 	public static final field PROFILE_LIFECYCLE Ljava/lang/String;
 	public static final field PROFILE_SAMPLED Ljava/lang/String;
 	public static final field PROFILE_SAMPLE_RATE Ljava/lang/String;
@@ -3065,6 +3073,7 @@ public class io/sentry/SentryOptions {
 	public fun isSendClientReports ()Z
 	public fun isSendDefaultPii ()Z
 	public fun isSendModules ()Z
+	public fun isStartProfilerOnAppStart ()Z
 	public fun isTraceOptionsRequests ()Z
 	public fun isTraceSampling ()Z
 	public fun isTracingEnabled ()Z

sentry/src/main/java/io/sentry/ExperimentalOptions.java

@@ -27,6 +27,17 @@ public final class ExperimentalOptions {
    */
   private @NotNull ProfileLifecycle profileLifecycle = ProfileLifecycle.MANUAL;
 
+  /**
+   * Whether profiling can automatically be started as early as possible during the app lifecycle,
+   * to capture more of app startup. If {@link ExperimentalOptions#profileLifecycle} is {@link
+   * ProfileLifecycle#MANUAL} Profiling is started automatically on startup and stopProfileSession
+   * must be called manually whenever the app startup is completed If {@link
+   * ExperimentalOptions#profileLifecycle} is {@link ProfileLifecycle#TRACE} Profiling is started
+   * automatically on startup, and will automatically be stopped when the root span that is
+   * associated with app startup ends
+   */
+  private boolean startProfilerOnAppStart = false;
+
   public ExperimentalOptions(final boolean empty) {
     this.sessionReplay = new SentryReplayOptions(empty);
   }
@@ -74,4 +85,14 @@ public void setProfileSessionSampleRate(final @Nullable Double profileSessionSam
     }
     this.profileSessionSampleRate = profileSessionSampleRate;
   }
+
+  @ApiStatus.Experimental
+  public boolean isStartProfilerOnAppStart() {
+    return startProfilerOnAppStart;
+  }
+
+  @ApiStatus.Experimental
+  public void setStartProfilerOnAppStart(boolean startProfilerOnAppStart) {
+    this.startProfilerOnAppStart = startProfilerOnAppStart;
+  }
 }

sentry/src/main/java/io/sentry/Sentry.java

@@ -370,10 +370,12 @@ private static void handleAppStartProfilingConfig(
               try {
                 // We always delete the config file for app start profiling
                 FileUtils.deleteRecursively(appStartProfilingConfigFile);
-                if (!options.isEnableAppStartProfiling()) {
+                if (!options.isEnableAppStartProfiling() && !options.isStartProfilerOnAppStart()) {
                   return;
                 }
-                if (!options.isTracingEnabled()) {
+                // isStartProfilerOnAppStart doesn't need tracing, as it can be started/stopped
+                // manually
+                if (!options.isStartProfilerOnAppStart() && !options.isTracingEnabled()) {
                   options
                       .getLogger()
                       .log(
@@ -382,8 +384,13 @@ private static void handleAppStartProfilingConfig(
                   return;
                 }
                 if (appStartProfilingConfigFile.createNewFile()) {
+                  // If old app start profiling is false, it means the transaction will not be
+                  // sampled, but we create the file anyway to allow continuous profiling on app
+                  // start
                   final @NotNull TracesSamplingDecision appStartSamplingDecision =
-                      sampleAppStartProfiling(options);
+                      options.isEnableAppStartProfiling()
+                          ? sampleAppStartProfiling(options)
+                          : new TracesSamplingDecision(false);
                   final @NotNull SentryAppStartProfilingOptions appStartProfilingOptions =
                       new SentryAppStartProfilingOptions(options, appStartSamplingDecision);
                   try (final OutputStream outputStream =