Skip to content

fix(events-stats): Return 400 for EAP topEvents without a group-by #129446

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

fix(events-stats): Return 400 for EAP topEvents without a group-by #129446

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
3 changes: 3 additions & 0 deletions src/sentry/api/endpoints/organization_events_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
get_trace_metric_from_request,
)
from sentry.search.eap.types import SearchResolverConfig
from sentry.search.events.fields import is_function
from sentry.search.events.types import SnubaParams
from sentry.snuba import (
discover,
Expand Down Expand Up @@ -305,6 +306,8 @@ def get_rpc_config():
if "timestamp" in raw_groupby:
raise ParseError("Cannot group by timestamp")
if use_rpc:
if all(is_function(column) for column in raw_groupby):
raise ParseError("topEvents requires at least one non-aggregate field")
return scoped_dataset.run_top_events_timeseries_query(
params=snuba_params,
query_string=query,
Expand Down
26 changes: 26 additions & 0 deletions tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,32 @@ def test_top_events_with_no_data(self) -> None:
)
assert response.status_code == 200, response.content

def test_top_events_without_groupby(self) -> None:
self.store_spans(
[
self.create_span(
{"sentry_tags": {"op": "db"}},
start_ts=self.day_ago + timedelta(minutes=1),
),
],
)

response = self._do_request(
data={
"start": self.day_ago,
"end": self.day_ago + timedelta(minutes=6),
"interval": "1m",
"yAxis": "p95(span.duration)",
"field": ["p95(span.duration)"],
"query": "span.op:db",
"dataset": "spans",
"excludeOther": 0,
"topEvents": 10,
},
)
assert response.status_code == 400, response.content
assert response.data["detail"] == "topEvents requires at least one non-aggregate field"

def test_count_unique_nans(self) -> None:
self.store_span(
self.create_span(start_ts=self.two_days_ago + timedelta(minutes=1)),
Expand Down
Loading