[pull] master from getsentry:master

src/sentry/api/endpoints/organization_events_trace.py

@@ -250,9 +250,12 @@ def load_span_serialized_performance_issues(self, light: bool) -> None:
             offender_span_ids = problem.evidence_data.get("offender_span_ids", [])
             for group_id in self.event["occurrence_to_issue_id"][problem.id]:
                 if group_id not in memoized_groups:
-                    memoized_groups[group_id] = Group.objects.get(
-                        id=group_id, project=self.event["project.id"]
-                    )
+                    try:
+                        memoized_groups[group_id] = Group.objects.get(
+                            id=group_id, project=self.event["project.id"]
+                        )
+                    except Group.DoesNotExist:
+                        continue
                 group = memoized_groups[group_id]
                 if event_span.get("span_id") in offender_span_ids:
                     start_timestamp = float(event_span["precise.start_ts"])

src/sentry/api/serializers/models/group_stream.py

@@ -490,8 +490,10 @@ def get_attrs(
                 )
                 attrs[item]["sentryAppIssues"] = sentry_app_issues
 
-        if self._expand("latestEventHasAttachments") and features.has(
-            "organizations:event-attachments", item.project.organization
+        if (
+            self._expand("latestEventHasAttachments")
+            and item_list
+            and features.has("organizations:event-attachments", item_list[0].project.organization)
         ):
             for item in item_list:
                 latest_event = item.get_latest_event()

src/sentry/feedback/endpoints/organization_feedback_categories.py

@@ -152,7 +152,7 @@ def get(self, request: Request, organization: Organization) -> Response:
         )
 
         if len(recent_feedbacks) < MIN_FEEDBACKS_CONTEXT:
