Skip to content

Fix timezones in breadcrumb sorting #3537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix timezones in breadcrumb sorting #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a414acb
Fix timezones in breadcrumb sorting
antonpirker Sep 13, 2024
857a9d3
Also in other test
antonpirker Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentry_sdk/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import uuid
import random
import time
import warnings
import warnings
from datetime import datetime, timedelta, timezone

from opentelemetry import trace as otel_trace, context
Expand Down
20 changes: 10 additions & 10 deletions tests/test_basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ def test_breadcrumb_ordering(sentry_init, capture_events):
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),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=10),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=8),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=12),
]

for timestamp in timestamps:
Expand All @@ -344,8 +344,8 @@ def test_breadcrumb_ordering(sentry_init, capture_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"
datetime.datetime.strptime(x["timestamp"], "%Y-%m-%dT%H:%M:%S.%fZ").replace(
tzinfo=datetime.timezone.utc
)
for x in event["breadcrumbs"]["values"]
]
Expand All @@ -357,9 +357,9 @@ def test_breadcrumb_ordering_different_types(sentry_init, capture_events):
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),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=10),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=8),
datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=12),
]

for i, timestamp in enumerate(timestamps):
Expand All @@ -375,8 +375,8 @@ def test_breadcrumb_ordering_different_types(sentry_init, capture_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"
datetime.datetime.strptime(x["timestamp"], "%Y-%m-%dT%H:%M:%S.%fZ").replace(
tzinfo=datetime.timezone.utc
)
for x in event["breadcrumbs"]["values"]
]
Expand Down
Loading