Skip to content
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

Jump to bottom

Fix Sentry handler from LocalTaskJob causing error #18119

Merged
merged 1 commit into from
Sep 9, 2021
Merged

Fix Sentry handler from LocalTaskJob causing error #18119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions airflow/sentry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,14 @@ def add_breadcrumbs(self, task_instance, session=None):
sentry_sdk.add_breadcrumb(category="completed_tasks", data=data, level="info")

def enrich_errors(self, func):
"""Wrap TaskInstance._run_raw_task to support task specific tags and breadcrumbs."""
"""
Wrap TaskInstance._run_raw_task and LocalTaskJob._run_mini_scheduler_on_child_tasks
to support task specific tags and breadcrumbs.
"""
session_args_idx = find_session_idx(func)

@wraps(func)
def wrapper(task_instance, *args, **kwargs):
def wrapper(_self, *args, **kwargs):
# Wrapping the _run_raw_task function with push_scope to contain
# tags and breadcrumbs to a specific Task Instance

Expand All @@ -159,8 +162,14 @@ def wrapper(task_instance, *args, **kwargs):

with sentry_sdk.push_scope():
try:
return func(task_instance, *args, **kwargs)
return func(_self, *args, **kwargs)
except Exception as e:
# Is a LocalTaskJob get the task instance
if hasattr(_self, 'task_instance'):
task_instance = _self.task_instance
else:
task_instance = _self

self.add_tagging(task_instance)
self.add_breadcrumbs(task_instance, session=session)
sentry_sdk.capture_exception(e)
Expand Down