feat(aci): use new detector chart for test org (#102513)

Set up flow for using detector/open period data to generate notification
charts. Hide this behind a feature flag so we can test.

Author: mifu67

src/sentry/features/temporary.py

@@ -215,6 +215,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:more-slow-alerts", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable higher limit for workflows
     manager.add("organizations:more-workflows", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
+    # Generate charts using detector/open period payload
+    manager.add("organizations:new-metric-issue-charts", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Extract on demand metrics
     manager.add("organizations:on-demand-metrics-extraction", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Extract on demand metrics (experimental features)

src/sentry/incidents/action_handlers.py

@@ -62,6 +62,9 @@
 from sentry.users.services.user.service import user_service
 from sentry.users.services.user_option import RpcUserOption, user_option_service
 from sentry.utils.email import MessageBuilder, get_email_addresses
+from sentry.workflow_engine.endpoints.serializers.detector_serializer import (
+    DetectorSerializerResponse,
+)
 from sentry.workflow_engine.models.incident_groupopenperiod import IncidentGroupOpenPeriod
 
 EMAIL_STATUS_DISPLAY = {TriggerStatus.ACTIVE: "Fired", TriggerStatus.RESOLVED: "Resolved"}
@@ -509,6 +512,7 @@ def generate_incident_trigger_email_context(
     trigger_threshold: float | None,
     user: User | RpcUser | None = None,
     notification_uuid: str | None = None,
+    detector_serialized_response: DetectorSerializerResponse | None = None,
 ) -> dict[str, Any]:
     from sentry.notifications.notification_action.utils import should_fire_workflow_actions
     from sentry.seer.anomaly_detection.types import AnomalyDetectionThresholdType
@@ -562,6 +566,7 @@ def generate_incident_trigger_email_context(
                 open_period_context=open_period_context,
                 size=ChartSize({"width": 600, "height": 200}),
                 subscription=subscription,
+                detector_serialized_response=detector_serialized_response,
             )
         except Exception:
             logging.exception("Error while attempting to build_metric_alert_chart")
@@ -682,6 +687,7 @@ def email_users(
     targets: list[tuple[int, str]],
     project: Project,
     notification_uuid: str | None = None,
+    detector_serialized_response: DetectorSerializerResponse | None = None,
 ) -> list[int]:
     users = user_service.get_many_by_id(ids=[user_id for user_id, _ in targets])
     sent_to_users = []
@@ -704,6 +710,7 @@ def email_users(
             trigger_threshold=alert_context.alert_threshold,
             user=user,
             notification_uuid=notification_uuid,
+            detector_serialized_response=detector_serialized_response,
         )
         build_message(email_context, trigger_status, user_id).send_async(to=[email])
         sent_to_users.append(user_id)

src/sentry/incidents/charts.py

@@ -24,6 +24,9 @@
 from sentry.snuba.utils import build_query_strings
 from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
+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"
@@ -134,6 +137,7 @@ def fetch_metric_issue_open_periods(
     time_period: Mapping[str, str],
     user: User | RpcUser | None = None,
 ) -> list[Any]:
+    detector_id = open_period_identifier
     try:
         if features.has(
             "organizations:workflow-engine-single-process-metric-issues",
@@ -147,23 +151,36 @@ def fetch_metric_issue_open_periods(
                 # 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}/incidents/",
-            # TODO(iamrajjoshi): Use the correct endpoint and update the params
-            params={
-                "alertRule": open_period_identifier,
-                "expand": "activities",
-                "includeSnapshots": True,
-                "project": -1,
-                **time_period,
-            },
-        )
+        if features.has(
+            "organizations:new-metric-issue-charts",
+            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,
+                    **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,
+                },
+            )
         # TODO (mifu67): temporary log that I'm going to remove after debugging. Get the data for old and new
-        if organization.slug == "sentry" or organization.slug == "demo":
+        if organization.slug == "mf-test-n7":
             logger.info(
-                "fetching metric issue incidents",
+                "fetching metric issue open periods",
                 extra={
                     "organization_id": organization.id,
                     "open_period_id": open_period_identifier,
@@ -193,18 +210,30 @@ def build_metric_alert_chart(
     user: User | RpcUser | None = None,
     size: ChartSize | None = None,
     subscription: QuerySubscription | None = None,
+    detector_serialized_response: DetectorSerializerResponse | None = None,
 ) -> str | None:
     """
     Builds the dataset required for metric alert chart the same way the frontend would
     """
     dataset = Dataset(snuba_query.dataset)
     query_type = SnubaQuery.Type(snuba_query.type)
     is_crash_free_alert = query_type == SnubaQuery.Type.CRASH_RATE
-    style = (
-        ChartType.SLACK_METRIC_ALERT_SESSIONS
-        if is_crash_free_alert
-        else ChartType.SLACK_METRIC_ALERT_EVENTS
+    using_new_charts = features.has(
+        "organizations:new-metric-issue-charts",
+        organization,
     )
+    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(
@@ -220,17 +249,32 @@ def build_metric_alert_chart(
             "start": period_start.strftime(TIME_FORMAT),
             "end": timezone.now().strftime(TIME_FORMAT),
         }
-
-    chart_data = {
-        "rule": alert_rule_serialized_response,
-        "selectedIncident": selected_incident_serialized,
-        "incidents": fetch_metric_issue_open_periods(
-            organization,
-            alert_context.action_identifier_id,
-            time_period,
-            user,
-        ),
-    }
+    if features.has(
+        "organizations:new-metric-issue-charts",
+        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,
+            "open_periods": fetch_metric_issue_open_periods(
+                organization,
+                alert_context.action_identifier_id,
+                time_period,
+                user,
+            ),
+        }
+    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,
+            ),
+        }
 
     allow_mri = features.has(
         "organizations:insights-alerts",
@@ -264,6 +308,7 @@ def build_metric_alert_chart(
         )
     )
 
+    chart_data = {}
     query_params = {
         **env_params,
         **time_period,
@@ -303,6 +348,10 @@ def build_metric_alert_chart(
         )
 
     try:
+        if using_new_charts:
+            chart_data.update(chart_data_detector)
+        else:
+            chart_data.update(chart_data_alert_rule)
         return charts.generate_chart(style, chart_data, size=size)
     except RuntimeError as exc:
         logger.error(

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

@@ -24,6 +24,9 @@
 )
 from sentry.models.organization import Organization
 from sentry.shared_integrations.exceptions import ApiError
+from sentry.workflow_engine.endpoints.serializers.detector_serializer import (
+    DetectorSerializerResponse,
+)
 
 from ..utils import logger
 
@@ -36,6 +39,7 @@ def send_incident_alert_notification(
     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
@@ -53,6 +57,7 @@ def send_incident_alert_notification(
                 open_period_context=open_period_context,
                 selected_incident_serialized=incident_serialized_response,
                 subscription=metric_issue_context.subscription,
+                detector_serialized_response=detector_serialized_response,
             )
         except Exception as e:
             sentry_sdk.capture_exception(e)

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

@@ -54,6 +54,9 @@
 from sentry.models.organization import Organization
 from sentry.notifications.notification_action.utils import should_fire_workflow_actions
 from sentry.notifications.utils.open_period import open_period_start_for_group
+from sentry.workflow_engine.endpoints.serializers.detector_serializer import (
+    DetectorSerializerResponse,
+)
 from sentry.workflow_engine.models.action import Action
 
 _logger = logging.getLogger(__name__)
@@ -193,6 +196,7 @@ def _build_notification_payload(
     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
@@ -210,6 +214,7 @@ def _build_notification_payload(
                 open_period_context=open_period_context,
                 selected_incident_serialized=incident_serialized_response,
                 subscription=metric_issue_context.subscription,
+                detector_serialized_response=detector_serialized_response,
             )
         except Exception as e:
             sentry_sdk.capture_exception(e)
@@ -410,6 +415,7 @@ def send_incident_alert_notification(
     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:
     # Make sure organization integration is still active:
@@ -435,6 +441,7 @@ def send_incident_alert_notification(
         alert_rule_serialized_response=alert_rule_serialized_response,
         incident_serialized_response=incident_serialized_response,
         notification_uuid=notification_uuid,
+        detector_serialized_response=detector_serialized_response,
     )
 
     # TODO(iamrajjoshi): This will need to be updated once we plan out Metric Alerts rollout

src/sentry/models/groupopenperiod.py

@@ -6,6 +6,7 @@
 from django.contrib.postgres.fields import DateTimeRangeField
 from django.contrib.postgres.fields.ranges import RangeBoundary, RangeOperators
 from django.db import models, router, transaction
+from django.db.models import Q
 from django.utils import timezone
 
 from sentry import options
@@ -155,7 +156,9 @@ def get_open_periods_for_group(
         date_started__gte=query_start,
     ).order_by("-date_started")
     if query_end:
-        group_open_periods = group_open_periods.filter(date_ended__lte=query_end)
+        group_open_periods = group_open_periods.filter(
+            Q(date_ended__lte=query_end) | Q(date_ended__isnull=True)
+        )
 
     return group_open_periods[:limit]
 

src/sentry/notifications/notification_action/metric_alert_registry/handlers/discord_metric_alert_handler.py

@@ -13,6 +13,7 @@
 from sentry.notifications.notification_action.metric_alert_registry.handlers.utils import (
     get_alert_rule_serializer,
     get_detailed_incident_serializer,
+    get_detector_serializer,
 )
 from sentry.notifications.notification_action.registry import metric_alert_handler_registry
 from sentry.notifications.notification_action.types import BaseMetricAlertHandler
@@ -49,6 +50,7 @@ def send_alert(
             raise ValueError("Open period not found")
 
         alert_rule_serialized_response = get_alert_rule_serializer(detector)
+        detector_serialized_response = get_detector_serializer(detector)
         incident_serialized_response = get_detailed_incident_serializer(open_period)
 
         logger.info(
@@ -67,4 +69,5 @@ def send_alert(
             notification_uuid=notification_uuid,
             alert_rule_serialized_response=alert_rule_serialized_response,
             incident_serialized_response=incident_serialized_response,
+            detector_serialized_response=detector_serialized_response,
         )

src/sentry/notifications/notification_action/metric_alert_registry/handlers/email_metric_alert_handler.py

@@ -18,6 +18,7 @@
 from sentry.notifications.notification_action.metric_alert_registry.handlers.utils import (
     get_alert_rule_serializer,
     get_detailed_incident_serializer,
+    get_detector_serializer,
 )
 from sentry.notifications.notification_action.registry import metric_alert_handler_registry
 from sentry.notifications.notification_action.types import BaseMetricAlertHandler
@@ -54,6 +55,7 @@ def send_alert(
             raise ValueError("Open period not found")
 
         alert_rule_serialized_response = get_alert_rule_serializer(detector)
+        detector_serialized_response = get_detector_serializer(detector)
         incident_serialized_response = get_detailed_incident_serializer(open_period)
 
         recipients = list(
@@ -77,6 +79,7 @@ def send_alert(
             alert_context=alert_context,
             alert_rule_serialized_response=alert_rule_serialized_response,
             incident_serialized_response=incident_serialized_response,
+            detector_serialized_response=detector_serialized_response,
             trigger_status=trigger_status,
             targets=targets,
             project=project,

src/sentry/notifications/notification_action/metric_alert_registry/handlers/slack_metric_alert_handler.py

@@ -14,6 +14,7 @@
 from sentry.notifications.notification_action.metric_alert_registry.handlers.utils import (
     get_alert_rule_serializer,
     get_detailed_incident_serializer,
+    get_detector_serializer,
 )
 from sentry.notifications.notification_action.registry import metric_alert_handler_registry
 from sentry.notifications.notification_action.types import BaseMetricAlertHandler
@@ -46,6 +47,7 @@ def send_alert(
             raise ValueError("Open period not found")
 
         alert_rule_serialized_response = get_alert_rule_serializer(detector)
+        detector_serialized_response = get_detector_serializer(detector)
         incident_serialized_response = get_detailed_incident_serializer(open_period)
 
         logger.info(
@@ -66,4 +68,5 @@ def send_alert(
             notification_uuid=notification_uuid,
             alert_rule_serialized_response=alert_rule_serialized_response,
             incident_serialized_response=incident_serialized_response,
+            detector_serialized_response=detector_serialized_response,
         )

src/sentry/notifications/notification_action/metric_alert_registry/handlers/utils.py

@@ -12,13 +12,23 @@
     WorkflowEngineIncidentSerializer,
 )
 from sentry.models.groupopenperiod import GroupOpenPeriod
+from sentry.workflow_engine.endpoints.serializers.detector_serializer import (
+    DetectorSerializer,
+    DetectorSerializerResponse,
+)
 from sentry.workflow_engine.models import Detector
 
 
 def get_alert_rule_serializer(detector: Detector) -> AlertRuleSerializerResponse:
     return serialize(detector, None, WorkflowEngineDetectorSerializer())
 
 
+def get_detector_serializer(detector: Detector) -> DetectorSerializerResponse:
+    return serialize(detector, None, DetectorSerializer())
+
+
+# TODO(mifu67): These take an open period, get the incident, and call the incident
+# serializer on the incident. They will need to be replaced.
 def get_detailed_incident_serializer(
     open_period: GroupOpenPeriod,
 ) -> DetailedIncidentSerializerResponse: