From d54271d5b73f9b6b1db060ede350d6a48a971999 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 12 Jun 2026 11:07:42 +0200 Subject: [PATCH 1/3] ref(o11y): Add set_attribute calls in data export tasks --- src/sentry/data_export/tasks.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/sentry/data_export/tasks.py b/src/sentry/data_export/tasks.py index 04e4217c0583..26dbbd0a2c8e 100644 --- a/src/sentry/data_export/tasks.py +++ b/src/sentry/data_export/tasks.py @@ -475,7 +475,13 @@ def export_data_to_stored_blobs_sync( "requested_rows": export_limit, } sentry_sdk.set_tag("download_type", "sync") + sentry_sdk.set_attribute("download_type", "sync") sentry_sdk.set_context("data_export", extra) + sentry_sdk.set_attribute("data_export.data_export_id", data_export.id) + sentry_sdk.set_attribute("data_export.query", str(data_export.payload)) + sentry_sdk.set_attribute("data_export.organization_id", data_export.organization_id) + sentry_sdk.set_attribute("data_export.download_type", "sync") + sentry_sdk.set_attribute("data_export.requested_rows", export_limit) _set_data_on_scope(data_export) with sentry_sdk.start_span(op="assemble", name="Sync Export Data"): logger.info("dataexport.start", extra=extra) @@ -858,9 +864,14 @@ def _set_data_on_scope(data_export: ExportedData) -> None: user = dict(id=data_export.user_id) scope.set_user(user) scope.set_tag("organization.slug", data_export.organization.slug) + sentry_sdk.set_attribute("organization.slug", data_export.organization.slug) scope.set_tag("export.type", ExportQueryType.as_str(data_export.query_type)) + sentry_sdk.set_attribute("export.type", ExportQueryType.as_str(data_export.query_type)) scope.set_tag("export.format", data_export.export_format) + sentry_sdk.set_attribute("export.format", data_export.export_format) qi = data_export.query_info if qi.get("dataset") is not None: scope.set_tag("export.dataset", str(qi.get("dataset"))) + sentry_sdk.set_attribute("export.dataset", str(qi.get("dataset"))) scope.set_extra("export.query", data_export.query_info) + sentry_sdk.set_attribute("export.query", str(data_export.query_info)) From 6cc1c52d7a22e0bed55f0fc73217919af2e5771e Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 12 Jun 2026 11:10:34 +0200 Subject: [PATCH 2/3] top-level api --- src/sentry/data_export/tasks.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sentry/data_export/tasks.py b/src/sentry/data_export/tasks.py index 26dbbd0a2c8e..3b9a1b1c4081 100644 --- a/src/sentry/data_export/tasks.py +++ b/src/sentry/data_export/tasks.py @@ -859,19 +859,18 @@ def merge_export_blobs( def _set_data_on_scope(data_export: ExportedData) -> None: - scope = sentry_sdk.get_isolation_scope() if data_export.user_id: user = dict(id=data_export.user_id) - scope.set_user(user) - scope.set_tag("organization.slug", data_export.organization.slug) + sentry_sdk.set_user(user) + sentry_sdk.set_tag("organization.slug", data_export.organization.slug) sentry_sdk.set_attribute("organization.slug", data_export.organization.slug) - scope.set_tag("export.type", ExportQueryType.as_str(data_export.query_type)) + sentry_sdk.set_tag("export.type", ExportQueryType.as_str(data_export.query_type)) sentry_sdk.set_attribute("export.type", ExportQueryType.as_str(data_export.query_type)) - scope.set_tag("export.format", data_export.export_format) + sentry_sdk.set_tag("export.format", data_export.export_format) sentry_sdk.set_attribute("export.format", data_export.export_format) qi = data_export.query_info if qi.get("dataset") is not None: - scope.set_tag("export.dataset", str(qi.get("dataset"))) + sentry_sdk.set_tag("export.dataset", str(qi.get("dataset"))) sentry_sdk.set_attribute("export.dataset", str(qi.get("dataset"))) - scope.set_extra("export.query", data_export.query_info) + sentry_sdk.set_extra("export.query", data_export.query_info) sentry_sdk.set_attribute("export.query", str(data_export.query_info)) From 800a366fbfb2027454417e2d076163b7abfc5fe1 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 12 Jun 2026 13:38:54 +0200 Subject: [PATCH 3/3] remove the query --- src/sentry/data_export/tasks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sentry/data_export/tasks.py b/src/sentry/data_export/tasks.py index 3b9a1b1c4081..bcfeab5eabd9 100644 --- a/src/sentry/data_export/tasks.py +++ b/src/sentry/data_export/tasks.py @@ -873,4 +873,3 @@ def _set_data_on_scope(data_export: ExportedData) -> None: sentry_sdk.set_tag("export.dataset", str(qi.get("dataset"))) sentry_sdk.set_attribute("export.dataset", str(qi.get("dataset"))) sentry_sdk.set_extra("export.query", data_export.query_info) - sentry_sdk.set_attribute("export.query", str(data_export.query_info))