move auto finish after duration to start transactions as param

dart/lib/src/hub.dart

@@ -340,6 +340,7 @@ class Hub {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       startTransactionWithContext(
@@ -350,6 +351,7 @@ class Hub {
         ),
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
+        autoFinishAfter: autoFinishAfter,
         customSamplingContext: customSamplingContext,
       );
 
@@ -359,6 +361,7 @@ class Hub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) {
     if (!_isEnabled) {
       _options.logger(
@@ -382,8 +385,12 @@ class Hub {
         transactionContext = transactionContext.copyWith(sampled: sampled);
       }
 
-      final tracer = SentryTracer(transactionContext, this,
-          waitForChildren: waitForChildren ?? false);
+      final tracer = SentryTracer(
+        transactionContext,
+        this,
+        waitForChildren: waitForChildren ?? false,
+        autoFinishAfter: autoFinishAfter,
+      );
       if (bindToScope ?? false) {
         item.scope.span = tracer;
       }

dart/lib/src/hub_adapter.dart

@@ -103,12 +103,14 @@ class HubAdapter implements Hub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) =>
       Sentry.startTransactionWithContext(
         transactionContext,
         customSamplingContext: customSamplingContext,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
+        autoFinishAfter: autoFinishAfter,
       );
 
   @override
@@ -118,6 +120,7 @@ class HubAdapter implements Hub {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       Sentry.startTransaction(
@@ -126,6 +129,7 @@ class HubAdapter implements Hub {
         description: description,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
+        autoFinishAfter: autoFinishAfter,
         customSamplingContext: customSamplingContext,
       );
 

dart/lib/src/noop_hub.dart

@@ -79,6 +79,7 @@ class NoOpHub implements Hub {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       NoOpSentrySpan();
@@ -89,6 +90,7 @@ class NoOpHub implements Hub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) =>
       NoOpSentrySpan();
 

dart/lib/src/protocol/sentry_span.dart

@@ -19,7 +19,6 @@ class SentrySpan extends ISentrySpan {
 
   SpanStatus? _status;
   final Map<String, String> _tags = {};
-  Timer? _finishAfterTimer;
   void Function()? _finishedCallback;
 
   @override
@@ -37,8 +36,7 @@ class SentrySpan extends ISentrySpan {
   }
 
   @override
-  Future<void> finish({SpanStatus? status}) async {
-    _finishAfterTimer?.cancel();
+  Future<void> finish({SpanStatus? status, Duration? autoFinishAfter}) async {
     if (status != null) {
       _status = status;
     }
@@ -52,13 +50,6 @@ class SentrySpan extends ISentrySpan {
     await super.finish(status: status);
   }
 
-  @override
-  void finishAfter(Duration duration, {SpanStatus? status}) {
-    _finishAfterTimer = Timer(duration, () async {
-      await finish(status: status);
-    });
-  }
-
   @override
   void removeData(String key) {
     _data.remove(key);

dart/lib/src/sentry.dart

@@ -230,6 +230,7 @@ class Sentry {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) =>
       _hub.startTransaction(
@@ -238,6 +239,7 @@ class Sentry {
         description: description,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
+        autoFinishAfter: autoFinishAfter,
         customSamplingContext: customSamplingContext,
       );
 
@@ -247,12 +249,14 @@ class Sentry {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) =>
       _hub.startTransactionWithContext(
         transactionContext,
         customSamplingContext: customSamplingContext,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
+        autoFinishAfter: autoFinishAfter,
       );
 
   /// Gets the current active transaction or span.

dart/lib/src/sentry_span_interface.dart

@@ -26,9 +26,6 @@ abstract class ISentrySpan {
   /// Sets span timestamp marking this span as finished.
   Future<void> finish({SpanStatus? status}) async {}
 
-  /// Calls finish after the provided duration with the status parameter.
-  void finishAfter(Duration duration, {SpanStatus? status}) {}
-
   /// Gets span status.
   SpanStatus? get status;
 

dart/lib/src/sentry_tracer.dart

@@ -14,24 +14,29 @@ class SentryTracer extends ISentrySpan {
   late final SentrySpan _rootSpan;
   final List<SentrySpan> _children = [];
   final Map<String, String> _extra = {};
-  Timer? _finishAfterTimer;
+  Timer? _autoFinishAfterTimer;
   var _finishStatus = SentryTracerFinishStatus.notFinishing();
 
   SentryTracer(SentryTransactionContext transactionContext, this._hub,
-      {bool waitForChildren = false}) {
+      {bool waitForChildren = false, Duration? autoFinishAfter}) {
     _rootSpan = SentrySpan(
       this,
       transactionContext,
       _hub,
       sampled: transactionContext.sampled,
     );
     _waitForChildren = waitForChildren;
+    if (autoFinishAfter != null) {
+      _autoFinishAfterTimer = Timer(autoFinishAfter, () async {
+        await finish(status: status ?? SpanStatus.ok());
+      });
+    }
     name = transactionContext.name;
   }
 
   @override
   Future<void> finish({SpanStatus? status}) async {
-    _finishAfterTimer?.cancel();
+    _autoFinishAfterTimer?.cancel();
     _finishStatus = SentryTracerFinishStatus.finishing(status);
     if (!_rootSpan.finished &&
         (!_waitForChildren || _haveAllChildrenFinished())) {
@@ -57,13 +62,6 @@ class SentryTracer extends ISentrySpan {
     }
   }
 
-  @override
-  void finishAfter(Duration duration, {SpanStatus? status}) {
-    _finishAfterTimer = Timer(duration, () async {
-      await finish(status: status);
-    });
-  }
-
   @override
   void removeData(String key) {
     _extra.remove(key);

dart/test/default_integrations_test.dart

@@ -189,6 +189,7 @@ class PrintRecursionMockHub extends MockHub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) {
     return NoOpSentrySpan();
   }

dart/test/mocks/mock_hub.dart

@@ -126,6 +126,7 @@ class MockHub implements Hub {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) {
     return NoOpSentrySpan();
@@ -137,6 +138,7 @@ class MockHub implements Hub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) {
     return NoOpSentrySpan();
   }

dart/test/sentry_span_test.dart

@@ -113,16 +113,6 @@ void main() {
         '${sut.context.traceId}-${sut.context.spanId}-1');
   });
 
-  test('finishes after duration', () async {
-    final sut = fixture.getSut();
-    sut.finishAfter(Duration(milliseconds: 200), status: SpanStatus.ok());
-
-    expect(sut.finished, false);
-    await Future.delayed(Duration(milliseconds: 210));
-    expect(sut.status, SpanStatus.ok());
-    expect(sut.finished, true);
-  });
-
   test('callback called on finish', () async {
     var numberOfCallbackCalls = 0;
     final sut = fixture.getSut(finishedCallback: () {

dart/test/sentry_tracer_test.dart

@@ -113,9 +113,8 @@ void main() {
         '${sut.context.traceId}-${sut.context.spanId}-1');
   });
 
-  test('tracer finishes after duration', () async {
-    final sut = fixture.getSut();
-    sut.finishAfter(Duration(milliseconds: 200), status: SpanStatus.ok());
+  test('tracer finishes after auto finish duration', () async {
+    final sut = fixture.getSut(autoFinishAfter: Duration(milliseconds: 200));
 
     expect(sut.finished, false);
     await Future.delayed(Duration(milliseconds: 210));
@@ -175,12 +174,18 @@ class Fixture {
   SentryTracer getSut({
     bool? sampled = true,
     bool waitForChildren = false,
+    Duration? autoFinishAfter,
   }) {
     final context = SentryTransactionContext(
       'name',
       'op',
       sampled: sampled,
     );
-    return SentryTracer(context, hub, waitForChildren: waitForChildren);
+    return SentryTracer(
+      context,
+      hub,
+      waitForChildren: waitForChildren,
+      autoFinishAfter: autoFinishAfter,
+    );
   }
 }

flutter/lib/src/navigation/sentry_navigator_observer.dart

@@ -137,11 +137,11 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
         'ui.load',
         bindToScope: scope.span == null,
         waitForChildren: true,
+        autoFinishAfter: Duration(seconds: 3),
       );
       if (arguments != null) {
         _transaction?.setData('route_settings_arguments', arguments);
       }
-      _transaction?.finishAfter(Duration(seconds: 3), status: SpanStatus.ok());
     });
   }
 

flutter/test/mocks.dart

@@ -13,6 +13,7 @@ ISentrySpan startTransactionShim(
   String? description,
   bool? bindToScope,
   bool? waitForChildren,
+  Duration? autoFinishAfter,
   Map<String, dynamic>? customSamplingContext,
 }) {
   return MockNoOpSentrySpan();
@@ -187,6 +188,7 @@ class NoOpHub implements Hub {
     String? description,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
     Map<String, dynamic>? customSamplingContext,
   }) {
     return NoOpSentrySpan();
@@ -198,6 +200,7 @@ class NoOpHub implements Hub {
     Map<String, dynamic>? customSamplingContext,
     bool? bindToScope,
     bool? waitForChildren,
+    Duration? autoFinishAfter,
   }) {
     return NoOpSentrySpan();
   }

flutter/test/mocks.mocks.dart

@@ -84,8 +84,11 @@ class MockNoOpSentrySpan extends _i1.Mock implements _i2.NoOpSentrySpan {
       super.noSuchMethod(Invocation.setter(#status, status),
           returnValueForMissingStub: null);
   @override
-  _i6.Future<void> finish({_i3.SpanStatus? status}) =>
-      (super.noSuchMethod(Invocation.method(#finish, [], {#status: status}),
+  _i6.Future<void> finish(
+          {_i3.SpanStatus? status, Duration? autoFinishAfter}) =>
+      (super.noSuchMethod(
+          Invocation.method(#finish, [],
+              {#status: status, #autoFinishAfter: autoFinishAfter}),
           returnValue: Future<void>.value(),
           returnValueForMissingStub: Future<void>.value()) as _i6.Future<void>);
   @override
@@ -115,11 +118,6 @@ class MockNoOpSentrySpan extends _i1.Mock implements _i2.NoOpSentrySpan {
       (super.noSuchMethod(Invocation.method(#toSentryTrace, []),
           returnValue: _FakeSentryTraceHeader_3()) as _i3.SentryTraceHeader);
   @override
-  void finishAfter(Duration? duration, {_i3.SpanStatus? status}) =>
-      super.noSuchMethod(
-          Invocation.method(#finishAfter, [duration], {#status: status}),
-          returnValueForMissingStub: null);
-  @override
   String toString() => super.toString();
 }
 
@@ -214,6 +212,7 @@ class MockHub extends _i1.Mock implements _i4.Hub {
           {String? description,
           bool? bindToScope,
           bool? waitForChildren,
+          Duration? autoFinishAfter,
           Map<String, dynamic>? customSamplingContext}) =>
       (super.noSuchMethod(
               Invocation.method(#startTransaction, [
@@ -223,27 +222,31 @@ class MockHub extends _i1.Mock implements _i4.Hub {
                 #description: description,
                 #bindToScope: bindToScope,
                 #waitForChildren: waitForChildren,
+                #autoFinishAfter: autoFinishAfter,
                 #customSamplingContext: customSamplingContext
               }),
               returnValue: _i10.startTransactionShim(name, operation,
                   description: description,
                   bindToScope: bindToScope,
                   waitForChildren: waitForChildren,
+                  autoFinishAfter: autoFinishAfter,
                   customSamplingContext: customSamplingContext))
           as _i2.ISentrySpan);
   @override
   _i2.ISentrySpan startTransactionWithContext(
           _i2.SentryTransactionContext? transactionContext,
           {Map<String, dynamic>? customSamplingContext,
           bool? bindToScope,
-          bool? waitForChildren}) =>
+          bool? waitForChildren,
+          Duration? autoFinishAfter}) =>
       (super.noSuchMethod(
           Invocation.method(#startTransactionWithContext, [
             transactionContext
           ], {
             #customSamplingContext: customSamplingContext,
             #bindToScope: bindToScope,
-            #waitForChildren: waitForChildren
+            #waitForChildren: waitForChildren,
+            #autoFinishAfter: autoFinishAfter
           }),
           returnValue: _FakeISentrySpan_2()) as _i2.ISentrySpan);
   @override