Skip to content

Commit 17a46a7

Browse files
tonytim-schilling
authored andcommitted
celery: Skip tagging delivery_info if missing from request
Resolves #731
1 parent f477b09 commit 17a46a7

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
### Added
66

77
### Fixed
8+
- Avoid assuming Celery tasks will have a truth-y `delivery_info` property.
9+
([Issue 731](https://github.com/scoutapp/scout_apm_python/issues/731))
810

911
## [2.24.1] 2022-02-16
1012

src/scout_apm/celery.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ def task_prerun_callback(task=None, **kwargs):
5656
if parent_task_id:
5757
tracked_request.tag("parent_task_id", parent_task_id)
5858

59-
delivery_info = task.request.delivery_info
60-
tracked_request.tag("is_eager", delivery_info.get("is_eager", False))
61-
tracked_request.tag("exchange", delivery_info.get("exchange", "unknown"))
62-
tracked_request.tag("priority", delivery_info.get("priority", "unknown"))
63-
tracked_request.tag("routing_key", delivery_info.get("routing_key", "unknown"))
64-
tracked_request.tag("queue", delivery_info.get("queue", "unknown"))
59+
delivery_info = getattr(task.request, "delivery_info", None)
60+
if delivery_info:
61+
tracked_request.tag("is_eager", delivery_info.get("is_eager", False))
62+
tracked_request.tag("exchange", delivery_info.get("exchange", "unknown"))
63+
tracked_request.tag("priority", delivery_info.get("priority", "unknown"))
64+
tracked_request.tag("routing_key", delivery_info.get("routing_key", "unknown"))
65+
tracked_request.tag("queue", delivery_info.get("queue", "unknown"))
6566

6667
tracked_request.start_span(operation=("Job/" + task.name))
6768

0 commit comments

Comments
 (0)