Skip to content

fix(snuba): Handle direct project.id groupby in top event conditions #109535

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

Merged
Zylphrex merged 2 commits into from
Mar 2, 2026
Merged

fix(snuba): Handle direct project.id groupby in top event conditions #109535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01378d
fix(snuba): Handle direct project.id groupby in top event conditions
Zylphrex Feb 26, 2026
017492b
test(snuba): Add test for groupby project.id in timeseries spans
Zylphrex Feb 26, 2026
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
9 changes: 6 additions & 3 deletions src/sentry/snuba/rpc_dataset_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,12 @@ def build_top_event_conditions(
other_row_conditions = []
for key in groupby_columns:
if key == "project.id":
value = resolver.params.project_slug_map[
event.get("project") or event["project.slug"]
]
if "project.id" in event:
value = event["project.id"]
else:
value = resolver.params.project_slug_map[
event.get("project") or event["project.slug"]
]
else:
value = event[key]
resolved_term, context = resolver.resolve_term(
Expand Down
24 changes: 24 additions & 0 deletions tests/snuba/api/endpoints/test_organization_events_timeseries_spans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2615,3 +2615,27 @@ def test_sort_by_equation_and_top_events(self) -> None:
time_series_by_transaction["foo"]["meta"]["order"]
< time_series_by_transaction["bar"]["meta"]["order"]
)

def test_group_by_project_id(self) -> None:
self.store_spans([self.create_span({}, project=self.project)])
response = self._do_request(
data={
"yAxis": "count()",
"dataset": "spans",
"groupBy": ["project.id", "project.name"],
"query": "",
"topEvents": 5,
"project": self.project.id,
},
)
assert response.status_code == 200, response.content

time_series_by_project_id = {
ts["groupBy"][0]["value"]: ts
for ts in response.data["timeSeries"]
if ts["groupBy"] is not None
}
assert time_series_by_project_id[str(self.project.id)]["groupBy"] == [
{"key": "project.id", "value": str(self.project.id)},
{"key": "project.name", "value": self.project.slug},
]
Loading