From 6f6a13709bec64f208377be0b3437f5e06afe4b7 Mon Sep 17 00:00:00 2001 From: Shashank Jarmale Date: Thu, 20 Nov 2025 14:35:08 -0800 Subject: [PATCH] Pass `trace_item_type` in `RequestMeta` for `DeleteTraceItemsRequest` RPC --- src/sentry/eventstream/eap.py | 5 +++-- tests/sentry/eventstream/test_eap.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sentry/eventstream/eap.py b/src/sentry/eventstream/eap.py index 3a01344cc2ed68..2eea2bfd24078a 100644 --- a/src/sentry/eventstream/eap.py +++ b/src/sentry/eventstream/eap.py @@ -8,9 +8,9 @@ DeleteTraceItemsResponse, ) from sentry_protos.snuba.v1.request_common_pb2 import ( - TRACE_ITEM_TYPE_OCCURRENCE, RequestMeta, TraceItemFilterWithType, + TraceItemType, ) from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey, AttributeValue, IntArray from sentry_protos.snuba.v1.trace_item_filter_pb2 import ( @@ -43,7 +43,7 @@ def delete_groups_from_eap_rpc( and_filter=AndFilter(filters=[project_filter, group_id_filter]) ) filter_with_type = TraceItemFilterWithType( - item_type=TRACE_ITEM_TYPE_OCCURRENCE, + item_type=TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE, filter=combined_filter, ) @@ -53,6 +53,7 @@ def delete_groups_from_eap_rpc( project_ids=[project_id], referrer=referrer, cogs_category="deletions", + trace_item_type=TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE, ), filters=[filter_with_type], ) diff --git a/tests/sentry/eventstream/test_eap.py b/tests/sentry/eventstream/test_eap.py index cb50358adac12e..c5c0fc638c9d5d 100644 --- a/tests/sentry/eventstream/test_eap.py +++ b/tests/sentry/eventstream/test_eap.py @@ -2,7 +2,7 @@ import pytest from sentry_protos.snuba.v1.endpoint_delete_trace_items_pb2 import DeleteTraceItemsResponse -from sentry_protos.snuba.v1.request_common_pb2 import TRACE_ITEM_TYPE_OCCURRENCE, ResponseMeta +from sentry_protos.snuba.v1.request_common_pb2 import ResponseMeta, TraceItemType from sentry.deletions.tasks.nodestore import delete_events_from_eap from sentry.eventstream.eap import delete_groups_from_eap_rpc @@ -35,7 +35,7 @@ def test_deletion_with_error_dataset(self, mock_rpc): assert request.meta.cogs_category == "deletions" assert len(request.filters) == 1 - assert request.filters[0].item_type == TRACE_ITEM_TYPE_OCCURRENCE + assert request.filters[0].item_type == TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE @patch("sentry.eventstream.eap.snuba_rpc.delete_trace_items_rpc") def test_multiple_group_ids(self, mock_rpc):