Skip to content

feat(rq): Add messaging.destination.name attribute to consumer spans #6774

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

Open
alexander-alderman-webb wants to merge 3 commits into
base: master
Choose a base branch
from
+13 −5
Open

feat(rq): Add messaging.destination.name attribute to consumer spans #6774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b74bc10
feat(rq): Add messaging.destination.name attribute to consumer spans
alexander-alderman-webb Jul 8, 2026
866fcd5
.
alexander-alderman-webb Jul 8, 2026
56de494
.
alexander-alderman-webb Jul 8, 2026
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
13 changes: 8 additions & 5 deletions sentry_sdk/integrations/rq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ def setup_once() -> None:

@functools.wraps(old_perform_job)
def sentry_patched_perform_job(
self: "Any", job: "Job", *args: "Queue", **kwargs: "Any"
self: "Any", job: "Job", queue: "Queue", *args: "Any", **kwargs: "Any"
) -> bool:
Comment thread
alexander-alderman-webb marked this conversation as resolved.
client = sentry_sdk.get_client()
if client.get_integration(RqIntegration) is None:
return old_perform_job(self, job, *args, **kwargs)
return old_perform_job(self, job, queue, *args, **kwargs)

with sentry_sdk.new_scope() as scope:
scope.clear_breadcrumbs()
Expand All @@ -93,13 +93,14 @@ def sentry_patched_perform_job(
"sentry.origin": RqIntegration.origin,
"sentry.span.source": SegmentSource.TASK,
SPANDATA.MESSAGING_MESSAGE_ID: job.id,
SPANDATA.MESSAGING_DESTINATION_NAME: queue.name,
},
parent_span=None,
) as span:
if func_name is not None:
span.set_attribute(SPANDATA.CODE_FUNCTION_NAME, func_name)

rv = old_perform_job(self, job, *args, **kwargs)
rv = old_perform_job(self, job, queue, *args, **kwargs)
else:
transaction = continue_trace(
job.meta.get("_sentry_trace_headers") or {},
Expand All @@ -115,8 +116,10 @@ def sentry_patched_perform_job(
with sentry_sdk.start_transaction(
transaction,
custom_sampling_context={"rq_job": job},
):
rv = old_perform_job(self, job, *args, **kwargs)
) as span:
span.set_data(SPANDATA.MESSAGING_DESTINATION_NAME, queue.name)

rv = old_perform_job(self, job, queue, *args, **kwargs)

if self.is_horse:
# We're inside of a forked process and RQ is
Expand Down
5 changes: 5 additions & 0 deletions tests/integrations/rq/test_rq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ def test_transaction_no_error(

assert span["attributes"]["sentry.op"] == "queue.task.rq"
assert span["name"] == "tests.integrations.rq.test_rq.do_trick"
assert span["attributes"][SPANDATA.MESSAGING_DESTINATION_NAME] == queue.name
else:
events = capture_events()

Expand All @@ -427,6 +428,10 @@ def test_transaction_no_error(
assert envelope["type"] == "transaction"
assert envelope["contexts"]["trace"]["op"] == "queue.task.rq"
assert envelope["transaction"] == "tests.integrations.rq.test_rq.do_trick"
assert (
envelope["contexts"]["trace"]["data"][SPANDATA.MESSAGING_DESTINATION_NAME]
== queue.name
)
assert envelope["extra"]["rq-job"] == DictionaryContaining(
{
"args": ["Maisey"] if send_default_pii else SENSITIVE_DATA_SUBSTITUTE,
Expand Down
Loading