feat(profiling): Add Android ProfilingManager (Perfetto) support

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

@@ -41,8 +41,8 @@ public final class io/sentry/android/core/ActivityLifecycleIntegration : android
 }
 
 public class io/sentry/android/core/AndroidContinuousProfiler : io/sentry/IContinuousProfiler, io/sentry/transport/RateLimiter$IRateLimitObserver {
-	public fun <init> (Lio/sentry/android/core/BuildInfoProvider;Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ILogger;Ljava/lang/String;ILio/sentry/util/LazyEvaluator$Evaluator;)V
 	public fun close (Z)V
+	public static fun createLegacy (Lio/sentry/android/core/BuildInfoProvider;Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ILogger;Ljava/lang/String;ILio/sentry/util/LazyEvaluator$Evaluator;)Lio/sentry/android/core/AndroidContinuousProfiler;
 	public fun getChunkId ()Lio/sentry/protocol/SentryId;
 	public fun getProfilerId ()Lio/sentry/protocol/SentryId;
 	public fun getRootSpanCounter ()I
@@ -338,6 +338,25 @@ public final class io/sentry/android/core/NetworkBreadcrumbsIntegration : io/sen
 	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
 }
 
+public class io/sentry/android/core/PerfettoContinuousProfiler : io/sentry/IContinuousProfiler, io/sentry/transport/RateLimiter$IRateLimitObserver {
+	public fun <init> (Landroid/content/Context;Lio/sentry/android/core/BuildInfoProvider;Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ILogger;Lio/sentry/util/LazyEvaluator$Evaluator;)V
+	public fun close (Z)V
+	public fun getActiveTraceCount ()I
+	public fun getChunkId ()Lio/sentry/protocol/SentryId;
+	public fun getProfilerId ()Lio/sentry/protocol/SentryId;
+	public fun isRunning ()Z
+	public fun onRateLimitChanged (Lio/sentry/transport/RateLimiter;)V
+	public fun reevaluateSampling ()V
+	public fun startProfiler (Lio/sentry/ProfileLifecycle;Lio/sentry/TracesSampler;)V
+	public fun stopProfiler (Lio/sentry/ProfileLifecycle;)V
+}
+
+public class io/sentry/android/core/PerfettoProfiler {
+	public fun <init> (Landroid/content/Context;Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ILogger;)V
+	public fun endAndCollect ()Lio/sentry/android/core/AndroidProfiler$ProfileEndData;
+	public fun start (J)Lio/sentry/android/core/AndroidProfiler$ProfileStartData;
+}
+
 public final class io/sentry/android/core/ScreenshotEventProcessor : io/sentry/EventProcessor {
 	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/BuildInfoProvider;Z)V
 	public fun getOrder ()Ljava/lang/Long;

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

@@ -68,13 +68,29 @@ public class AndroidContinuousProfiler
   private final AutoClosableReentrantLock lock = new AutoClosableReentrantLock();
   private final AutoClosableReentrantLock payloadLock = new AutoClosableReentrantLock();
 
