Skip to content

Commit 85d0f9f

Browse files
authored
fix(eap): Pass trace_item_type in RequestMeta for DeleteTraceItemsRequest RPC (#103784)
Another follow-up to #102808. Fixes [SENTRY-5DCB](https://sentry.sentry.io/issues/7049009648?project=1). The `trace_item_type` field must be passed in both the `TraceItemFilterWithType` and `RequestMeta` when issuing a `DeleteTraceItemsRequest` RPC. Previously, we were including this only in the `TraceItemFilterWithType`.
1 parent 277265b commit 85d0f9f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/sentry/eventstream/eap.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
DeleteTraceItemsResponse,
99
)
1010
from sentry_protos.snuba.v1.request_common_pb2 import (
11-
TRACE_ITEM_TYPE_OCCURRENCE,
1211
RequestMeta,
1312
TraceItemFilterWithType,
13+
TraceItemType,
1414
)
1515
from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey, AttributeValue, IntArray
1616
from sentry_protos.snuba.v1.trace_item_filter_pb2 import (
@@ -43,7 +43,7 @@ def delete_groups_from_eap_rpc(
4343
and_filter=AndFilter(filters=[project_filter, group_id_filter])
4444
)
4545
filter_with_type = TraceItemFilterWithType(
46-
item_type=TRACE_ITEM_TYPE_OCCURRENCE,
46+
item_type=TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE,
4747
filter=combined_filter,
4848
)
4949

@@ -53,6 +53,7 @@ def delete_groups_from_eap_rpc(
5353
project_ids=[project_id],
5454
referrer=referrer,
5555
cogs_category="deletions",
56+
trace_item_type=TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE,
5657
),
5758
filters=[filter_with_type],
5859
)

tests/sentry/eventstream/test_eap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pytest
44
from sentry_protos.snuba.v1.endpoint_delete_trace_items_pb2 import DeleteTraceItemsResponse
5-
from sentry_protos.snuba.v1.request_common_pb2 import TRACE_ITEM_TYPE_OCCURRENCE, ResponseMeta
5+
from sentry_protos.snuba.v1.request_common_pb2 import ResponseMeta, TraceItemType
66

77
from sentry.deletions.tasks.nodestore import delete_events_from_eap
88
from sentry.eventstream.eap import delete_groups_from_eap_rpc
@@ -35,7 +35,7 @@ def test_deletion_with_error_dataset(self, mock_rpc):
3535
assert request.meta.cogs_category == "deletions"
3636

3737
assert len(request.filters) == 1
38-
assert request.filters[0].item_type == TRACE_ITEM_TYPE_OCCURRENCE
38+
assert request.filters[0].item_type == TraceItemType.TRACE_ITEM_TYPE_OCCURRENCE
3939

4040
@patch("sentry.eventstream.eap.snuba_rpc.delete_trace_items_rpc")
4141
def test_multiple_group_ids(self, mock_rpc):

0 commit comments

Comments
 (0)