Skip to content

fix(eap): Pass trace_item_type in RequestMeta for DeleteTraceItemsRequest RPC #144

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(eap): Pass trace_item_type in RequestMeta for DeleteTraceItemsRequest RPC #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/sentry/eventstream/eap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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,
)

Expand All @@ -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],
)
Expand Down
4 changes: 2 additions & 2 deletions tests/sentry/eventstream/test_eap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down