Allow to set startTimestamp explicitly for SentrySpan

dart/lib/src/hub.dart

@@ -342,6 +342,7 @@ class Hub {
     String name,
     String operation, {
     String? description,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -354,6 +355,7 @@ class Hub {
           operation,
           description: description,
         ),
+        startTimestamp: startTimestamp,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,
@@ -365,6 +367,7 @@ class Hub {
   ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -395,6 +398,7 @@ class Hub {
       final tracer = SentryTracer(
         transactionContext,
         this,
+        startTimestamp: startTimestamp,
         waitForChildren: waitForChildren ?? false,
         autoFinishAfter: autoFinishAfter,
         trimEnd: trimEnd ?? false,

dart/lib/src/hub_adapter.dart

@@ -108,6 +108,7 @@ class HubAdapter implements Hub {
   ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -116,6 +117,7 @@ class HubAdapter implements Hub {
       Sentry.startTransactionWithContext(
         transactionContext,
         customSamplingContext: customSamplingContext,
+        startTimestamp: startTimestamp,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,
@@ -127,6 +129,7 @@ class HubAdapter implements Hub {
     String name,
     String operation, {
     String? description,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -137,6 +140,7 @@ class HubAdapter implements Hub {
         name,
         operation,
         description: description,
+        startTimestamp: startTimestamp,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,

dart/lib/src/noop_hub.dart

@@ -87,6 +87,7 @@ class NoOpHub implements Hub {
     String name,
     String operation, {
     String? description,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -99,6 +100,7 @@ class NoOpHub implements Hub {
   ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,

dart/lib/src/noop_sentry_span.dart

@@ -41,7 +41,11 @@ class NoOpSentrySpan extends ISentrySpan {
   void setTag(String key, String value) {}
 
   @override
-  ISentrySpan startChild(String operation, {String? description}) =>
+  ISentrySpan startChild(
+    String operation, {
+    String? description,
+    DateTime? startTimestamp,
+  }) =>
       NoOpSentrySpan();
 
   @override

dart/lib/src/protocol/sentry_span.dart

@@ -10,7 +10,7 @@ import '../utils.dart';
 class SentrySpan extends ISentrySpan {
   final SentrySpanContext _context;
   DateTime? _timestamp;
-  final DateTime _startTimestamp = getUtcDateTime();
+  late final DateTime _startTimestamp;
   final Hub _hub;
 
   final SentryTracer _tracer;
@@ -28,9 +28,11 @@ class SentrySpan extends ISentrySpan {
     this._tracer,
     this._context,
     this._hub, {
+    DateTime? startTimestamp,
     bool? sampled,
     Function()? finishedCallback,
   }) {
+    _startTimestamp = startTimestamp?.toUtc() ?? getUtcDateTime();
     this.sampled = sampled;
     _finishedCallback = finishedCallback;
   }
@@ -94,15 +96,25 @@ class SentrySpan extends ISentrySpan {
   ISentrySpan startChild(
     String operation, {
     String? description,
+    DateTime? startTimestamp,
   }) {
     if (finished) {
       return NoOpSentrySpan();
     }
 
+    if (startTimestamp?.isBefore(_startTimestamp) ?? false) {
+      _hub.options.logger(
+        SentryLevel.warning,
+        "Start timestamp ($startTimestamp) cannot be before parent span's start timestamp ($_startTimestamp). Returning NoOpSpan.",
+      );
+      return NoOpSentrySpan();
+    }
+
     return _tracer.startChildWithParentSpanId(
       _context.spanId,
       operation,
       description: description,
+      startTimestamp: startTimestamp,
     );
   }
 

dart/lib/src/sentry.dart

@@ -224,6 +224,7 @@ class Sentry {
     String name,
     String operation, {
     String? description,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -234,6 +235,7 @@ class Sentry {
         name,
         operation,
         description: description,
+        startTimestamp: startTimestamp,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,
@@ -245,6 +247,7 @@ class Sentry {
   static ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,
@@ -253,6 +256,7 @@ class Sentry {
       _hub.startTransactionWithContext(
         transactionContext,
         customSamplingContext: customSamplingContext,
+        startTimestamp: startTimestamp,
         bindToScope: bindToScope,
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,

dart/lib/src/sentry_span_interface.dart

@@ -9,6 +9,7 @@ abstract class ISentrySpan {
   ISentrySpan startChild(
     String operation, {
     String? description,
+    DateTime? startTimestamp,
   });
 
   /// Sets the tag on span or transaction.

dart/lib/src/sentry_tracer.dart

@@ -33,14 +33,16 @@ class SentryTracer extends ISentrySpan {
   /// transaction after a given "idle time" and we don't want this "idle time"
   /// to be part of the transaction.
   SentryTracer(SentryTransactionContext transactionContext, this._hub,
-      {bool waitForChildren = false,
+      {DateTime? startTimestamp,
+      bool waitForChildren = false,
       Duration? autoFinishAfter,
       bool trimEnd = false}) {
     _rootSpan = SentrySpan(
       this,
       transactionContext,
       _hub,
       sampled: transactionContext.sampled,
+      startTimestamp: startTimestamp,
     );
     _waitForChildren = waitForChildren;
     if (autoFinishAfter != null) {
@@ -136,6 +138,7 @@ class SentryTracer extends ISentrySpan {
   ISentrySpan startChild(
     String operation, {
     String? description,
+    DateTime? startTimestamp,
   }) {
     if (finished) {
       return NoOpSentrySpan();
@@ -152,13 +155,15 @@ class SentryTracer extends ISentrySpan {
     return _rootSpan.startChild(
       operation,
       description: description,
+      startTimestamp: startTimestamp,
     );
   }
 
   ISentrySpan startChildWithParentSpanId(
     SpanId parentSpanId,
     String operation, {
     String? description,
+    DateTime? startTimestamp,
   }) {
     if (finished) {
       return NoOpSentrySpan();
@@ -178,8 +183,9 @@ class SentryTracer extends ISentrySpan {
         operation: operation,
         description: description);
 
-    final child = SentrySpan(this, context, _hub, sampled: _rootSpan.sampled,
-        finishedCallback: () {
+    final child = SentrySpan(this, context, _hub,
+        sampled: _rootSpan.sampled,
+        startTimestamp: startTimestamp, finishedCallback: () {
       final finishStatus = _finishStatus;
       if (finishStatus.finishing) {
         finish(status: finishStatus.status);

dart/test/default_integrations_test.dart

@@ -234,6 +234,7 @@ class PrintRecursionMockHub extends MockHub {
   ISentrySpan startTransactionWithContext(
     SentryTransactionContext transactionContext, {
     Map<String, dynamic>? customSamplingContext,
+    DateTime? startTimestamp,
     bool? bindToScope,
     bool? waitForChildren,
     Duration? autoFinishAfter,

dart/test/hub_test.dart

@@ -139,17 +139,21 @@ void main() {
       fixture = Fixture();
     });
 
-    test('start transaction with given name, op and desc', () async {
+    test('start transaction with given name, op, desc and start time',
+        () async {
       final hub = fixture.getSut();
+      final startTime = DateTime.now();
 
       final tr = hub.startTransaction(
         'name',
         'op',
+        startTimestamp: startTime,
         description: 'desc',
       );
 
       expect(tr.context.operation, 'op');
       expect(tr.context.description, 'desc');
+      expect(tr.startTimestamp.isAtSameMomentAs(startTime), true);
       expect((tr as SentryTracer).name, 'name');
     });
 

dart/test/sentry_span_test.dart

@@ -7,6 +7,15 @@ import 'mocks/mock_hub.dart';
 void main() {
   final fixture = Fixture();
 
+  test('convert given startTimestamp to utc date time', () async {
+    final nonUtcStartTimestamp = DateTime.now().toLocal();
+
+    final sut = fixture.getSut(startTimestamp: nonUtcStartTimestamp);
+
+    expect(nonUtcStartTimestamp.isUtc, false);
+    expect(sut.startTimestamp.isUtc, true);
+  });
+
   test('finish sets status', () async {
     final sut = fixture.getSut();
 
@@ -171,6 +180,18 @@ void main() {
     expect(NoOpSentrySpan(), span);
   });
 
+  test(
+      'startChild isnt allowed to be called if childs startTimestamp is before parents',
+      () async {
+    final parentStartTimestamp = DateTime.now();
+    final childStartTimestamp = parentStartTimestamp.add(-Duration(hours: 1));
+    final sut = fixture.getSut(startTimestamp: parentStartTimestamp);
+
+    final span = sut.startChild('op', startTimestamp: childStartTimestamp);
+
+    expect(NoOpSentrySpan(), span);
+  });
+
   test('callback called on finish', () async {
     var numberOfCallbackCalls = 0;
     final sut = fixture.getSut(finishedCallback: () {
@@ -201,13 +222,17 @@ class Fixture {
   late SentryTracer tracer;
   final hub = MockHub();
 
-  SentrySpan getSut({bool? sampled = true, Function()? finishedCallback}) {
+  SentrySpan getSut(
+      {DateTime? startTimestamp,
+      bool? sampled = true,
+      Function()? finishedCallback}) {
     tracer = SentryTracer(context, hub);
 
     return SentrySpan(
       tracer,
       context,
       hub,
+      startTimestamp: startTimestamp,
       sampled: sampled,
       finishedCallback: finishedCallback,
     );

flutter/test/mocks.dart

@@ -14,6 +14,7 @@ ISentrySpan startTransactionShim(
   String? name,
   String? operation, {
   String? description,
+  DateTime? startTimestamp,
   bool? bindToScope,
   bool? waitForChildren,
   Duration? autoFinishAfter,

flutter/test/mocks.mocks.dart

@@ -107,10 +107,11 @@ class MockNoOpSentrySpan extends _i1.Mock implements _i2.NoOpSentrySpan {
       super.noSuchMethod(Invocation.method(#setTag, [key, value]),
           returnValueForMissingStub: null);
   @override
-  _i2.ISentrySpan startChild(String? operation, {String? description}) =>
+  _i2.ISentrySpan startChild(String? operation,
+          {String? description, DateTime? startTimestamp}) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #startChild, [operation], {#description: description}),
+          Invocation.method(#startChild, [operation],
+              {#description: description, #startTimestamp: startTimestamp}),
           returnValue: _FakeISentrySpan_2()) as _i2.ISentrySpan);
   @override
   _i3.SentryTraceHeader toSentryTrace() =>
@@ -211,6 +212,7 @@ class MockHub extends _i1.Mock implements _i5.Hub {
   @override
   _i2.ISentrySpan startTransaction(String? name, String? operation,
           {String? description,
+          DateTime? startTimestamp,
           bool? bindToScope,
           bool? waitForChildren,
           Duration? autoFinishAfter,
@@ -222,6 +224,7 @@ class MockHub extends _i1.Mock implements _i5.Hub {
                 operation
               ], {
                 #description: description,
+                #startTimestamp: startTimestamp,
                 #bindToScope: bindToScope,
                 #waitForChildren: waitForChildren,
                 #autoFinishAfter: autoFinishAfter,
@@ -230,6 +233,7 @@ class MockHub extends _i1.Mock implements _i5.Hub {
               }),
               returnValue: _i11.startTransactionShim(name, operation,
                   description: description,
+                  startTimestamp: startTimestamp,
                   bindToScope: bindToScope,
                   waitForChildren: waitForChildren,
                   autoFinishAfter: autoFinishAfter,
@@ -240,6 +244,7 @@ class MockHub extends _i1.Mock implements _i5.Hub {
   _i2.ISentrySpan startTransactionWithContext(
           _i2.SentryTransactionContext? transactionContext,
           {Map<String, dynamic>? customSamplingContext,
+          DateTime? startTimestamp,
           bool? bindToScope,
           bool? waitForChildren,
           Duration? autoFinishAfter,
@@ -249,6 +254,7 @@ class MockHub extends _i1.Mock implements _i5.Hub {
             transactionContext
           ], {
             #customSamplingContext: customSamplingContext,
+            #startTimestamp: startTimestamp,
             #bindToScope: bindToScope,
             #waitForChildren: waitForChildren,
             #autoFinishAfter: autoFinishAfter,