Skip to content

fix(taskworker) Update parameters for update_user_reports #92362

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.

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

Merged
merged 1 commit into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 20 additions & 10 deletions src/sentry/tasks/update_user_reports.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging
from datetime import timedelta
from typing import Any
from datetime import datetime, timedelta

import sentry_sdk
from django.utils import timezone
Expand Down Expand Up @@ -31,13 +30,26 @@
namespace=issues_tasks,
),
)
def update_user_reports(**kwargs: Any) -> None:
def update_user_reports(
start_datetime: str | None = None,
end_datetime: str | None = None,
max_events: int | None = None,
event_lookback_days: int | None = None,
) -> None:
now = timezone.now()
start = kwargs.get("start", now - timedelta(days=1))
end = kwargs.get("end", now + timedelta(minutes=5)) # +5 minutes just to catch clock skew
start = now - timedelta(days=1)
# +5 minutes just to catch clock skew
end = now + timedelta(minutes=5)

if start_datetime:
start = datetime.fromisoformat(start_datetime)
if end_datetime:
end = datetime.fromisoformat(end_datetime)

# The event query time range is [start - event_lookback, end].
event_lookback = kwargs.get("event_lookback", timedelta(days=1))
if event_lookback_days is None:
event_lookback_days = 1
event_lookback = timedelta(days=event_lookback_days)

# Filter for user reports where there was no event associated with them at
# ingestion time
Expand All @@ -57,10 +69,8 @@ def update_user_reports(**kwargs: Any) -> None:
updated_reports = 0
samples = None

MAX_EVENTS = kwargs.get(
"max_events",
2000, # the default max_query_size is 256 KiB, which we're hitting with 5000 events, so keeping it safe at 2000
)
# the default max_query_size is 256 KiB, which we're hitting with 5000 events, so keeping it safe at 2000
MAX_EVENTS = max_events or 2000
for project_id, reports in project_map.items():
project = Project.objects.get(id=project_id)
event_ids = [r.event_id for r in reports]
Expand Down
14 changes: 11 additions & 3 deletions tests/sentry/tasks/test_update_user_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_report_timerange(self):
)

with self.tasks():
update_user_reports(start=start, end=end)
update_user_reports(start_datetime=start.isoformat(), end_datetime=end.isoformat())

report1 = UserReport.objects.get(project_id=project.id, event_id=event1.event_id)
report2 = UserReport.objects.get(project_id=project.id, event_id=event2.event_id)
Expand Down Expand Up @@ -106,7 +106,11 @@ def test_event_timerange(self):
)

with self.tasks():
update_user_reports(start=start, end=end, event_lookback=event_lookback)
update_user_reports(
start_datetime=start.isoformat(),
end_datetime=end.isoformat(),
event_lookback_days=event_lookback.days,
)

report1 = UserReport.objects.get(project_id=project.id, event_id=event1.event_id)
report2 = UserReport.objects.get(project_id=project.id, event_id=event2.event_id)
Expand Down Expand Up @@ -207,7 +211,11 @@ def test_event_retention(self, mock_get_event_retention):
self.create_event_and_report(project.id, event_dt=event_dt, report_dt=report_dt)

with self.tasks():
update_user_reports(start=epoch, end=now, event_lookback=event_lookback)
update_user_reports(
start_datetime=epoch.isoformat(),
end_datetime=now.isoformat(),
event_lookback_days=event_lookback.days,
)

assert mock_get_event_retention.call_count > 0
report = UserReport.objects.get()
Expand Down
Loading