-  public AndroidContinuousProfiler(
+  public static AndroidContinuousProfiler createLegacy(
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
       final @NotNull ILogger logger,
       final @Nullable String profilingTracesDirPath,
       final int profilingTracesHz,
       final @NotNull LazyEvaluator.Evaluator<ISentryExecutorService> executorServiceSupplier) {
+    return new AndroidContinuousProfiler(
+        buildInfoProvider,
+        frameMetricsCollector,
+        executorServiceSupplier,
+        logger,
+        profilingTracesHz,
+        profilingTracesDirPath);
+  }
+
+  private AndroidContinuousProfiler(
+      final @NotNull BuildInfoProvider buildInfoProvider,
+      final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
+      final @NotNull LazyEvaluator.Evaluator<ISentryExecutorService> executorServiceSupplier,
+      final @NotNull ILogger logger,
+      final int profilingTracesHz,
+      final @Nullable String profilingTracesDirPath) {
     this.logger = logger;
     this.frameMetricsCollector = frameMetricsCollector;
     this.buildInfoProvider = buildInfoProvider;
@@ -89,6 +105,7 @@ private void init() {
       return;
     }
     isInitialized = true;
+
     if (profilingTracesDirPath == null) {
       logger.log(
           SentryLevel.WARNING,
@@ -117,6 +134,7 @@ public void startProfiler(
       final @NotNull ProfileLifecycle profileLifecycle,
       final @NotNull TracesSampler tracesSampler) {
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      shouldStop = false;
       if (shouldSample) {
         isSampled = tracesSampler.sampleSessionProfile(SentryRandom.current().nextDouble());
         shouldSample = false;
@@ -152,21 +170,24 @@ public void startProfiler(
     }
   }
 
-  private void initScopes() {
+  private void tryResolveScopes() {
     if ((scopes == null || scopes == NoOpScopes.getInstance())
         && Sentry.getCurrentScopes() != NoOpScopes.getInstance()) {
-      this.scopes = Sentry.getCurrentScopes();
-      this.performanceCollector =
-          Sentry.getCurrentScopes().getOptions().getCompositePerformanceCollector();
-      final @Nullable RateLimiter rateLimiter = scopes.getRateLimiter();
-      if (rateLimiter != null) {
-        rateLimiter.addRateLimitObserver(this);
-      }
+      onScopesAvailable(Sentry.getCurrentScopes());
+    }
+  }
+
+  private void onScopesAvailable(final @NotNull IScopes resolvedScopes) {
+    this.scopes = resolvedScopes;
+    this.performanceCollector = resolvedScopes.getOptions().getCompositePerformanceCollector();
+    final @Nullable RateLimiter rateLimiter = resolvedScopes.getRateLimiter();
+    if (rateLimiter != null) {
+      rateLimiter.addRateLimitObserver(this);
     }
   }
 
   private void start() {
-    initScopes();
+    tryResolveScopes();
 
     // Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler
     // causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392
@@ -259,7 +280,7 @@ public void stopProfiler(final @NotNull ProfileLifecycle profileLifecycle) {
   }
 
   private void stop(final boolean restartProfiler) {
-    initScopes();
+    tryResolveScopes();
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
       if (stopFuture != null) {
         stopFuture.cancel(true);
@@ -297,14 +318,15 @@ private void stop(final boolean restartProfiler) {
         // start profiling), meaning there's no scopes to send the chunks. In that case, we store
         // the data in a list and send it when the next chunk is finished.
         try (final @NotNull ISentryLifecycleToken ignored2 = payloadLock.acquire()) {
-          payloadBuilders.add(
+          final ProfileChunk.Builder builder =
               new ProfileChunk.Builder(
                   profilerId,
                   chunkId,
                   endData.measurementsMap,
                   endData.traceFile,
                   startProfileChunkTimestamp,
-                  ProfileChunk.PLATFORM_ANDROID));
+                  ProfileChunk.PLATFORM_ANDROID);
+          payloadBuilders.add(builder);
         }
       }
 

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

@@ -2,6 +2,7 @@
 
 import static io.sentry.android.core.NdkIntegration.SENTRY_NDK_CLASS_NAME;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -293,6 +294,7 @@ static void initializeIntegrationsAndProcessors(
   }
 
   /** Setup the correct profiler (transaction or continuous) based on the options. */
+  @SuppressLint("NewApi")
   private static void setupProfiler(
       final @NotNull SentryAndroidOptions options,
       final @NotNull Context context,
@@ -335,16 +337,27 @@ private static void setupProfiler(
           performanceCollector.start(chunkId.toString());
         }
       } else {
+        final @NotNull SentryFrameMetricsCollector frameMetricsCollector =
+            Objects.requireNonNull(
+                options.getFrameMetricsCollector(), "options.getFrameMetricsCollector is required");
         options.setContinuousProfiler(
-            new AndroidContinuousProfiler(
-                buildInfoProvider,
-                Objects.requireNonNull(
-                    options.getFrameMetricsCollector(),
-                    "options.getFrameMetricsCollector is required"),
-                options.getLogger(),
-                options.getProfilingTracesDirPath(),
-                options.getProfilingTracesHz(),
-                () -> options.getExecutorService()));
+            options.isUseProfilingManager()
+                ? new PerfettoContinuousProfiler(
+                    buildInfoProvider,
+                    options.getLogger(),
+                    () -> options.getExecutorService(),
+                    () ->
+                        new PerfettoProfiler(
+                            context.getApplicationContext(),
+                            frameMetricsCollector,
+                            options.getLogger()))
+                : AndroidContinuousProfiler.createLegacy(
+                    buildInfoProvider,
+                    frameMetricsCollector,
+                    options.getLogger(),
+                    options.getProfilingTracesDirPath(),
+                    options.getProfilingTracesHz(),
+                    () -> options.getExecutorService()));
       }
     }
   }

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

@@ -108,6 +108,8 @@ final class ManifestMetadataReader {
 
   static final String ENABLE_APP_START_PROFILING = "io.sentry.profiling.enable-app-start";
 
+  static final String USE_PROFILING_MANAGER = "io.sentry.profiling.use-profiling-manager";
+
   static final String ENABLE_SCOPE_PERSISTENCE = "io.sentry.enable-scope-persistence";
 
   static final String REPLAYS_SESSION_SAMPLE_RATE = "io.sentry.session-replay.session-sample-rate";
@@ -497,6 +499,9 @@ static void applyMetadata(
             readBool(
                 metadata, logger, ENABLE_APP_START_PROFILING, options.isEnableAppStartProfiling()));
 
+        options.setUseProfilingManager(
+            readBool(metadata, logger, USE_PROFILING_MANAGER, options.isUseProfilingManager()));
+
         options.setEnableScopePersistence(
             readBool(
                 metadata, logger, ENABLE_SCOPE_PERSISTENCE, options.isEnableScopePersistence()));