diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py index e6ad86254f..8473f1bcb2 100644 --- a/sentry_sdk/scope.py +++ b/sentry_sdk/scope.py @@ -1298,6 +1298,7 @@ def _apply_breadcrumbs_to_event(self, event, hint, options): event.setdefault("breadcrumbs", {}).setdefault("values", []).extend( self._breadcrumbs ) + event["breadcrumbs"]["values"].sort(key=lambda crumb: crumb["timestamp"]) def _apply_user_to_event(self, event, hint, options): # type: (Event, Hint, Optional[Dict[str, Any]]) -> None diff --git a/tests/test_basics.py b/tests/test_basics.py index 439215e013..52eb5045d8 100644 --- a/tests/test_basics.py +++ b/tests/test_basics.py @@ -1,3 +1,4 @@ +import datetime import logging import os import sys @@ -391,6 +392,37 @@ def test_breadcrumbs(sentry_init, capture_events): assert len(event["breadcrumbs"]["values"]) == 0 +def test_breadcrumb_ordering(sentry_init, capture_events): + sentry_init() + events = capture_events() + + timestamps = [ + datetime.datetime.now() - datetime.timedelta(days=10), + datetime.datetime.now() - datetime.timedelta(days=8), + datetime.datetime.now() - datetime.timedelta(days=12), + ] + + for timestamp in timestamps: + add_breadcrumb( + message="Authenticated at %s" % timestamp, + category="auth", + level="info", + timestamp=timestamp, + ) + + capture_exception(ValueError()) + (event,) = events + + assert len(event["breadcrumbs"]["values"]) == len(timestamps) + timestamps_from_event = [ + datetime.datetime.strptime( + x["timestamp"].replace("Z", ""), "%Y-%m-%dT%H:%M:%S.%f" + ) + for x in event["breadcrumbs"]["values"] + ] + assert timestamps_from_event == sorted(timestamps) + + def test_attachments(sentry_init, capture_envelopes): sentry_init() envelopes = capture_envelopes()