Skip to content

Commit 17943ca

Browse files
authored
ref(querybuilder): Change span aggregations to use snuba params (#75065)
- This is part of the change to move everything to snuba params
1 parent 0dd9f4a commit 17943ca

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/sentry/api/endpoints/organization_spans_aggregation.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ def get(self, request: Request, organization: Organization) -> Response:
344344
return Response(status=404)
345345

346346
try:
347-
params = self.get_snuba_params(request, organization)
347+
snuba_params, _ = self.get_snuba_dataclass(request, organization)
348348
except NoProjects:
349349
return Response(status=404)
350350

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

353-
start = params["start"]
353+
start = snuba_params.start
354354
if start and start >= CUTOVER_DATE and enable_indexed_spans:
355355
backend = "indexedSpans"
356356
else:
@@ -373,7 +373,8 @@ def get(self, request: Request, organization: Organization) -> Response:
373373
with handle_query_errors():
374374
builder = SpansIndexedQueryBuilder(
375375
dataset=Dataset.SpansIndexed,
376-
params=params,
376+
params={},
377+
snuba_params=snuba_params,
377378
selected_columns=["transaction_id", "trace_id", "count()", "any(timestamp)"],
378379
query=query,
379380
limit=100,
@@ -419,22 +420,20 @@ def get(self, request: Request, organization: Organization) -> Response:
419420
if http_method is not None:
420421
conditions.append(["http.method", "=", http_method])
421422

422-
environments = params.get("environment", None)
423+
environments = snuba_params.environment_names
423424
if environments:
424-
if isinstance(environments, str):
425-
conditions.append(["environment", "=", environments])
426-
elif len(environments) == 1:
425+
if len(environments) == 1:
427426
conditions.append(["environment", "=", environments[0]])
428427
elif len(environments) > 1:
429428
conditions.append(["environment", "IN", environments])
430429

431430
events = eventstore.backend.get_events(
432431
filter=eventstore.Filter(
433432
conditions=conditions,
434-
start=params["start"],
435-
end=params["end"],
436-
project_ids=params["project_id"],
437-
organization_id=params["organization_id"],
433+
start=snuba_params.start,
434+
end=snuba_params.end,
435+
project_ids=snuba_params.project_ids,
436+
organization_id=snuba_params.organization_id,
438437
),
439438
limit=100,
440439
referrer=Referrer.API_ORGANIZATION_SPANS_AGGREGATION.value,

0 commit comments

Comments
 (0)