Bind root screen transaction to scope

getsentry · Feb 26, 2025 · f5a3e49 · f5a3e49
1 parent 08aff50
commit f5a3e49
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/flutter/lib/src/integrations/native_app_start_handler.dart b/flutter/lib/src/integrations/native_app_start_handler.dart
@@ -37,22 +37,27 @@ class NativeAppStartHandler {
     // Create Transaction & Span
 
     const screenName = 'root /';
-    final transaction = _hub.startTransaction(
+    final rootScreenTransaction = _hub.startTransaction(
       screenName,
       SentrySpanOperations.uiLoad,
       startTimestamp: appStartInfo.start,
     );
 
+    // Bind to scope if null
+    await _hub.configureScope((scope) {
+      scope.span ??= rootScreenTransaction;
+    });
+
     await options.timeToDisplayTracker.track(
-      transaction,
+      rootScreenTransaction,
       startTimestamp: appStartInfo.start,
       endTimestamp: appStartInfo.end,
       origin: SentryTraceOrigins.autoUiTimeToDisplay,
     );
 
     SentryTracer sentryTracer;
-    if (transaction is SentryTracer) {
-      sentryTracer = transaction;
+    if (rootScreenTransaction is SentryTracer) {
+      sentryTracer = rootScreenTransaction;
     } else {
       return;
     }
@@ -62,8 +67,15 @@ class NativeAppStartHandler {
     sentryTracer.measurements[measurement.name] = appStartInfo.toMeasurement();
     await _attachAppStartSpans(appStartInfo, sentryTracer);
 
+    // Remove from scope
+    await _hub.configureScope((scope) {
+      if (scope.span == rootScreenTransaction) {
+        scope.span = null;
+      }
+    });
+
     // Finish Transaction
-    await transaction.finish(endTimestamp: appStartInfo.end);
+    await rootScreenTransaction.finish(endTimestamp: appStartInfo.end);
   }
 
   _AppStartInfo? _infoNativeAppStart(

diff --git a/flutter/lib/src/navigation/sentry_navigator_observer.dart b/flutter/lib/src/navigation/sentry_navigator_observer.dart
@@ -297,7 +297,7 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
     _transaction = null;
     try {
       _hub.configureScope((scope) {
-        if (scope.span == transaction) {
+        if (transaction != null && scope.span == transaction) {
           scope.span = null;
         }
       });