-            logger.error("Too few feedbacks to generate categories")
+            logger.info("Too few feedbacks to generate categories")
             return Response(
                 {
                     "categories": None,

src/sentry/incidents/action_handlers.py

@@ -16,8 +16,6 @@
 from sentry.charts.types import ChartSize
 from sentry.constants import CRASH_RATE_ALERT_AGGREGATE_ALIAS
 from sentry.incidents.charts import build_metric_alert_chart
-from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
-from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializerResponse
 from sentry.incidents.endpoints.serializers.utils import get_fake_id_from_object_id
 from sentry.incidents.models.alert_rule import (
     AlertRuleDetectionType,
@@ -152,8 +150,6 @@ def format_duration(minutes: int | float) -> str:
 def generate_incident_trigger_email_context(
     project: Project,
     organization: Organization,
-    alert_rule_serialized_response: AlertRuleSerializerResponse,
-    incident_serialized_response: DetailedIncidentSerializerResponse,
     metric_issue_context: MetricIssueContext,
     alert_context: AlertContext,
     open_period_context: OpenPeriodContext,
@@ -207,8 +203,6 @@ def generate_incident_trigger_email_context(
         try:
             chart_url = build_metric_alert_chart(
                 organization=organization,
-                alert_rule_serialized_response=alert_rule_serialized_response,
-                selected_incident_serialized=incident_serialized_response,
                 snuba_query=snuba_query,
                 alert_context=alert_context,
                 open_period_context=open_period_context,
@@ -302,8 +296,6 @@ def email_users(
     metric_issue_context: MetricIssueContext,
     open_period_context: OpenPeriodContext,
     alert_context: AlertContext,
-    alert_rule_serialized_response: AlertRuleSerializerResponse,
-    incident_serialized_response: DetailedIncidentSerializerResponse,
     trigger_status: TriggerStatus,
     targets: list[tuple[int, str]],
     project: Project,
@@ -323,8 +315,6 @@ def email_users(
             project=project,
             organization=project.organization,
             metric_issue_context=metric_issue_context,
-            alert_rule_serialized_response=alert_rule_serialized_response,
-            incident_serialized_response=incident_serialized_response,
             alert_context=alert_context,
             open_period_context=open_period_context,
             trigger_status=trigger_status,

src/sentry/incidents/charts.py

@@ -11,8 +11,6 @@
 from sentry.api.utils import get_datetime_from_stats_period
 from sentry.charts import backend as charts
 from sentry.charts.types import ChartSize, ChartType
-from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
-from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializerResponse
 from sentry.incidents.logic import translate_aggregate_field
 from sentry.incidents.typings.metric_detector import AlertContext, OpenPeriodContext
 from sentry.models.apikey import ApiKey
@@ -27,7 +25,6 @@
 from sentry.workflow_engine.endpoints.serializers.detector_serializer import (
     DetectorSerializerResponse,
 )
-from sentry.workflow_engine.models import AlertRuleDetector
 
 CRASH_FREE_SESSIONS = "percentage(sessions_crashed, sessions) AS _crash_rate_alert_aggregate"
 CRASH_FREE_USERS = "percentage(users_crashed, users) AS _crash_rate_alert_aggregate"
@@ -140,41 +137,17 @@ def fetch_metric_issue_open_periods(
 ) -> list[Any]:
     detector_id = open_period_identifier
     try:
-        # temporarily fetch the alert rule ID from the detector ID
-        alert_rule_detector = AlertRuleDetector.objects.filter(
-            detector_id=open_period_identifier, alert_rule_id__isnull=False
-        ).first()
-        if alert_rule_detector is not None:
-            # open_period_identifier is a metric detector ID -> get the alert rule ID
-            open_period_identifier = alert_rule_detector.alert_rule_id
+        resp = client.get(
+            auth=ApiKey(organization_id=organization.id, scope_list=["org:read"]),
+            user=user,
+            path=f"/organizations/{organization.slug}/open-periods/",
+            params={
+                "detectorId": detector_id,
+                "bucketSize": time_window,
+                **time_period,
+            },
+        )
 
-        if features.has(
-            "organizations:workflow-engine-ui",
-            organization,
-        ):
-            resp = client.get(
-                auth=ApiKey(organization_id=organization.id, scope_list=["org:read"]),
-                user=user,
-                path=f"/organizations/{organization.slug}/open-periods/",
-                params={
-                    "detectorId": detector_id,
-                    "bucketSize": time_window,
-                    **time_period,
-                },
-            )
-        else:
-            resp = client.get(
-                auth=ApiKey(organization_id=organization.id, scope_list=["org:read"]),
-                user=user,
-                path=f"/organizations/{organization.slug}/incidents/",
-                params={
-                    "alertRule": open_period_identifier,
-                    "expand": "activities",
-                    "includeSnapshots": True,
-                    "project": -1,
-                    **time_period,
-                },
-            )
         return resp.data
     except Exception as exc:
         logger.error(
@@ -187,11 +160,9 @@ def fetch_metric_issue_open_periods(
 
 def build_metric_alert_chart(
     organization: Organization,
-    alert_rule_serialized_response: AlertRuleSerializerResponse,
     snuba_query: SnubaQuery,
     alert_context: AlertContext,
     open_period_context: OpenPeriodContext | None = None,
-    selected_incident_serialized: DetailedIncidentSerializerResponse | None = None,
     period: str | None = None,
     start: str | None = None,
     end: str | None = None,
@@ -206,22 +177,12 @@ def build_metric_alert_chart(
     dataset = Dataset(snuba_query.dataset)
     query_type = SnubaQuery.Type(snuba_query.type)
     is_crash_free_alert = query_type == SnubaQuery.Type.CRASH_RATE
-    using_new_charts = features.has(
-        "organizations:workflow-engine-ui",
-        organization,
+
+    style = (
+        ChartType.SLACK_METRIC_DETECTOR_SESSIONS
+        if is_crash_free_alert
+        else ChartType.SLACK_METRIC_DETECTOR_EVENTS
     )
-    if is_crash_free_alert:
-        style = (
-            ChartType.SLACK_METRIC_DETECTOR_SESSIONS
-            if using_new_charts
-            else ChartType.SLACK_METRIC_ALERT_SESSIONS
-        )
-    else:
-        style = (
-            ChartType.SLACK_METRIC_DETECTOR_EVENTS
-            if using_new_charts
-            else ChartType.SLACK_METRIC_ALERT_EVENTS
-        )
 
     if open_period_context:
         time_period = incident_date_range(
@@ -237,33 +198,17 @@ def build_metric_alert_chart(
             "start": period_start.strftime(TIME_FORMAT),
             "end": timezone.now().strftime(TIME_FORMAT),
         }
-    if features.has(
-        "organizations:workflow-engine-ui",
-        organization,
-    ):
-        # TODO(mifu67): create detailed serializer for open period, pass here.
-        # But we don't need it to render the chart, so it's fine for now.
-        chart_data_detector = {
-            "detector": detector_serialized_response,
-            "openPeriods": fetch_metric_issue_open_periods(
-                organization,
-                alert_context.action_identifier_id,
-                time_period,
-                user,
-                snuba_query.time_window,
-            ),
-        }
-    else:
-        chart_data_alert_rule = {
-            "rule": alert_rule_serialized_response,
-            "selectedIncident": selected_incident_serialized,
-            "incidents": fetch_metric_issue_open_periods(
-                organization,
-                alert_context.action_identifier_id,
-                time_period,
-                user,
-            ),
-        }
+
+    chart_data_detector = {
+        "detector": detector_serialized_response,
+        "openPeriods": fetch_metric_issue_open_periods(
+            organization,
+            alert_context.action_identifier_id,
+            time_period,
+            user,
+            snuba_query.time_window,
+        ),
+    }
 
     allow_mri = features.has(
         "organizations:insights-alerts",
@@ -343,10 +288,7 @@ def build_metric_alert_chart(
         )
 
     try:
-        if using_new_charts:
-            chart_data.update(chart_data_detector)
-        else:
-            chart_data.update(chart_data_alert_rule)
+        chart_data.update(chart_data_detector)
         return charts.generate_chart(style, chart_data, size=size)
     except RuntimeError as exc:
         logger.error(

src/sentry/integrations/discord/actions/metric_alert.py

@@ -4,8 +4,6 @@
 
 from sentry import features
 from sentry.incidents.charts import build_metric_alert_chart
-from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
-from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializerResponse
 from sentry.incidents.typings.metric_detector import (
     AlertContext,
     MetricIssueContext,
@@ -37,25 +35,17 @@ def send_incident_alert_notification(
     notification_context: NotificationContext,
     metric_issue_context: MetricIssueContext,
     open_period_context: OpenPeriodContext,
-    alert_rule_serialized_response: AlertRuleSerializerResponse | None,
-    incident_serialized_response: DetailedIncidentSerializerResponse | None,
     detector_serialized_response: DetectorSerializerResponse | None = None,
     notification_uuid: str | None = None,
 ) -> bool:
     chart_url = None
-    if (
-        features.has("organizations:metric-alert-chartcuterie", organization)
-        and alert_rule_serialized_response
-        and incident_serialized_response
-    ):
+    if features.has("organizations:metric-alert-chartcuterie", organization):
         try:
             chart_url = build_metric_alert_chart(
                 organization=organization,
-                alert_rule_serialized_response=alert_rule_serialized_response,
                 snuba_query=metric_issue_context.snuba_query,
                 alert_context=alert_context,
                 open_period_context=open_period_context,
-                selected_incident_serialized=incident_serialized_response,
                 subscription=metric_issue_context.subscription,
                 detector_serialized_response=detector_serialized_response,
             )

src/sentry/integrations/msteams/utils.py

@@ -3,8 +3,6 @@
 import enum
 import logging
 
-from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
-from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializerResponse
 from sentry.incidents.typings.metric_detector import (
     AlertContext,
     MetricIssueContext,
@@ -115,8 +113,6 @@ def send_incident_alert_notification(
     notification_context: NotificationContext,
     metric_issue_context: MetricIssueContext,
     open_period_context: OpenPeriodContext,
-    alert_rule_serialized_response: AlertRuleSerializerResponse | None,
-    incident_serialized_response: DetailedIncidentSerializerResponse | None,
     notification_uuid: str | None = None,
 ) -> bool:
     from .card_builder.incident_attachment import build_incident_attachment

src/sentry/integrations/slack/utils/notifications.py

@@ -13,8 +13,6 @@
 from sentry import features
 from sentry.constants import METRIC_ALERTS_THREAD_DEFAULT, ObjectStatus
 from sentry.incidents.charts import build_metric_alert_chart
-from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
-from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializerResponse
 from sentry.incidents.models.incident import IncidentStatus
 from sentry.incidents.typings.metric_detector import (
     AlertContext,
@@ -129,25 +127,17 @@ def _build_notification_payload(
     alert_context: AlertContext,
     metric_issue_context: MetricIssueContext,
     open_period_context: OpenPeriodContext,
-    alert_rule_serialized_response: AlertRuleSerializerResponse | None,
-    incident_serialized_response: DetailedIncidentSerializerResponse | None,
     detector_serialized_response: DetectorSerializerResponse | None,
     notification_uuid: str | None,
 ) -> tuple[str, str]:
     chart_url = None
-    if (
-        features.has("organizations:metric-alert-chartcuterie", organization)
-        and alert_rule_serialized_response
-        and incident_serialized_response
-    ):
+    if features.has("organizations:metric-alert-chartcuterie", organization):
         try:
             chart_url = build_metric_alert_chart(
                 organization=organization,
-                alert_rule_serialized_response=alert_rule_serialized_response,
                 snuba_query=metric_issue_context.snuba_query,
                 alert_context=alert_context,
                 open_period_context=open_period_context,
-                selected_incident_serialized=incident_serialized_response,
                 subscription=metric_issue_context.subscription,
                 detector_serialized_response=detector_serialized_response,
             )
@@ -290,8 +280,6 @@ def send_incident_alert_notification(
     notification_context: NotificationContext,
     metric_issue_context: MetricIssueContext,
     open_period_context: OpenPeriodContext,
-    alert_rule_serialized_response: AlertRuleSerializerResponse | None,
-    incident_serialized_response: DetailedIncidentSerializerResponse | None,
     detector_serialized_response: DetectorSerializerResponse | None = None,
     notification_uuid: str | None = None,
 ) -> bool:
@@ -315,8 +303,6 @@ def send_incident_alert_notification(
         alert_context=alert_context,
         metric_issue_context=metric_issue_context,
         open_period_context=open_period_context,
-        alert_rule_serialized_response=alert_rule_serialized_response,
-        incident_serialized_response=incident_serialized_response,
         notification_uuid=notification_uuid,
         detector_serialized_response=detector_serialized_response,
     )

src/sentry/issues/endpoints/group_details.py

@@ -49,7 +49,7 @@
 from sentry.users.services.user.service import user_service
 from sentry.utils import metrics
 
-delete_logger = logging.getLogger("sentry.deletions.api")
+logger = logging.getLogger(__name__)
 
 
 def get_group_global_count(group: Group) -> str:
@@ -390,7 +390,7 @@ def put(self, request: Request, group: Group) -> Response:
                 sample_rate=1.0,
                 tags={"status": e.status_code, "detail": "group_details:update:Response"},
             )
-            logging.exception(
+            logger.exception(
                 "group_details:put client.ApiError",
             )
             return Response(e.body, status=e.status_code)

src/sentry/issues/endpoints/organization_group_index.py

@@ -387,8 +387,7 @@ def get(self, request: Request, organization: Organization) -> Response:
                     serialized_groups = serialize(
                         groups, request.user, serializer(), request=request
                     )
-                    if event_id:
-                        serialized_groups[0]["matchingEventId"] = event_id
+                    serialized_groups[0]["matchingEventId"] = event_id
                     response = Response(serialized_groups)
                     response["X-Sentry-Direct-Hit"] = "1"
                     return response