Skip to content
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.

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

♻️ ref(metric alerts): refactor slack metric alert logic #87261

Merged
merged 5 commits into from
Mar 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions src/sentry/incidents/typings/metric_detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from sentry.incidents.models.incident import Incident, IncidentStatus
from sentry.issues.issue_occurrence import IssueOccurrence
from sentry.models.group import Group, GroupStatus
from sentry.snuba.models import SnubaQuery
from sentry.snuba.models import QuerySubscription, SnubaQuery
from sentry.types.group import PriorityLevel
from sentry.workflow_engine.models import Action, Detector

Expand Down Expand Up @@ -60,6 +60,7 @@ class NotificationContext:
NotificationContext is a dataclass that represents the context required send a notification.
"""

id: int
integration_id: int | None = None
target_identifier: str | None = None
target_display: str | None = None
Expand All @@ -69,6 +70,7 @@ class NotificationContext:
@classmethod
def from_alert_rule_trigger_action(cls, action: AlertRuleTriggerAction) -> NotificationContext:
return cls(
id=action.id,
integration_id=action.integration_id,
target_identifier=action.target_identifier,
target_display=action.target_display,
Expand All @@ -79,6 +81,7 @@ def from_alert_rule_trigger_action(cls, action: AlertRuleTriggerAction) -> Notif
def from_action_model(cls, action: Action) -> NotificationContext:
if action.type == Action.Type.SENTRY_APP:
return cls(
id=action.id,
integration_id=action.integration_id,
target_display=action.config.get("target_display"),
sentry_app_config=action.data.get("settings"),
Expand All @@ -87,6 +90,7 @@ def from_action_model(cls, action: Action) -> NotificationContext:
)
elif action.type == Action.Type.OPSGENIE or action.type == Action.Type.PAGERDUTY:
return cls(
id=action.id,
integration_id=action.integration_id,
target_identifier=action.config.get("target_identifier"),
target_display=action.config.get("target_display"),
Expand All @@ -95,6 +99,7 @@ def from_action_model(cls, action: Action) -> NotificationContext:
# TODO(iamrajjoshi): Add support for email here

return cls(
id=action.id,
integration_id=action.integration_id,
target_identifier=action.config.get("target_identifier"),
target_display=action.config.get("target_display"),
Expand All @@ -103,9 +108,11 @@ def from_action_model(cls, action: Action) -> NotificationContext:

@dataclass
class MetricIssueContext:
open_period_identifier: int
id: int
open_period_identifier: int # Used for link building
snuba_query: SnubaQuery
new_status: IncidentStatus
subscription: QuerySubscription | None
metric_value: float | None

@classmethod
Expand All @@ -128,6 +135,10 @@ def _get_snuba_query(cls, occurrence: IssueOccurrence) -> SnubaQuery:
raise ValueError("Snuba query does not exist") from e
return query

@classmethod
def _get_subscription(cls, occurrence: IssueOccurrence) -> QuerySubscription | None:
return occurrence.evidence_data.get("subscription_id")

@classmethod
def _get_metric_value(cls, occurrence: IssueOccurrence) -> float:
if (metric_value := occurrence.evidence_data.get("metric_value")) is None:
Expand All @@ -144,8 +155,11 @@ def from_group_event(cls, group_event: GroupEvent) -> MetricIssueContext:
# TODO(iamrajjoshi): Replace with something once we know how we want to build the link
# If we store open periods in the database, we can use the id from that
# Otherwise, we can use the issue id
id=group.id,
# TODO(iamrajjoshi): This should probably be the id of the latest open period
Comment on lines +158 to +159
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ty for the context comments on these! It makes it much easier to review these changes.

open_period_identifier=group.id,
snuba_query=cls._get_snuba_query(occurrence),
subscription=cls._get_subscription(occurrence),
new_status=cls._get_new_status(group, occurrence),
metric_value=cls._get_metric_value(occurrence),
)
Expand All @@ -158,8 +172,10 @@ def from_legacy_models(
metric_value: float | None = None,
) -> MetricIssueContext:
return cls(
id=incident.id,
open_period_identifier=incident.identifier,
snuba_query=incident.alert_rule.snuba_query,
subscription=incident.subscription,
new_status=new_status,
metric_value=metric_value,
)
Expand Down
17 changes: 6 additions & 11 deletions src/sentry/integrations/slack/message_builder/incidents.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from datetime import datetime

from sentry.incidents.models.incident import IncidentStatus
from sentry.incidents.typings.metric_detector import AlertContext
from sentry.incidents.typings.metric_detector import AlertContext, MetricIssueContext
from sentry.integrations.metric_alerts import incident_attachment_info
from sentry.integrations.slack.message_builder.base.block import BlockSlackMessageBuilder
from sentry.integrations.slack.message_builder.types import (
Expand All @@ -11,7 +10,6 @@
)
from sentry.integrations.slack.utils.escape import escape_slack_text
from sentry.models.organization import Organization
from sentry.snuba.models import SnubaQuery


def get_started_at(timestamp: datetime | None) -> str:
Expand All @@ -26,12 +24,9 @@ class SlackIncidentsMessageBuilder(BlockSlackMessageBuilder):
def __init__(
self,
alert_context: AlertContext,
open_period_identifier: int,
metric_issue_context: MetricIssueContext,
organization: Organization,
snuba_query: SnubaQuery,
new_status: IncidentStatus,
date_started: datetime,
metric_value: float | None = None,
chart_url: str | None = None,
notification_uuid: str | None = None,
) -> None:
Expand All @@ -45,11 +40,11 @@ def __init__(
"""
super().__init__()
self.alert_context = alert_context
self.open_period_identifier = open_period_identifier
self.open_period_identifier = metric_issue_context.open_period_identifier
self.organization = organization
self.snuba_query = snuba_query
self.metric_value = metric_value
self.new_status = new_status
self.snuba_query = metric_issue_context.snuba_query
self.metric_value = metric_issue_context.metric_value
self.new_status = metric_issue_context.new_status
self.date_started = date_started
self.chart_url = chart_url
self.notification_uuid = notification_uuid
Expand Down
Loading
Loading