Merge branch 'master' into scttcper/fix-team-project-features-dupe

Author: scttcper

src/sentry/api/urls.py

@@ -563,9 +563,6 @@
 from sentry.seer.supergroups.endpoints.organization_supergroup_details import (
     OrganizationSupergroupDetailsEndpoint,
 )
-from sentry.seer.supergroups.endpoints.organization_supergroups import (
-    OrganizationSupergroupsEndpoint,
-)
 from sentry.seer.supergroups.endpoints.organization_supergroups_by_group import (
     OrganizationSupergroupsByGroupEndpoint,
 )
@@ -2439,11 +2436,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationSeerExplorerUpdateEndpoint.as_view(),
         name="sentry-api-0-organization-seer-explorer-update",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^/]+)/seer/supergroups/$",
-        OrganizationSupergroupsEndpoint.as_view(),
-        name="sentry-api-0-organization-supergroups",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^/]+)/seer/supergroups/by-group/$",
         OrganizationSupergroupsByGroupEndpoint.as_view(),

src/sentry/audit_log/events.py

@@ -399,23 +399,23 @@ def _render_repo_event(action: str, audit_log_entry: AuditLogEntry) -> str:
 
 class RepoAddedAuditLogEvent(AuditLogEvent):
     def __init__(self) -> None:
-        super().__init__(event_id=1161, name="REPO_ADDED", api_name="repo.added")
+        super().__init__(event_id=1170, name="REPO_ADDED", api_name="repo.added")
 
     def render(self, audit_log_entry: AuditLogEntry) -> str:
         return _render_repo_event("added", audit_log_entry)
 
 
 class RepoDisabledAuditLogEvent(AuditLogEvent):
     def __init__(self) -> None:
-        super().__init__(event_id=1162, name="REPO_DISABLED", api_name="repo.disabled")
+        super().__init__(event_id=1171, name="REPO_DISABLED", api_name="repo.disabled")
 
     def render(self, audit_log_entry: AuditLogEntry) -> str:
         return _render_repo_event("disabled", audit_log_entry)
 
 
 class RepoEnabledAuditLogEvent(AuditLogEvent):
     def __init__(self) -> None:
-        super().__init__(event_id=1163, name="REPO_ENABLED", api_name="repo.enabled")
+        super().__init__(event_id=1172, name="REPO_ENABLED", api_name="repo.enabled")
 
     def render(self, audit_log_entry: AuditLogEntry) -> str:
         return _render_repo_event("enabled", audit_log_entry)

src/sentry/features/temporary.py

@@ -481,6 +481,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:tracemetrics-attributes-dropdown-side-panel", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable trace metrics product (known internally as tracemetrics) in UI and backend
     manager.add("organizations:tracemetrics-enabled", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable equations in trace metrics explore
+    manager.add("organizations:tracemetrics-equations-in-explore", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable trace metrics product to be ingested via Relay
     manager.add("organizations:tracemetrics-ingestion", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable trace metrics multi-metric selection in dashboards

src/sentry/incidents/action_handlers.py

@@ -462,22 +462,15 @@ def send_alert(
 
         incident_serialized_response = serialize(incident, serializer=IncidentSerializer())
 
-        success = send_incident_alert_notification(
+        send_incident_alert_notification(
             notification_context=notification_context,
             alert_context=alert_context,
             metric_issue_context=metric_issue_context,
             incident_serialized_response=incident_serialized_response,
             organization=incident.organization,
+            project_id=project.id,
             notification_uuid=notification_uuid,
         )
-        if success:
-            self.record_alert_sent_analytics(
-                organization_id=incident.organization.id,
-                project_id=project.id,
-                alert_id=incident.alert_rule.id,
-                external_id=action.sentry_app_id,
-                notification_uuid=notification_uuid,
-            )
 
 
 def format_duration(minutes):

src/sentry/integrations/github/tasks/sync_repos.py

@@ -188,7 +188,7 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                         event_name="REPO_ADDED",
                         organization_id=organization_id,
                         repo=repo,
-                        source="repository sync",
+                        source="automatic SCM syncing",
                         provider=integration.provider,
                     )
 
@@ -197,7 +197,7 @@ def sync_repos_for_org(organization_integration_id: int) -> None:
                         event_name="REPO_ENABLED",
                         organization_id=organization_id,
                         repo=repo,
-                        source="repository sync",
+                        source="automatic SCM syncing",
                         provider=integration.provider,
                     )
 

src/sentry/integrations/services/integration/impl.py

@@ -45,7 +45,6 @@
     serialize_integration_external_project,
     serialize_organization_integration,
 )
-from sentry.rules.actions.notify_event_service import find_alert_rule_action_ui_component
 from sentry.sentry_apps.api.serializers.app_platform_event import AppPlatformEvent
 from sentry.sentry_apps.metrics import (
     SentryAppEventType,
@@ -54,7 +53,11 @@
 )
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
-from sentry.sentry_apps.utils.webhooks import MetricAlertActionType, SentryAppResourceType
+from sentry.sentry_apps.utils.webhooks import (
+    MetricAlertActionType,
+    SentryAppResourceType,
+    find_alert_rule_action_ui_component,
+)
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.utils import json
 from sentry.utils.sentry_apps import send_and_save_webhook_request

src/sentry/integrations/slack/integration.py

@@ -114,7 +114,12 @@ def send_notification(
         client = self.get_client()
         try:
             client.chat_postMessage(
-                channel=target.resource_id, blocks=payload["blocks"], text=payload["text"]
+                channel=target.resource_id,
+                blocks=payload["blocks"] if len(payload["blocks"]) > 0 else None,
+                text=payload["text"],
+                attachments=payload.get("attachments"),
+                unfurl_links=False,
+                unfurl_media=False,
             )
         except SlackApiError as e:
             translate_slack_api_error(e)
@@ -132,8 +137,11 @@ def send_notification_with_threading(
         )
         kwargs: dict[str, Any] = dict(
             channel=target.resource_id,
-            blocks=payload["blocks"],
+            blocks=payload["blocks"] if len(payload["blocks"]) > 0 else None,
             text=payload["text"],
+            attachments=payload.get("attachments"),
+            unfurl_links=False,
+            unfurl_media=False,
         )
 
         if threading_context.thread_ts is not None:
@@ -159,8 +167,9 @@ def send_threaded_message(
         try:
             client.chat_postMessage(
                 channel=channel_id,
-                blocks=renderable["blocks"],
+                blocks=renderable["blocks"] if len(renderable["blocks"]) > 0 else None,
                 text=renderable["text"],
+                attachments=renderable.get("attachments"),
                 thread_ts=thread_ts,
             )
         except SlackApiError as e:
@@ -178,7 +187,8 @@ def send_threaded_ephemeral_message(
         try:
             client.chat_postEphemeral(
                 channel=channel_id,
-                blocks=renderable["blocks"],
+                blocks=renderable["blocks"] if len(renderable["blocks"]) > 0 else None,
+                attachments=renderable.get("attachments"),
                 text=renderable["text"],
                 thread_ts=thread_ts,
                 user=slack_user_id,
@@ -199,7 +209,10 @@ def update_message(
                 channel=channel_id,
                 ts=message_ts,
                 text=renderable["text"],
-                blocks=renderable["blocks"],
+                blocks=renderable["blocks"] if len(renderable["blocks"]) > 0 else None,
+                attachments=renderable.get("attachments"),
+                unfurl_links=False,
+                unfurl_media=False,
             )
         except SlackApiError as e:
             translate_slack_api_error(e)

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

@@ -54,5 +54,6 @@ def send_alert(
             metric_issue_context=metric_issue_context,
             incident_serialized_response=incident_serialized_response,
             organization=organization,
+            project_id=project.id,
             notification_uuid=notification_uuid,
         )

src/sentry/notifications/platform/api/endpoints/internal_registered_templates.py

@@ -12,7 +12,7 @@
 from sentry.notifications.platform.email.provider import EmailRenderer
 from sentry.notifications.platform.msteams.provider import MSTeamsRenderable, MSTeamsRenderer
 from sentry.notifications.platform.registry import template_registry
-from sentry.notifications.platform.slack.provider import SlackRenderer
+from sentry.notifications.platform.slack.provider import SlackNotificationProvider
 from sentry.notifications.platform.types import (
     NotificationData,
     NotificationProviderKey,
@@ -92,13 +92,14 @@ def serialize_slack_preview[T: NotificationData](
 ) -> dict[str, Any]:
     data = template.example_data
     rendered_template = template.render_example()
-    message = SlackRenderer.render(data=data, rendered_template=rendered_template)
+    renderer = SlackNotificationProvider.get_renderer(data=data, category=template.category)
+    message = renderer.render(data=data, rendered_template=rendered_template)
 
     serialized_blocks = []
     for block in message.get("blocks", []):
         serialized_blocks.append(block.to_dict())
 
-    return {"blocks": serialized_blocks}
+    return {"blocks": serialized_blocks, "attachments": message.get("attachments")}
 
 
 def serialize_discord_preview[T: NotificationData](

src/sentry/notifications/platform/slack/provider.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, NotRequired, TypedDict
+from typing import TYPE_CHECKING, Any, NotRequired, TypedDict
 
 from slack_sdk.models.blocks import (
     ActionsBlock,
@@ -58,8 +58,8 @@ class SlackProviderThreadingContext(ProviderThreadingContext):
 
 class SlackRenderable(TypedDict):
     blocks: list[Block]
+    attachments: NotRequired[list[dict[str, Any]]]
     text: str
-    color: NotRequired[str]
 
 
 class SlackRenderer(NotificationRenderer[SlackRenderable]):