move idle timer to tracer, only start transaction if scope is not set…

… already

dart/lib/src/hub.dart

@@ -340,6 +340,7 @@ class Hub {
     String operation, {
     String? description,
     bool? bindToScope,
+    Duration? idleFinishDuration,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       startTransactionWithContext(
@@ -357,6 +358,7 @@ class Hub {
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
+    Duration? idleFinishDuration,
   }) {
     if (!_isEnabled) {
       _options.logger(
@@ -380,8 +382,13 @@ class Hub {
         transactionContext = transactionContext.copyWith(sampled: sampled);
       }
 
-      final tracer = SentryTracer(transactionContext, this);
-
+      final tracer = SentryTracer(
+        transactionContext,
+        this,
+      );
+      if (idleFinishDuration != null) {
+        tracer.finishAfterIdleTime(idleFinishDuration);
+      }
       if (bindToScope ?? false) {
         item.scope.span = tracer;
       }

dart/lib/src/hub_adapter.dart

@@ -102,6 +102,7 @@ class HubAdapter implements Hub {
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
+    Duration? idleFinishDuration,
   }) =>
       Sentry.startTransactionWithContext(
         transactionContext,
@@ -115,6 +116,7 @@ class HubAdapter implements Hub {
     String operation, {
     String? description,
     bool? bindToScope,
+    Duration? idleFinishDuration,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       Sentry.startTransaction(

dart/lib/src/noop_hub.dart

@@ -79,6 +79,7 @@ class NoOpHub implements Hub {
     String operation, {
     String? description,
     bool? bindToScope,
+    Duration? idleFinishDuration,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       NoOpSentrySpan();
@@ -88,6 +89,7 @@ class NoOpHub implements Hub {
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
+    Duration? idleFinishDuration,
   }) =>
       NoOpSentrySpan();
 

dart/lib/src/sentry_tracer.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:meta/meta.dart';
 
 import '../sentry.dart';
@@ -12,6 +14,7 @@ class SentryTracer extends ISentrySpan {
   late final SentrySpan _rootSpan;
   final List<SentrySpan> _children = [];
   final Map<String, String> _extra = {};
+  Timer? _idleTimer;
 
   SentryTracer(SentryTransactionContext transactionContext, this._hub) {
     _rootSpan = SentrySpan(
@@ -23,8 +26,19 @@ class SentryTracer extends ISentrySpan {
     name = transactionContext.name;
   }
 
+  void finishAfterIdleTime(Duration time) {
+    _idleTimer = Timer(time, () async {
+      SpanStatus? status;
+      if (_rootSpan.status == null) {
+        status = SpanStatus.ok();
+      }
+      await finish(status: status);
+    });
+  }
+
   @override
   Future<void> finish({SpanStatus? status}) async {
+    _idleTimer?.cancel();
     await _rootSpan.finish(status: status);
 
     // finish unfinished spans otherwise transaction gets dropped

dart/test/default_integrations_test.dart

@@ -186,9 +186,11 @@ class PrintRecursionMockHub extends MockHub {
 
   @override
   ISentrySpan startTransactionWithContext(
-      SentryTransactionContext transactionContext,
-      {Map<String, dynamic>? customSamplingContext,
-      bool? bindToScope}) {
+    SentryTransactionContext transactionContext, {
+    Map<String, dynamic>? customSamplingContext,
+    bool? bindToScope,
+    Duration? idleFinishDuration,
+  }) {
     return NoOpSentrySpan();
   }
 }

dart/test/mocks/mock_hub.dart

@@ -127,6 +127,7 @@ class MockHub implements Hub {
     String operation, {
     String? description,
     bool? bindToScope,
+    Duration? idleFinishDuration,
     Map<String, dynamic>? customSamplingContext,
   }) {
     return NoOpSentrySpan();
@@ -137,6 +138,7 @@ class MockHub implements Hub {
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
+    Duration? idleFinishDuration,
   }) {
     return NoOpSentrySpan();
   }

dart/test/sentry_tracer_test.dart

@@ -112,6 +112,15 @@ void main() {
     expect(sut.toSentryTrace().value,
         '${sut.context.traceId}-${sut.context.spanId}-1');
   });
+
+  test('tracer finishes after idle time', () async {
+    final sut = fixture.getSut();
+    sut.finishAfterIdleTime(Duration(milliseconds: 200));
+
+    expect(sut.finished, false);
+    await Future.delayed(Duration(milliseconds: 210));
+    expect(sut.finished, true);
+  });
 }
 
 class Fixture {

flutter/lib/src/navigation/sentry_navigator_observer.dart

@@ -53,7 +53,6 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
   final bool _setRouteNameAsTransaction;
 
   ISentrySpan? _transaction;
-  Timer? _idleTimer;
 
   @override
   void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
@@ -90,7 +89,9 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
     );
     _finishTransaction();
     _startTransaction(
-        previousRoute?.settings.name, previousRoute?.settings.arguments);
+      previousRoute?.settings.name,
+      previousRoute?.settings.arguments,
+    );
   }
 
   void _addBreadcrumb({
@@ -123,21 +124,22 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
     if (name == null) {
       return;
     }
-    _transaction = _hub.startTransaction(
-      name,
-      'ui.load',
-      bindToScope: true,
-    );
-    if (arguments != null) {
-      _transaction?.setData('route_settings_arguments', arguments);
-    }
-    _idleTimer = Timer(Duration(seconds: 3), () async {
-      await _finishTransaction();
+    _hub.configureScope((scope) {
+      if (scope.span == null) {
+        _transaction = _hub.startTransaction(
+          name,
+          'ui.load',
+          bindToScope: true,
+          idleFinishDuration: Duration(seconds: 3),
+        );
+        if (arguments != null) {
+          _transaction?.setData('route_settings_arguments', arguments);
+        }
+      }
     });
   }
 
   Future<void> _finishTransaction() async {
-    _idleTimer?.cancel();
     _transaction?.status ??= SpanStatus.ok();
     return await _transaction?.finish();
   }

flutter/test/mocks.dart

@@ -14,6 +14,7 @@ ISentrySpan startTransactionShim(
   String? operation, {
   String? description,
   bool? bindToScope,
+  Duration? idleFinishDuration,
   Map<String, dynamic>? customSamplingContext,
 }) {
   return MockNoOpSentrySpan();
@@ -187,6 +188,7 @@ class NoOpHub implements Hub {
     String operation, {
     String? description,
     bool? bindToScope,
+    Duration? idleFinishDuration,
     Map<String, dynamic>? customSamplingContext,
   }) {
     return NoOpSentrySpan();
@@ -196,6 +198,7 @@ class NoOpHub implements Hub {
   ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    Duration? idleFinishDuration,
     bool? bindToScope,
   }) {
     return NoOpSentrySpan();

flutter/test/mocks.mocks.dart

@@ -208,6 +208,7 @@ class MockHub extends _i1.Mock implements _i4.Hub {
   _i2.ISentrySpan startTransaction(String? name, String? operation,
           {String? description,
           bool? bindToScope,
+          Duration? idleFinishDuration,
           Map<String, dynamic>? customSamplingContext}) =>
       (super.noSuchMethod(
               Invocation.method(#startTransaction, [
@@ -216,24 +217,28 @@ class MockHub extends _i1.Mock implements _i4.Hub {
               ], {
                 #description: description,
                 #bindToScope: bindToScope,
+                #idleFinishDuration: idleFinishDuration,
                 #customSamplingContext: customSamplingContext
               }),
               returnValue: _i10.startTransactionShim(name, operation,
                   description: description,
                   bindToScope: bindToScope,
+                  idleFinishDuration: idleFinishDuration,
                   customSamplingContext: customSamplingContext))
           as _i2.ISentrySpan);
   @override
   _i2.ISentrySpan startTransactionWithContext(
           _i2.SentryTransactionContext? transactionContext,
           {Map<String, dynamic>? customSamplingContext,
-          bool? bindToScope}) =>
+          bool? bindToScope,
+          Duration? idleFinishDuration}) =>
       (super.noSuchMethod(
           Invocation.method(#startTransactionWithContext, [
             transactionContext
           ], {
             #customSamplingContext: customSamplingContext,
-            #bindToScope: bindToScope
+            #bindToScope: bindToScope,
+            #idleFinishDuration: idleFinishDuration
           }),
           returnValue: _FakeISentrySpan_2()) as _i2.ISentrySpan);
   @override