Skip to content

chore(weekly reports): Add more logs #29819

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

Merged
ceorourke merged 4 commits into from
Nov 5, 2021
Merged

chore(weekly reports): Add more logs #29819

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b7fa4a
chore(weekly reports): Add more logs
ceorourke Nov 5, 2021
02b9ad3
user -> user_id, add another log earlier
ceorourke Nov 5, 2021
738680f
remove boolean
ceorourke Nov 5, 2021
ba9dd0a
put that back
ceorourke Nov 5, 2021
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
29 changes: 26 additions & 3 deletions src/sentry/tasks/reports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,13 @@ def prepare_organization_report(timestamp, duration, organization_id, dry_run=Fa
"organization_id": organization_id,
},
)
if features.has("organizations:weekly-report-debugging", organization):
logger.info(
"reports.org.begin_computing_report",
extra={
"organization_id": organization.id,
},
)
return

backend.prepare(timestamp, duration, organization)
Expand Down Expand Up @@ -704,12 +711,20 @@ def deliver_organization_user_report(timestamp, duration, organization_id, user_

user = User.objects.get(id=user_id)

if features.has("organizations:weekly-report-debugging", organization):
logger.info(
"reports.deliver_organization_user_report.begin",
extra={
"user_id": user.id,
"organization_id": organization.id,
},
)
if not user_subscribed_to_organization_reports(user, organization):
if features.has("organizations:weekly-report-debugging", organization):
logger.info(
"reports.user.unsubscribed",
extra={
"user": user.id,
"user_id": user.id,
"organization_id": organization.id,
},
)
Expand All @@ -727,7 +742,7 @@ def deliver_organization_user_report(timestamp, duration, organization_id, user_
logger.info(
"reports.user.no_projects",
extra={
"user": user.id,
"user_id": user.id,
"organization_id": organization.id,
},
)
Expand Down Expand Up @@ -756,7 +771,7 @@ def deliver_organization_user_report(timestamp, duration, organization_id, user_
logger.info(
"reports.user.no_reports",
extra={
"user": user.id,
"user_id": user.id,
"organization_id": organization.id,
},
)
Expand All @@ -768,6 +783,14 @@ def deliver_organization_user_report(timestamp, duration, organization_id, user_
message = build_message(timestamp, duration, organization, user, reports)

if not dry_run:
if features.has("organizations:weekly-report-debugging", organization):
logger.info(
"reports.deliver_organization_user_report.finish",
extra={
"user_id": user.id,
"organization_id": organization.id,
},
)
message.send()


Expand Down