test that didPop does not call finsh transaction multiple times

getsentry · Feb 13, 2024 · e992df5 · e992df5
1 parent e4dc8d7
commit e992df5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/flutter/lib/src/navigation/sentry_navigator_observer.dart b/flutter/lib/src/navigation/sentry_navigator_observer.dart
@@ -243,12 +243,12 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
 
   Future<void> _finishTransaction() async {
     final transaction = _transaction;
+    _transaction = null;
     if (transaction == null || transaction.finished) {
       return;
     }
-    _transaction?.status ??= SpanStatus.ok();
-    await _transaction?.finish();
-    _transaction = null;
+    transaction.status ??= SpanStatus.ok();
+    await transaction.finish();
   }
 }
 

diff --git a/flutter/test/sentry_navigator_observer_test.dart b/flutter/test/sentry_navigator_observer_test.dart
@@ -293,6 +293,24 @@ void main() {
       verify(span.finish());
     });
 
+    test('multiple didPop only finish transaction once', () {
+      final currentRoute = route(RouteSettings(name: 'Current Route'));
+
+      final hub = _MockHub();
+      final span = getMockSentryTracer(finished: false);
+      when(span.context).thenReturn(SentrySpanContext(operation: 'op'));
+      when(span.status).thenReturn(null);
+      _whenAnyStart(hub, span);
+
+      final sut = fixture.getSut(hub: hub);
+
+      sut.didPush(currentRoute, null);
+      sut.didPop(currentRoute, null);
+      sut.didPop(currentRoute, null);
+
+      verify(span.finish()).called(1);
+    });
+
     test('didPop re-starts previous', () {
       final previousRoute = route(RouteSettings(name: 'Previous Route'));
       final currentRoute = route(RouteSettings(name: 'Current Route'));