Skip to content

fix(profiling): Reset shouldStop flag on startProfiler #5284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
43jay wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

fix(profiling): Reset shouldStop flag on startProfiler #5284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sentry-android-core/src/main/java/io/sentry/android/core/AndroidContinuousProfiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,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;
Expand Down
18 changes: 18 additions & 0 deletions sentry-android-core/src/test/java/io/sentry/android/core/AndroidContinuousProfilerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,24 @@ class AndroidContinuousProfilerTest {
.log(eq(SentryLevel.WARNING), eq("Device is offline. Stopping profiler."))
}

@Test
fun `manual profiler can be started again after a full start-stop cycle`() {
val profiler = fixture.getSut()

profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
assertTrue(profiler.isRunning)
profiler.stopProfiler(ProfileLifecycle.MANUAL)
// Triggers the scheduled executor task that collects perf metrics and finalizes the chunk
fixture.executor.runAll()
assertFalse(profiler.isRunning)

profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
assertTrue(profiler.isRunning)
// Triggers the scheduled executor task that collects perf metrics and finalizes the chunk
fixture.executor.runAll()
assertTrue(profiler.isRunning, "shouldStop must be reset on start")
}

fun withMockScopes(closure: () -> Unit) =
Mockito.mockStatic(Sentry::class.java).use {
it.`when`<Any> { Sentry.getCurrentScopes() }.thenReturn(fixture.scopes)
Expand Down
Loading