merged main and updated tests

Author: stefanosiano

CHANGELOG.md

@@ -10,12 +10,16 @@
   Note: Both `options.profilesSampler` and `options.profilesSampleRate` must **not** be set to enable Continuous Profiling.
 
   ```java
+  import io.sentry.ProfileLifecycle;
   import io.sentry.android.core.SentryAndroid;
 
   SentryAndroid.init(context) { options ->
 
     // Currently under experimental options:
     options.getExperimental().setProfileSessionSampleRate(1.0);
+    // In manual mode, you need to start and stop the profiler manually using Sentry.startProfileSession and Sentry.stopProfileSession
+    // In trace mode, the profiler will start and stop automatically whenever a sampled trace starts and finishes
+    options.getExperimental().setProfileLifecycle(ProfileLifecycle.MANUAL);
   }
   // Start profiling
   Sentry.startProfileSession();
@@ -24,12 +28,16 @@
   Sentry.stopProfileSession();
   ```
   ```kotlin
+  import io.sentry.ProfileLifecycle
   import io.sentry.android.core.SentryAndroid
 
   SentryAndroid.init(context) { options ->
 
     // Currently under experimental options:
     options.experimental.profileSessionSampleRate = 1.0
+    // In manual mode, you need to start and stop the profiler manually using Sentry.startProfileSession and Sentry.stopProfileSession
+    // In trace mode, the profiler will start and stop automatically whenever a sampled trace starts and finishes
+    options.experimental.profileLifecycle = ProfileLifecycle.MANUAL
   }
   // Start profiling
   Sentry.startProfileSession()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
+#Mon Mar 17 13:40:54 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -24,6 +24,7 @@
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.protocol.SentryId;
 import io.sentry.transport.RateLimiter;
+import io.sentry.util.SentryRandom;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -109,7 +110,7 @@ public synchronized void startProfileSession(
       final @NotNull ProfileLifecycle profileLifecycle,
       final @NotNull TracesSampler tracesSampler) {
     if (shouldSample) {
-      isSampled = tracesSampler.sampleSessionProfile();
+      isSampled = tracesSampler.sampleSessionProfile(SentryRandom.current().nextDouble());
       shouldSample = false;
     }
     if (!isSampled) {

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

@@ -9,7 +9,6 @@
 import android.net.Uri;
 import android.os.Process;
 import android.os.SystemClock;
-import androidx.annotation.NonNull;
 import io.sentry.IContinuousProfiler;
 import io.sentry.ILogger;
 import io.sentry.ISentryLifecycleToken;

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

@@ -27,6 +27,8 @@ import io.sentry.test.DeferredExecutorService
 import io.sentry.test.getProperty
 import io.sentry.transport.RateLimiter
 import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.mockStatic
 import org.mockito.kotlin.any
 import org.mockito.kotlin.check
 import org.mockito.kotlin.eq
@@ -59,6 +61,7 @@ class AndroidContinuousProfilerTest {
         val buildInfo = mock<BuildInfoProvider> {
             whenever(it.sdkInfoVersion).thenReturn(Build.VERSION_CODES.LOLLIPOP_MR1)
         }
+        val mockedSentry = mockStatic(Sentry::class.java)
         val mockLogger = mock<ILogger>()
         val mockTracesSampler = mock<TracesSampler>()
 
@@ -77,7 +80,7 @@ class AndroidContinuousProfilerTest {
         }
 
         init {
-            whenever(mockTracesSampler.sampleSessionProfile()).thenReturn(true)
+            whenever(mockTracesSampler.sampleSessionProfile(any())).thenReturn(true)
         }
 
         fun getSut(buildInfoProvider: BuildInfoProvider = buildInfo, optionConfig: ((options: SentryAndroidOptions) -> Unit) = {}): AndroidContinuousProfiler {
@@ -133,11 +136,14 @@ class AndroidContinuousProfilerTest {
         File(fixture.options.profilingTracesDirPath!!).mkdirs()
 
         Sentry.setCurrentScopes(fixture.scopes)
+
+        fixture.mockedSentry.`when`<Any> { Sentry.getCurrentScopes() }.thenReturn(fixture.scopes)
     }
 
     @AfterTest
     fun clear() {
         context.cacheDir.deleteRecursively()
+        fixture.mockedSentry.close()
     }
 
     @Test
@@ -189,7 +195,7 @@ class AndroidContinuousProfilerTest {
     @Test
     fun `profiler logs a warning on start if not sampled`() {
         val profiler = fixture.getSut()
-        whenever(fixture.mockTracesSampler.sampleSessionProfile()).thenReturn(false)
+        whenever(fixture.mockTracesSampler.sampleSessionProfile(any())).thenReturn(false)
         profiler.startProfileSession(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
         assertFalse(profiler.isRunning)
         verify(fixture.mockLogger).log(eq(SentryLevel.DEBUG), eq("Profiler was not started due to sampling decision."))
@@ -198,28 +204,28 @@ class AndroidContinuousProfilerTest {
     @Test
     fun `profiler evaluates sessionSampleRate only the first time`() {
         val profiler = fixture.getSut()
-        verify(fixture.mockTracesSampler, never()).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, never()).sampleSessionProfile(any())
         // The first time the profiler is started, the sessionSampleRate is evaluated
         profiler.startProfileSession(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
-        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile(any())
         // Then, the sessionSampleRate is not evaluated again
         profiler.startProfileSession(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
-        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile(any())
     }
 
     @Test
     fun `when reevaluateSampling, profiler evaluates sessionSampleRate on next start`() {
         val profiler = fixture.getSut()
-        verify(fixture.mockTracesSampler, never()).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, never()).sampleSessionProfile(any())
         // The first time the profiler is started, the sessionSampleRate is evaluated
         profiler.startProfileSession(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
-        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile(any())
         // When reevaluateSampling is called, the sessionSampleRate is not evaluated immediately
         profiler.reevaluateSampling()
-        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, times(1)).sampleSessionProfile(any())
         // Then, when the profiler starts again, the sessionSampleRate is reevaluated
         profiler.startProfileSession(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
-        verify(fixture.mockTracesSampler, times(2)).sampleSessionProfile()
+        verify(fixture.mockTracesSampler, times(2)).sampleSessionProfile(any())
     }
 
     @Test
@@ -538,4 +544,9 @@ class AndroidContinuousProfilerTest {
         assertEquals(SentryId.EMPTY_ID, profiler.profilerId)
         verify(fixture.mockLogger).log(eq(SentryLevel.WARNING), eq("Device is offline. Stopping profiler."))
     }
+
+    fun withMockScopes(closure: () -> Unit) = Mockito.mockStatic(Sentry::class.java).use {
+        it.`when`<Any> { Sentry.getCurrentScopes() }.thenReturn(fixture.scopes)
+        closure.invoke()
+    }
 }

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

@@ -269,7 +269,7 @@ class AppStartMetricsTest {
         whenever(profiler.isRunning).thenReturn(true)
         AppStartMetrics.getInstance().appStartContinuousProfiler = profiler
 
-        AppStartMetrics.getInstance().registerApplicationForegroundCheck(mock())
+        AppStartMetrics.getInstance().registerLifecycleCallbacks(mock())
         // Job on main thread checks if activity was launched
         Shadows.shadowOf(Looper.getMainLooper()).idle()
 

sentry-spring/src/test/kotlin/io/sentry/spring/webflux/SentryWebFluxTracingFilterTest.kt

@@ -249,7 +249,7 @@ class SentryWebFluxTracingFilterTest {
             verify(fixture.chain).filter(fixture.exchange)
 
             verify(fixture.scopes).isEnabled
-            verify(fixture.scopes, times(3)).options
+            verify(fixture.scopes, times(4)).options
             verify(fixture.scopes).continueTrace(anyOrNull(), anyOrNull())
             verify(fixture.scopes).addBreadcrumb(any<Breadcrumb>(), any<Hint>())
             verify(fixture.scopes).configureScope(any<ScopeCallback>())