move finishAfter implementation out of abstract class

dart/lib/src/protocol/sentry_span.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import '../hub.dart';
 import '../protocol.dart';
 
@@ -17,6 +19,7 @@ class SentrySpan extends ISentrySpan {
 
   SpanStatus? _status;
   final Map<String, String> _tags = {};
+  Timer? _finishAfterTimer;
 
   @override
   bool? sampled;
@@ -32,6 +35,7 @@ class SentrySpan extends ISentrySpan {
 
   @override
   Future<void> finish({SpanStatus? status}) async {
+    _finishAfterTimer?.cancel();
     if (status != null) {
       _status = status;
     }
@@ -45,6 +49,13 @@ 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_tracer.dart

@@ -13,7 +13,7 @@ class SentryTracer extends ISentrySpan {
   late final SentrySpan _rootSpan;
   final List<SentrySpan> _children = [];
   final Map<String, String> _extra = {};
-  Timer? _idleTimer;
+  Timer? _finishAfterTimer;
   var _finishStatus = SentryTracerFinishStatus.notFinishing();
 
   SentryTracer(SentryTransactionContext transactionContext, this._hub,
@@ -30,11 +30,12 @@ class SentryTracer extends ISentrySpan {
 
   @override
   Future<void> finish({SpanStatus? status}) async {
-    _idleTimer?.cancel();
+    _finishAfterTimer?.cancel();
     _finishStatus = SentryTracerFinishStatus.finishing(status);
     if (!_rootSpan.finished &&
         (!_waitForChildren || _haveAllChildrenFinished())) {
-      await _rootSpan.finish(status: status);
+      _rootSpan.status ??= status;
+      await _rootSpan.finish();
 
       // finish unfinished spans otherwise transaction gets dropped
       for (final span in _children) {
@@ -59,8 +60,8 @@ class SentryTracer extends ISentrySpan {
 
   @override
   void finishAfter(Duration duration, {SpanStatus? status}) {
-    _idleTimer = Timer(duration, () async {
-      await finish(status: _rootSpan.status ?? status);
+    _finishAfterTimer = Timer(duration, () async {
+      await finish(status: status);
     });
   }
 

dart/test/sentry_span_test.dart

@@ -113,6 +113,16 @@ void main() {
     expect(sut.toSentryTrace().value,
         '${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);
+  });
 }
 
 class Fixture {

dart/test/sentry_tracer_test.dart

@@ -113,7 +113,7 @@ void main() {
         '${sut.context.traceId}-${sut.context.spanId}-1');
   });
 
-  test('tracer finishes after idle time', () async {
+  test('tracer finishes after duration', () async {
     final sut = fixture.getSut();
     sut.finishAfter(Duration(milliseconds: 200), status: SpanStatus.ok());