From 2e303d88ec1651108c0ed2df014710e013b1b013 Mon Sep 17 00:00:00 2001 From: William Mak Date: Tue, 27 Aug 2024 14:39:46 -0400 Subject: [PATCH] fix: some tests --- .../endpoints/organization_events_trends.py | 1 - src/sentry/incidents/logic.py | 21 ++++++++++--------- .../incidents/serializers/alert_rule.py | 15 ++++++------- src/sentry/search/snuba/executors.py | 2 +- src/sentry/snuba/errors.py | 4 ---- src/sentry/snuba/issue_platform.py | 3 --- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/sentry/api/endpoints/organization_events_trends.py b/src/sentry/api/endpoints/organization_events_trends.py index 63274f5cc45e07..1c9f1ceab0c496 100644 --- a/src/sentry/api/endpoints/organization_events_trends.py +++ b/src/sentry/api/endpoints/organization_events_trends.py @@ -470,7 +470,6 @@ def get(self, request: Request, organization) -> Response: with handle_query_errors(): trend_query = TrendQueryBuilder( dataset=Dataset.Discover, - params={}, snuba_params=snuba_params, selected_columns=selected_columns, config=QueryBuilderConfig( diff --git a/src/sentry/incidents/logic.py b/src/sentry/incidents/logic.py index ad51bd8a03fe7d..98c157aaed17f9 100644 --- a/src/sentry/incidents/logic.py +++ b/src/sentry/incidents/logic.py @@ -58,6 +58,7 @@ from sentry.relay.config.metric_extraction import on_demand_metrics_feature_flags from sentry.search.events.builder.base import BaseQueryBuilder from sentry.search.events.fields import is_function, resolve_field +from sentry.search.events.types import SnubaParams from sentry.seer.anomaly_detection.store_data import send_historical_data_to_seer from sentry.sentry_apps.services.app import RpcSentryAppInstallation, app_service from sentry.shared_integrations.exceptions import ( @@ -348,19 +349,19 @@ def build_incident_query_builder( ) -> BaseQueryBuilder: snuba_query = incident.alert_rule.snuba_query start, end = calculate_incident_time_range(incident, start, end, windowed_stats=windowed_stats) - project_ids = list( - IncidentProject.objects.filter(incident=incident).values_list("project_id", flat=True) + projects = Project.objects.filter( + id__in=IncidentProject.objects.filter(incident=incident).values_list("project_id") ) query_builder = entity_subscription.build_query_builder( query=snuba_query.query, - project_ids=project_ids, + projects=projects, environment=snuba_query.environment, - params={ - "organization_id": incident.organization_id, - "project_id": project_ids, - "start": start, - "end": end, - }, + params=SnubaParams( + organization=incident.organization, + projects=projects, + start=start, + end=end, + ), ) for i, column in enumerate(query_builder.columns): if column.alias == CRASH_RATE_ALERT_AGGREGATE_ALIAS: @@ -426,7 +427,7 @@ def get_incident_aggregates( snuba_query = incident.alert_rule.snuba_query entity_subscription = get_entity_subscription_from_snuba_query( snuba_query, - incident.organization_id, + incident.organization, ) query_builder = build_incident_query_builder( incident, entity_subscription, start, end, windowed_stats diff --git a/src/sentry/incidents/serializers/alert_rule.py b/src/sentry/incidents/serializers/alert_rule.py index f790ee5c02fe9f..e647218d2458e3 100644 --- a/src/sentry/incidents/serializers/alert_rule.py +++ b/src/sentry/incidents/serializers/alert_rule.py @@ -37,6 +37,7 @@ AlertRuleTrigger, ) from sentry.incidents.utils.types import AlertRuleActivationConditionType +from sentry.search.events.types import SnubaParams from sentry.snuba.dataset import Dataset from sentry.snuba.entity_subscription import ( ENTITY_TIME_COLUMNS, @@ -347,14 +348,14 @@ def _validate_snql_query(self, data, entity_subscription, projects): try: query_builder = entity_subscription.build_query_builder( query=data["query"], - project_ids=[p.id for p in projects], + projects=projects, environment=data.get("environment"), - params={ - "organization_id": projects[0].organization_id, - "project_id": [p.id for p in projects], - "start": start, - "end": end, - }, + params=SnubaParams( + organization=projects[0].organization, + projects=projects, + start=start, + end=end, + ), ) except (InvalidSearchQuery, ValueError) as e: raise serializers.ValidationError(f"Invalid Query or Metric: {e}") diff --git a/src/sentry/search/snuba/executors.py b/src/sentry/search/snuba/executors.py index c65ab83aaaa868..cede851e4f4836 100644 --- a/src/sentry/search/snuba/executors.py +++ b/src/sentry/search/snuba/executors.py @@ -1202,7 +1202,7 @@ def get_basic_event_snuba_condition( """ dataset = Dataset.Events if joined_entity.name == ENTITY_EVENTS else Dataset.IssuePlatform query_builder = UnresolvedQuery( - dataset=dataset, entity=joined_entity, snuba_params=snuba_params, params={} + dataset=dataset, entity=joined_entity, snuba_params=snuba_params ) return query_builder.convert_search_filter_to_condition(search_filter) diff --git a/src/sentry/snuba/errors.py b/src/sentry/snuba/errors.py index 346f943cbf5895..69dae91391efd2 100644 --- a/src/sentry/snuba/errors.py +++ b/src/sentry/snuba/errors.py @@ -61,7 +61,6 @@ def query( builder = ErrorsQueryBuilder( Dataset.Events, - params={}, snuba_params=snuba_params, query=query, selected_columns=selected_columns, @@ -110,7 +109,6 @@ def timeseries_query( equations, columns = categorize_columns(selected_columns) base_builder = ErrorsTimeseriesQueryBuilder( Dataset.Events, - params={}, interval=rollup, snuba_params=snuba_params, query=query, @@ -255,7 +253,6 @@ def top_events_timeseries( top_events_builder = ErrorsTopEventsQueryBuilder( Dataset.Events, - params={}, interval=rollup, top_events=top_events["data"], other=False, @@ -272,7 +269,6 @@ def top_events_timeseries( if len(top_events["data"]) == limit and include_other: other_events_builder = ErrorsTopEventsQueryBuilder( Dataset.Events, - params={}, interval=rollup, top_events=top_events["data"], other=True, diff --git a/src/sentry/snuba/issue_platform.py b/src/sentry/snuba/issue_platform.py index 62d6397c520b2d..27cd8c83771a68 100644 --- a/src/sentry/snuba/issue_platform.py +++ b/src/sentry/snuba/issue_platform.py @@ -78,7 +78,6 @@ def query( builder = DiscoverQueryBuilder( Dataset.IssuePlatform, - {}, snuba_params=snuba_params, query=query, selected_columns=selected_columns, @@ -149,7 +148,6 @@ def timeseries_query( equations, columns = categorize_columns(selected_columns) base_builder = IssuePlatformTimeseriesQueryBuilder( Dataset.IssuePlatform, - {}, rollup, snuba_params=snuba_params, query=query, @@ -169,7 +167,6 @@ def timeseries_query( comp_query_params.end -= comparison_delta comparison_builder = IssuePlatformTimeseriesQueryBuilder( Dataset.IssuePlatform, - {}, rollup, snuba_params=comp_query_params, query=query,