Skip to content

ref(querybuilder): Change span aggregations to use snuba params #75065

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
wmak merged 1 commit into from
Jul 29, 2024
Merged

ref(querybuilder): Change span aggregations to use snuba params #75065

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
21 changes: 10 additions & 11 deletions src/sentry/api/endpoints/organization_spans_aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,13 @@ def get(self, request: Request, organization: Organization) -> Response:
return Response(status=404)

try:
params = self.get_snuba_params(request, organization)
snuba_params, _ = self.get_snuba_dataclass(request, organization)
except NoProjects:
return Response(status=404)

enable_indexed_spans = options.get("indexed-spans.agg-span-waterfall.enable")

start = params["start"]
start = snuba_params.start
if start and start >= CUTOVER_DATE and enable_indexed_spans:
backend = "indexedSpans"
else:
Expand All @@ -373,7 +373,8 @@ def get(self, request: Request, organization: Organization) -> Response:
with handle_query_errors():
builder = SpansIndexedQueryBuilder(
dataset=Dataset.SpansIndexed,
params=params,
params={},
snuba_params=snuba_params,
selected_columns=["transaction_id", "trace_id", "count()", "any(timestamp)"],
query=query,
limit=100,
Expand Down Expand Up @@ -419,22 +420,20 @@ def get(self, request: Request, organization: Organization) -> Response:
if http_method is not None:
conditions.append(["http.method", "=", http_method])

environments = params.get("environment", None)
environments = snuba_params.environment_names
if environments:
if isinstance(environments, str):
conditions.append(["environment", "=", environments])
elif len(environments) == 1:
if len(environments) == 1:
conditions.append(["environment", "=", environments[0]])
elif len(environments) > 1:
conditions.append(["environment", "IN", environments])

events = eventstore.backend.get_events(
filter=eventstore.Filter(
conditions=conditions,
start=params["start"],
end=params["end"],
project_ids=params["project_id"],
organization_id=params["organization_id"],
start=snuba_params.start,
end=snuba_params.end,
project_ids=snuba_params.project_ids,
organization_id=snuba_params.organization_id,
),
limit=100,
referrer=Referrer.API_ORGANIZATION_SPANS_AGGREGATION.value,
Expand Down