ref(profiling): Extract PerfettoContinuousProfiler from AndroidContinuousProfiler

Separate the Perfetto/ProfilingManager profiling backend into its own
IContinuousProfiler implementation to keep the two backends independent.

- AndroidContinuousProfiler is restored to legacy-only (no Perfetto fields,
  no conditional branches, no @SuppressLint annotations)
- PerfettoContinuousProfiler is a new @RequiresApi(35) class that delegates
  to PerfettoProfiler and always sets content_type="perfetto"
- AndroidOptionsInitializer branches on useProfilingManager to pick the
  right implementation
- Consistent locking: startInternal/stopInternal both require caller to
  hold the lock, with callers wrapped accordingly
- Renamed rootSpanCounter to activeTraceCount in PerfettoContinuousProfiler
- Extracted tryResolveScopes/onScopesAvailable from initScopes in both classes
- Fixed duplicate listener bug in PerfettoProfiler (was using local lambda
  instead of class-scope profilingResultListener)

Author: 43jay

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

@@ -4,8 +4,6 @@
 import static io.sentry.IConnectionStatusProvider.ConnectionStatus.DISCONNECTED;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
 import android.os.Build;
 import io.sentry.CompositePerformanceCollector;
 import io.sentry.DataCategory;
@@ -53,10 +51,6 @@ public class AndroidContinuousProfiler
   private boolean isInitialized = false;
   private final @NotNull SentryFrameMetricsCollector frameMetricsCollector;
   private @Nullable AndroidProfiler profiler = null;
-  private @Nullable PerfettoProfiler perfettoProfiler = null;
-  private final boolean useProfilingManager;
-  private final @Nullable Context context;
-  private boolean isPerfettoActive = false;
   private boolean isRunning = false;
   private @Nullable IScopes scopes;
   private @Nullable Future<?> stopFuture;
@@ -74,10 +68,6 @@ public class AndroidContinuousProfiler
   private final AutoClosableReentrantLock lock = new AutoClosableReentrantLock();
   private final AutoClosableReentrantLock payloadLock = new AutoClosableReentrantLock();
 
-  /**
-   * Creates a profiler using the legacy Debug.startMethodTracingSampling engine. This is the
-   * default path used for app-start profiling and devices below API 35.
-   */
   public static AndroidContinuousProfiler createLegacy(
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
@@ -90,40 +80,15 @@ public static AndroidContinuousProfiler createLegacy(
         frameMetricsCollector,
         executorServiceSupplier,
         logger,
-        null,
-        false,
         profilingTracesHz,
         profilingTracesDirPath);
   }
 
