Merge branch 'main' into feat/apply-before-breadcrumb-on-native-crumbs

Author: buenaflor

.github/workflows/analyze.yml

@@ -51,36 +51,33 @@ jobs:
 
       - run: dart doc --dry-run
 
-# Currently Disabled because of git error `detected dubious ownership in repository.
-# TODO: check if this is still an issue when git version in github runners is updated
-#
-#  package-analysis:
-#    # `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
-#    # which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
-#    # because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
-#    if: ${{ !startsWith(github.ref, 'refs/heads/release/') && inputs.panaThreshold > 0 }}
-#    runs-on: ubuntu-20.04
-#    timeout-minutes: 20
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Apply dependency override
-#        if: ${{ inputs.package == 'flutter' }}
-#        working-directory: ${{ inputs.package }}
-#        run: |
-#          sed -i.bak 's|sentry:.*|sentry:\n    path: /github/workspace/dart|g' pubspec.yaml
-#      - uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
-#        id: analysis
-#        with:
-#          githubToken: ${{ secrets.GITHUB_TOKEN }}
-#          relativePath: ${{ inputs.package }}
-#      - name: Check scores
-#        env:
-#          TOTAL: ${{ steps.analysis.outputs.total }}
-#          TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
-#        run: |
-#          PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
-#          if (( $PERCENTAGE < ${{ inputs.panaThreshold }} ))
-#          then
-#            echo Score too low!
-#            exit 1
-#          fi
+  package-analysis:
+    # `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
+    # which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
+    # because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
+    if: ${{ !startsWith(github.ref, 'refs/heads/release/') && inputs.panaThreshold > 0 }}
+    runs-on: ubuntu-20.04
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+      - name: Apply dependency override
+        if: ${{ inputs.package == 'flutter' }}
+        working-directory: ${{ inputs.package }}
+        run: |
+          sed -i.bak 's|sentry:.*|sentry:\n    path: /github/workspace/dart|g' pubspec.yaml
+      - uses: axel-op/dart-package-analyzer@d9b13539ce28b8a2f85605379ce8670209d571e8 # pin@v3
+        id: analysis
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          relativePath: ${{ inputs.package }}
+      - name: Check scores
+        env:
+          TOTAL: ${{ steps.analysis.outputs.total }}
+          TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
+        run: |
+          PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
+          if (( $PERCENTAGE < ${{ inputs.panaThreshold }} ))
+          then
+            echo Score too low!
+            exit 1
+          fi

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix transaction end timestamp trimming ([#1916](https://github.com/getsentry/sentry-dart/pull/1916))
+  - Transaction end timestamps are now correctly trimmed to the latest child span end timestamp
+
 ### Features
 
 - Use `recordHttpBreadcrumbs` to set iOS `enableNetworkBreadcrumbs` ([#1884](https://github.com/getsentry/sentry-dart/pull/1884))

dart/lib/src/sentry_tracer.dart

@@ -109,18 +109,24 @@ class SentryTracer extends ISentrySpan {
       }
 
       var _rootEndTimestamp = commonEndTimestamp;
+
+      // Trim the end timestamp of the transaction to the very last timestamp of child spans
       if (_trimEnd && children.isNotEmpty) {
-        final childEndTimestamps = children
-            .where((child) => child.endTimestamp != null)
-            .map((child) => child.endTimestamp!);
-
-        if (childEndTimestamps.isNotEmpty) {
-          final oldestChildEndTimestamp =
-              childEndTimestamps.reduce((a, b) => a.isAfter(b) ? a : b);
-          if (_rootEndTimestamp.isAfter(oldestChildEndTimestamp)) {
-            _rootEndTimestamp = oldestChildEndTimestamp;
+        DateTime? latestEndTime;
+
+        for (final child in children) {
+          final childEndTimestamp = child.endTimestamp;
+          if (childEndTimestamp != null) {
+            if (latestEndTime == null ||
+                childEndTimestamp.isAfter(latestEndTime)) {
+              latestEndTime = child.endTimestamp;
+            }
           }
         }
+
+        if (latestEndTime != null) {
+          _rootEndTimestamp = latestEndTime;
+        }
       }
 
       // the callback should run before because if the span is finished,

dart/test/sentry_tracer_test.dart

@@ -386,6 +386,28 @@ void main() {
       expect(sut.endTimestamp, endTimestamp);
     });
 
+    test('end trimmed to latest child end timestamp', () async {
+      final sut = fixture.getSut(trimEnd: true);
+      final rootEndInitial = getUtcDateTime();
+      final childAEnd = rootEndInitial;
+      final childBEnd = rootEndInitial.add(Duration(seconds: 1));
+      final childCEnd = rootEndInitial;
+
+      final childA = sut.startChild('operation-a', description: 'description');
+      final childB = sut.startChild('operation-b', description: 'description');
+      final childC = sut.startChild('operation-c', description: 'description');
+
+      await childA.finish(endTimestamp: childAEnd);
+      await childB.finish(endTimestamp: childBEnd);
+      await childC.finish(endTimestamp: childCEnd);
+
+      await sut.finish(endTimestamp: rootEndInitial);
+
+      expect(sut.endTimestamp, equals(childB.endTimestamp),
+          reason:
+              'The root end timestamp should be updated to match the latest child end timestamp.');
+    });
+
     test('does not add more spans than configured in options', () async {
       fixture.hub.options.maxSpans = 2;
       final sut = fixture.getSut();