Update

Author: buenaflor

packages/dart/lib/src/protocol/noop_span.dart

@@ -35,4 +35,7 @@ class NoOpSpan implements Span {
 
   @override
   DateTime? get endTimestamp => null;
+
+  @override
+  bool get isFinished => false;
 }

packages/dart/lib/src/protocol/simple_span.dart

@@ -1,5 +1,3 @@
-import 'package:meta/meta.dart';
-
 import '../../sentry.dart';
 
 class SimpleSpan implements Span {
@@ -12,6 +10,7 @@ class SimpleSpan implements Span {
   String _name;
   SpanV2Status _status = SpanV2Status.ok;
   DateTime? _endTimestamp;
+  bool _isFinished = false;
 
   SimpleSpan({
     required String name,
@@ -46,6 +45,7 @@ class SimpleSpan implements Span {
   void end({DateTime? endTimestamp}) {
     _endTimestamp = endTimestamp ?? DateTime.now().toUtc();
     hub.captureSpan(this);
+    _isFinished = true;
   }
 
   @override
@@ -58,6 +58,9 @@ class SimpleSpan implements Span {
     _attributes.addAll(attributes);
   }
 
+  @override
+  bool get isFinished => _isFinished;
+
   @override
   Map<String, dynamic> toJson() {
     // TODO: implement toJson

packages/dart/lib/src/protocol/span.dart

@@ -49,6 +49,9 @@ abstract class Span {
   /// Overrides if the attributes already exist.
   void setAttributes(Map<String, SentryAttribute> attributes);
 
+  @internal
+  bool get isFinished;
+
   @internal
   Map<String, dynamic> toJson();
 }

packages/dart/lib/src/protocol/unset_span.dart

@@ -54,4 +54,7 @@ class UnsetSpan extends Span {
 
   @override
   DateTime? get endTimestamp => throw UnimplementedError();
+
+  @override
+  bool get isFinished => throw UnimplementedError();
 }

packages/dart/lib/src/scope.dart

@@ -43,6 +43,8 @@ class Scope {
   /// Returns active transaction or null if there is no active transaction.
   ISentrySpan? span;
 
+  /// List of active spans.
+  /// The last span in the list is the current active span.
   final List<Span> _activeSpans = [];
 
   @visibleForTesting
@@ -307,6 +309,7 @@ class Scope {
     _replayId = null;
     propagationContext = PropagationContext();
     _attributes.clear();
+    _activeSpans.clear();
 
     _clearBreadcrumbsSync();
     _setUserSync(null);
@@ -514,6 +517,10 @@ class Scope {
       clone.setAttributes(Map.from(_attributes));
     }
 
+    if (_activeSpans.isNotEmpty) {
+      clone._activeSpans.addAll(_activeSpans);
+    }
+
     return clone;
   }
 

packages/dart/test/scope_test.dart

@@ -431,6 +431,7 @@ void main() {
     expect(sut.eventProcessors.length, 0);
     expect(sut.replayId, isNull);
     expect(sut.attributes, isEmpty);
+    expect(sut.activeSpans, isEmpty);
   });
 
   test('clones', () async {

packages/dart/test/span_test.dart

@@ -19,7 +19,9 @@ void main() {
       final span = SimpleSpan(name: 'test-span', parentSpan: null, hub: hub);
 
       span.end();
-      // TODO: verify span is finished once SimpleSpan implements it
+
+      expect(span.endTimestamp, isNotNull);
+      expect(span.isFinished, isTrue);
     });
 
     test('end sets current time by default', () {