-  /**
-   * Creates a profiler using Android's ProfilingManager (Perfetto) on API 35+. On older devices, no
-   * profiling data is collected — the legacy Debug-based profiler is not used as a fallback.
-   */
-  public static AndroidContinuousProfiler createWithProfilingManager(
-      final @NotNull Context context,
-      final @NotNull BuildInfoProvider buildInfoProvider,
-      final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
-      final @NotNull ILogger logger,
-      final @NotNull LazyEvaluator.Evaluator<ISentryExecutorService> executorServiceSupplier) {
-    return new AndroidContinuousProfiler(
-        buildInfoProvider,
-        frameMetricsCollector,
-        executorServiceSupplier,
-        logger,
-        context,
-        true,
-        0,
-        null);
-  }
-
   private AndroidContinuousProfiler(
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
       final @NotNull LazyEvaluator.Evaluator<ISentryExecutorService> executorServiceSupplier,
       final @NotNull ILogger logger,
-      final @Nullable Context context,
-      final boolean useProfilingManager,
       final int profilingTracesHz,
       final @Nullable String profilingTracesDirPath) {
     this.logger = logger;
@@ -132,33 +97,15 @@ private AndroidContinuousProfiler(
     this.profilingTracesDirPath = profilingTracesDirPath;
     this.profilingTracesHz = profilingTracesHz;
     this.executorServiceSupplier = executorServiceSupplier;
-    this.useProfilingManager = useProfilingManager;
-    this.context = context;
   }
 
-  @SuppressLint("NewApi")
   private void init() {
-    logger.log(
-        SentryLevel.DEBUG,
-        "AndroidContinuousProfiler.init() isInitialized=%s, useProfilingManager=%s, apiLevel=%d",
-        isInitialized,
-        useProfilingManager,
-        buildInfoProvider.getSdkInfoVersion());
-
     // We initialize it only once
     if (isInitialized) {
       return;
     }
     isInitialized = true;
 
-    if (useProfilingManager) {
-      initProfilingManager();
-    } else {
-      initLegacy();
-    }
-  }
-
-  private void initLegacy() {
     if (profilingTracesDirPath == null) {
       logger.log(
           SentryLevel.WARNING,
@@ -182,20 +129,6 @@ private void initLegacy() {
             logger);
   }
 
-  @SuppressLint("NewApi")
-  private void initProfilingManager() {
-    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.VANILLA_ICE_CREAM
-        && context != null) {
-      perfettoProfiler = new PerfettoProfiler(context, frameMetricsCollector, logger);
-      logger.log(SentryLevel.DEBUG, "Using Perfetto profiler (ProfilingManager).");
-    } else {
-      logger.log(
-          SentryLevel.WARNING,
-          "useProfilingManager requested but not available (requires API 35+). "
-              + "No profiling data will be collected.");
-    }
-  }
-
   @Override
   public void startProfiler(
       final @NotNull ProfileLifecycle profileLifecycle,
@@ -236,21 +169,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 +195,7 @@ private void start() {
     // Let's initialize trace folder and profiling interval
     init();
     // init() didn't create profiler, should never happen
-    if (profiler == null && perfettoProfiler == null) {
+    if (profiler == null) {
       return;
     }
 
@@ -286,14 +222,7 @@ private void start() {
     } else {
       startProfileChunkTimestamp = new SentryNanotimeDate();
     }
-    final AndroidProfiler.ProfileStartData startData;
-    if (perfettoProfiler != null) {
-      startData = perfettoProfiler.start(MAX_CHUNK_DURATION_MILLIS);
-      isPerfettoActive = startData != null;
-    } else {
-      startData = profiler.start();
-      isPerfettoActive = false;
-    }
+    final AndroidProfiler.ProfileStartData startData = profiler.start();
     // check if profiling started
     if (startData == null) {
       return;
@@ -350,13 +279,13 @@ 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(false);
+        stopFuture.cancel(true);
       }
       // check if profiler was created and it's running
-      if ((profiler == null && perfettoProfiler == null) || !isRunning) {
+      if (profiler == null || !isRunning) {
         // When the profiler is stopped due to an error (e.g. offline or rate limited), reset the
         // ids
         profilerId = SentryId.EMPTY_ID;
@@ -375,18 +304,8 @@ private void stop(final boolean restartProfiler) {
         performanceCollectionData = performanceCollector.stop(chunkId.toString());
       }
 
-      final AndroidProfiler.ProfileEndData endData;
-      final String platform;
-      if (isPerfettoActive && perfettoProfiler != null) {
-        endData = perfettoProfiler.endAndCollect();
-        platform = ProfileChunk.PLATFORM_ANDROID;
-      } else if (profiler != null) {
-        endData = profiler.endAndCollect(false, performanceCollectionData);
-        platform = ProfileChunk.PLATFORM_ANDROID;
-      } else {
-        endData = null;
-        platform = ProfileChunk.PLATFORM_ANDROID;
-      }
+      final AndroidProfiler.ProfileEndData endData =
+          profiler.endAndCollect(false, performanceCollectionData);
 
       // check if profiler end successfully
       if (endData == null) {
@@ -405,10 +324,7 @@ private void stop(final boolean restartProfiler) {
                   endData.measurementsMap,
                   endData.traceFile,
                   startProfileChunkTimestamp,
-                  platform);
-          if (isPerfettoActive) {
-            builder.setContentType("perfetto");
-          }
+                  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,
@@ -340,12 +342,13 @@ private static void setupProfiler(
                 options.getFrameMetricsCollector(), "options.getFrameMetricsCollector is required");
         options.setContinuousProfiler(
             options.isUseProfilingManager()
-                ? AndroidContinuousProfiler.createWithProfilingManager(
-                    context,
+                ? new PerfettoContinuousProfiler(
                     buildInfoProvider,
-                    frameMetricsCollector,
                     options.getLogger(),
-                    () -> options.getExecutorService())
+                    () -> options.getExecutorService(),
+                    () ->
+                        new PerfettoProfiler(
+                            context.getApplicationContext(), frameMetricsCollector, options.getLogger()))
                 : AndroidContinuousProfiler.createLegacy(
                     buildInfoProvider,
                     frameMetricsCollector,