Merge 348aacc into e0d5c10

stefanosiano · web-flow · commit 91f3055d3908 · 2025-05-20T15:15:45.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
     - Use `Sentry.replay().enableDebugMaskingOverlay()` to overlay the screen with the Session Replay masks.
     - The masks will be invalidated at most once per `frameRate` (default 1 fps).
 
+### Fixes
+
+- Send UI Profiling app start chunk when it finishes ([#4423](https://github.com/getsentry/sentry-java/pull/4423))
+
 ## 8.12.0
 
 ### Features
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidContinuousProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidContinuousProfiler.java
@@ -151,7 +151,7 @@ public void startProfiler(
     }
   }
 
-  private void start() {
+  private void initScopes() {
     if ((scopes == null || scopes == NoOpScopes.getInstance())
         && Sentry.getCurrentScopes() != NoOpScopes.getInstance()) {
       this.scopes = Sentry.getCurrentScopes();
@@ -162,6 +162,10 @@ private void start() {
         rateLimiter.addRateLimitObserver(this);
       }
     }
+  }
+
+  private void start() {
+    initScopes();
 
     // Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler
     // causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392
@@ -252,6 +256,7 @@ public void stopProfiler(final @NotNull ProfileLifecycle profileLifecycle) {
   }
 
   private void stop(final boolean restartProfiler) {
+    initScopes();
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
       if (stopFuture != null) {
         stopFuture.cancel(true);

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public void startProfiler(`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- private void start() {`
	`154`	`+ private void initScopes() {`
`155`	`155`	`if ((scopes == null \|\| scopes == NoOpScopes.getInstance())`
`156`	`156`	`&& Sentry.getCurrentScopes() != NoOpScopes.getInstance()) {`
`157`	`157`	`this.scopes = Sentry.getCurrentScopes();`
`@@ -162,6 +162,10 @@ private void start() {`
`162`	`162`	`rateLimiter.addRateLimitObserver(this);`
`163`	`163`	`}`
`164`	`164`	`}`
	`165`	`+ }`
	`166`	`+`
	`167`	`+ private void start() {`
	`168`	`+ initScopes();`
`165`	`169`
`166`	`170`	`// Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler`
`167`	`171`	`// causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392`
`@@ -252,6 +256,7 @@ public void stopProfiler(final @NotNull ProfileLifecycle profileLifecycle) {`
`252`	`256`	`}`
`253`	`257`
`254`	`258`	`private void stop(final boolean restartProfiler) {`
	`259`	`+ initScopes();`
`255`	`260`	`try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {`
`256`	`261`	`if (stopFuture != null) {`
`257`	`262`	`stopFuture.cancel(true);`