Continuous Profiling - stop when app goes in background

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Continuous Profiling - stop when app goes in background ([#4311](https://github.com/getsentry/sentry-java/pull/4311))
 - Continuous Profiling - Add delayed stop ([#4293](https://github.com/getsentry/sentry-java/pull/4293))
 - Continuous Profiling - Out of Experimental ([#4310](https://github.com/getsentry/sentry-java/pull/4310))
 

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

@@ -42,7 +42,7 @@ 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/ISentryExecutorService;)V
-	public fun close ()V
+	public fun close (Z)V
 	public fun getProfilerId ()Lio/sentry/protocol/SentryId;
 	public fun getRootSpanCounter ()I
 	public fun isRunning ()Z

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

@@ -322,12 +322,15 @@ public void reevaluateSampling() {
     shouldSample = true;
   }
 
-  public void close() {
+  @Override
+  public void close(final boolean isTerminating) {
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
       rootSpanCounter = 0;
       shouldStop = true;
-      stop(false);
-      isClosed.set(true);
+      if (isTerminating) {
+        stop(false);
+        isClosed.set(true);
+      }
     }
   }
 

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

@@ -268,7 +268,7 @@ private static void setupProfiler(
       // This is a safeguard, but it should never happen, as the app start profiler should be the
       // continuous one.
       if (appStartContinuousProfiler != null) {
-        appStartContinuousProfiler.close();
+        appStartContinuousProfiler.close(true);
       }
       if (appStartTransactionProfiler != null) {
         options.setTransactionProfiler(appStartTransactionProfiler);

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

@@ -122,6 +122,7 @@ public void run() {
                   scopes.endSession();
                 }
                 scopes.getOptions().getReplayController().stop();
+                scopes.getOptions().getContinuousProfiler().close(false);
               }
             };
 

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

@@ -95,7 +95,7 @@ public void shutdown() {
       final @Nullable IContinuousProfiler appStartContinuousProfiler =
           AppStartMetrics.getInstance().getAppStartContinuousProfiler();
       if (appStartContinuousProfiler != null) {
-        appStartContinuousProfiler.close();
+        appStartContinuousProfiler.close(true);
       }
     }
   }

sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java

@@ -225,7 +225,7 @@ public void clear() {
     }
     appStartProfiler = null;
     if (appStartContinuousProfiler != null) {
-      appStartContinuousProfiler.close();
+      appStartContinuousProfiler.close(true);
     }
     appStartContinuousProfiler = null;
     appStartSamplingDecision = null;
@@ -333,7 +333,7 @@ private void checkCreateTimeOnMain() {
                   appStartProfiler = null;
                 }
                 if (appStartContinuousProfiler != null && appStartContinuousProfiler.isRunning()) {
-                  appStartContinuousProfiler.close();
+                  appStartContinuousProfiler.close(true);
                   appStartContinuousProfiler = null;
                 }
               }

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

@@ -389,7 +389,7 @@ class AndroidContinuousProfilerTest {
         profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
         assertTrue(profiler.isRunning)
 
-        profiler.close()
+        profiler.close(true)
         assertFalse(profiler.isRunning)
 
         // The timeout scheduled job should be cleared
@@ -470,14 +470,31 @@ class AndroidContinuousProfilerTest {
         verify(fixture.scopes).captureProfileChunk(any())
     }
 
+    @Test
+    fun `close without terminating stops all profiles after chunk is finished`() {
+        val profiler = fixture.getSut()
+        profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
+        profiler.startProfiler(ProfileLifecycle.TRACE, fixture.mockTracesSampler)
+        assertTrue(profiler.isRunning)
+        // We are scheduling the profiler to stop at the end of the chunk, so it should still be running
+        profiler.close(false)
+        assertTrue(profiler.isRunning)
+        // However, close() already resets the rootSpanCounter
+        assertEquals(0, profiler.rootSpanCounter)
+
+        // We run the executor service to trigger the chunk finish, and the profiler shouldn't restart
+        fixture.executor.runAll()
+        assertFalse(profiler.isRunning)
+    }
+
     @Test
     fun `profiler does not send chunks after close`() {
         val profiler = fixture.getSut()
         profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
         assertTrue(profiler.isRunning)
 
         // We close the profiler, which should prevent sending additional chunks
-        profiler.close()
+        profiler.close(true)
 
         // The executor used to send the chunk doesn't do anything
         fixture.executor.runAll()

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

@@ -446,7 +446,7 @@ class AndroidOptionsInitializerTest {
         assertEquals(fixture.sentryOptions.continuousProfiler, NoOpContinuousProfiler.getInstance())
 
         // app start profiler is closed, because it will never be used
-        verify(appStartContinuousProfiler).close()
+        verify(appStartContinuousProfiler).close(eq(true))
 
         // AppStartMetrics should be cleared
         assertNull(AppStartMetrics.getInstance().appStartProfiler)

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

@@ -3,6 +3,7 @@ package io.sentry.android.core
 import androidx.lifecycle.LifecycleOwner
 import io.sentry.Breadcrumb
 import io.sentry.DateUtils
+import io.sentry.IContinuousProfiler
 import io.sentry.IScope
 import io.sentry.IScopes
 import io.sentry.ReplayController
@@ -15,6 +16,7 @@ import io.sentry.transport.ICurrentDateProvider
 import org.mockito.ArgumentCaptor
 import org.mockito.kotlin.any
 import org.mockito.kotlin.check
+import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.timeout
@@ -38,6 +40,7 @@ class LifecycleWatcherTest {
         val dateProvider = mock<ICurrentDateProvider>()
         val options = SentryOptions()
         val replayController = mock<ReplayController>()
+        val continuousProfiler = mock<IContinuousProfiler>()
 
         fun getSUT(
             sessionIntervalMillis: Long = 0L,
@@ -52,6 +55,7 @@ class LifecycleWatcherTest {
                 argumentCaptor.value.run(scope)
             }
             options.setReplayController(replayController)
+            options.setContinuousProfiler(continuousProfiler)
             whenever(scopes.options).thenReturn(options)
 
             return LifecycleWatcher(
@@ -106,6 +110,7 @@ class LifecycleWatcherTest {
         watcher.onStop(fixture.ownerMock)
         verify(fixture.scopes, timeout(10000)).endSession()
         verify(fixture.replayController, timeout(10000)).stop()
+        verify(fixture.continuousProfiler, timeout(10000)).close(eq(false))
     }
 
     @Test

sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTest.kt

@@ -16,6 +16,7 @@ import io.sentry.android.core.SentryAndroidOptions
 import io.sentry.android.core.SentryShadowProcess
 import org.junit.Before
 import org.junit.runner.RunWith
+import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
@@ -273,7 +274,7 @@ class AppStartMetricsTest {
         // Job on main thread checks if activity was launched
         Shadows.shadowOf(Looper.getMainLooper()).idle()
 
-        verify(profiler).close()
+        verify(profiler).close(eq(true))
     }
 
     @Test
@@ -301,7 +302,7 @@ class AppStartMetricsTest {
         // Job on main thread checks if activity was launched
         Shadows.shadowOf(Looper.getMainLooper()).idle()
 
-        verify(profiler, never()).close()
+        verify(profiler, never()).close(any())
     }
 
     @Test

sentry/api/sentry.api

@@ -747,7 +747,7 @@ public abstract interface class io/sentry/IConnectionStatusProvider$IConnectionS
 }
 
 public abstract interface class io/sentry/IContinuousProfiler {
-	public abstract fun close ()V
+	public abstract fun close (Z)V
 	public abstract fun getProfilerId ()Lio/sentry/protocol/SentryId;
 	public abstract fun isRunning ()Z
 	public abstract fun reevaluateSampling ()V
@@ -1439,7 +1439,7 @@ public final class io/sentry/NoOpConnectionStatusProvider : io/sentry/IConnectio
 }
 
 public final class io/sentry/NoOpContinuousProfiler : io/sentry/IContinuousProfiler {
-	public fun close ()V
+	public fun close (Z)V
 	public static fun getInstance ()Lio/sentry/NoOpContinuousProfiler;
 	public fun getProfilerId ()Lio/sentry/protocol/SentryId;
 	public fun isRunning ()Z

sentry/src/main/java/io/sentry/IContinuousProfiler.java

@@ -14,8 +14,12 @@ void startProfiler(
 
   void stopProfiler(final @NotNull ProfileLifecycle profileLifecycle);
 
-  /** Cancel the profiler and stops it. Used on SDK close. */
-  void close();
+  /**
+   * Cancel the profiler and stops it.
+   *
+   * @param isTerminating whether the profiler is terminating and won't be restarted or not.
+   */
+  void close(final boolean isTerminating);
 
   void reevaluateSampling();
 

sentry/src/main/java/io/sentry/NoOpContinuousProfiler.java

@@ -27,7 +27,7 @@ public void startProfiler(
       final @NotNull TracesSampler tracesSampler) {}
 
   @Override
-  public void close() {}
+  public void close(final boolean isTerminating) {}
 
   @Override
   public void reevaluateSampling() {}

sentry/src/main/java/io/sentry/Scopes.java

@@ -405,7 +405,7 @@ public void close(final boolean isRestarting) {
         configureScope(ScopeType.ISOLATION, scope -> scope.clear());
         getOptions().getBackpressureMonitor().close();
         getOptions().getTransactionProfiler().close();
-        getOptions().getContinuousProfiler().close();
+        getOptions().getContinuousProfiler().close(true);
         getOptions().getCompositePerformanceCollector().close();
         final @NotNull ISentryExecutorService executorService = getOptions().getExecutorService();
         if (isRestarting) {

sentry/src/test/java/io/sentry/NoOpContinuousProfilerTest.kt

@@ -24,7 +24,7 @@ class NoOpContinuousProfilerTest {
 
     @Test
     fun `close does not throw`() =
-        profiler.close()
+        profiler.close(true)
 
     @Test
     fun `getProfilerId returns Empty SentryId`() {

sentry/src/test/java/io/sentry/ScopesTest.kt

@@ -1826,7 +1826,7 @@ class ScopesTest {
         verify(backpressureMonitorMock).close()
         verify(executor).close(any())
         verify(profiler).close()
-        verify(continuousProfiler).close()
+        verify(continuousProfiler).close(eq(true))
         verify(performanceCollector).close()
     }