From 01710e90eb4ce620ae69a7e6dba7e274a781d0db Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 12 Jun 2026 11:16:52 +0200 Subject: [PATCH 1/2] ref(o11y): Add set_attribute calls in deliver webhooks --- src/sentry/hybridcloud/tasks/deliver_webhooks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sentry/hybridcloud/tasks/deliver_webhooks.py b/src/sentry/hybridcloud/tasks/deliver_webhooks.py index da6cc91f2e8c..76663dd54d1d 100644 --- a/src/sentry/hybridcloud/tasks/deliver_webhooks.py +++ b/src/sentry/hybridcloud/tasks/deliver_webhooks.py @@ -80,11 +80,14 @@ def _set_webhook_delivery_sentry_context(payload: WebhookPayload) -> None: """Set Sentry context at webhook delivery entrypoint for easier debugging.""" sentry_sdk.set_tag("mailbox_name", payload.mailbox_name) + sentry_sdk.set_attribute("mailbox_name", payload.mailbox_name) context: dict[str, str] = { "mailbox_name": payload.mailbox_name, "provider": payload.provider or "unknown", } sentry_sdk.set_context("webhook_delivery", context) + sentry_sdk.set_attribute("webhook_delivery.mailbox_name", payload.mailbox_name) + sentry_sdk.set_attribute("webhook_delivery.provider", payload.provider or "unknown") class DeliveryFailed(Exception): From 4780a77c3728110ec7319d5eaef6c054e5c220dc Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 12 Jun 2026 11:18:10 +0200 Subject: [PATCH 2/2] remove extra attr --- src/sentry/hybridcloud/tasks/deliver_webhooks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sentry/hybridcloud/tasks/deliver_webhooks.py b/src/sentry/hybridcloud/tasks/deliver_webhooks.py index 76663dd54d1d..aa7c5272c032 100644 --- a/src/sentry/hybridcloud/tasks/deliver_webhooks.py +++ b/src/sentry/hybridcloud/tasks/deliver_webhooks.py @@ -86,7 +86,6 @@ def _set_webhook_delivery_sentry_context(payload: WebhookPayload) -> None: "provider": payload.provider or "unknown", } sentry_sdk.set_context("webhook_delivery", context) - sentry_sdk.set_attribute("webhook_delivery.mailbox_name", payload.mailbox_name) sentry_sdk.set_attribute("webhook_delivery.provider", payload.provider or "unknown")