Revert "chore(sentry apps): add SLO context manager for send alert event (issue alerts) (#86356)"

This reverts commit 7736c94.

Co-authored-by: Christinarlong <[email protected]>

Author: getsentry-bot

src/sentry/sentry_apps/metrics.py

@@ -49,7 +49,6 @@ class SentryAppWebhookFailureReason(StrEnum):
     INVALID_EVENT = "invalid_event"
     MISSING_SERVICEHOOK = "missing_servicehook"
     EVENT_NOT_IN_SERVCEHOOK = "event_not_in_servicehook"
-    MISSING_ISSUE_OCCURRENCE = "missing_issue_occurrence"
     MISSING_USER = "missing_user"
 
 

src/sentry/sentry_apps/tasks/sentry_apps.py

@@ -119,7 +119,7 @@ def _webhook_event_data(
 @instrumented_task(name="sentry.sentry_apps.tasks.sentry_apps.send_alert_webhook", **TASK_OPTIONS)
 @retry_decorator
 def send_alert_webhook(
-    rule_label: str,
+    rule: str,
     sentry_app_id: int,
     instance_id: str,
     group_id: int,
@@ -128,72 +128,79 @@ def send_alert_webhook(
     additional_payload: Mapping[str, Any] | None = None,
     **kwargs: Any,
 ):
-    with SentryAppInteractionEvent(
-        operation_type=SentryAppInteractionType.PREPARE_WEBHOOK,
-        event_type=SentryAppEventType.EVENT_ALERT_TRIGGERED,
-    ).capture() as lifecycle:
-        group = Group.objects.get_from_cache(id=group_id)
-        assert group, "Group must exist to get related attributes"
-        project = Project.objects.get_from_cache(id=group.project_id)
-        organization = Organization.objects.get_from_cache(id=project.organization_id)
-        extra: dict[str, int | str] = {
-            "sentry_app_id": sentry_app_id,
-            "project_id": project.id,
-            "organization_slug": organization.slug,
-            "rule": rule_label,
-        }
-        lifecycle.add_extras(extra)
-
-        sentry_app = app_service.get_sentry_app_by_id(id=sentry_app_id)
-        if sentry_app is None:
-            raise SentryAppSentryError(message=SentryAppWebhookFailureReason.MISSING_SENTRY_APP)
-
-        installations = app_service.get_many(
-            filter=dict(
-                organization_id=organization.id,
-                app_ids=[sentry_app.id],
-                status=SentryAppInstallationStatus.INSTALLED,
-            )
-        )
-        if not installations:
-            raise SentryAppSentryError(message=SentryAppWebhookFailureReason.MISSING_INSTALLATION)
-        (install,) = installations
+    group = Group.objects.get_from_cache(id=group_id)
+    assert group, "Group must exist to get related attributes"
+    project = Project.objects.get_from_cache(id=group.project_id)
+    organization = Organization.objects.get_from_cache(id=project.organization_id)
+    extra = {
+        "sentry_app_id": sentry_app_id,
+        "project_slug": project.slug,
+        "organization_slug": organization.slug,
+        "rule": rule,
+    }
+
+    sentry_app = app_service.get_sentry_app_by_id(id=sentry_app_id)
+    if sentry_app is None:
+        logger.info("event_alert_webhook.missing_sentry_app", extra=extra)
+        return
 
-        nodedata = nodestore.backend.get(
-            BaseEvent.generate_node_id(project_id=project.id, event_id=instance_id)
+    installations = app_service.get_many(
+        filter=dict(
+            organization_id=organization.id,
+            app_ids=[sentry_app.id],
+            status=SentryAppInstallationStatus.INSTALLED,
         )
+    )
+    if not installations:
+        logger.info("event_alert_webhook.missing_installation", extra=extra)
+        return
+    (install,) = installations
 
-        if not nodedata:
-            raise SentryAppSentryError(message=SentryAppWebhookFailureReason.MISSING_EVENT)
+    nodedata = nodestore.backend.get(
+        BaseEvent.generate_node_id(project_id=project.id, event_id=instance_id)
+    )
 
-        occurrence = None
-        if occurrence_id:
-            occurrence = IssueOccurrence.fetch(occurrence_id, project_id=project.id)
+    if not nodedata:
+        extra = {
+            "event_id": instance_id,
+            "occurrence_id": occurrence_id,
+            "rule": rule,
+            "sentry_app": sentry_app.slug,
+            "group_id": group_id,
+        }
+        logger.info("send_alert_event.missing_event", extra=extra)
+        return
 
-            if not occurrence:
-                raise SentryAppSentryError(
-                    message=SentryAppWebhookFailureReason.MISSING_ISSUE_OCCURRENCE
-                )
+    occurrence = None
+    if occurrence_id:
+        occurrence = IssueOccurrence.fetch(occurrence_id, project_id=project.id)
 
-        group_event = GroupEvent(
-            project_id=project.id,
-            event_id=instance_id,
-            group=group,
-            data=nodedata,
-            occurrence=occurrence,
-        )
+        if not occurrence:
+            logger.info(
+                "send_alert_event.missing_occurrence",
+                extra={"occurrence_id": occurrence_id, "project_id": project.id},
+            )
+            return
+
+    group_event = GroupEvent(
+        project_id=project.id,
+        event_id=instance_id,
+        group=group,
+        data=nodedata,
+        occurrence=occurrence,
+    )
 
-        event_context = _webhook_event_data(group_event, group.id, project.id)
+    event_context = _webhook_event_data(group_event, group.id, project.id)
 
-        data = {"event": event_context, "triggered_rule": rule_label}
+    data = {"event": event_context, "triggered_rule": rule}
 
-        # Attach extra payload to the webhook
-        if additional_payload_key and additional_payload:
-            data[additional_payload_key] = additional_payload
+    # Attach extra payload to the webhook
+    if additional_payload_key and additional_payload:
+        data[additional_payload_key] = additional_payload
 
-        request_data = AppPlatformEvent(
-            resource="event_alert", action="triggered", install=install, data=data
-        )
+    request_data = AppPlatformEvent(
+        resource="event_alert", action="triggered", install=install, data=data
+    )
 
     send_and_save_webhook_request(sentry_app, request_data)
 
@@ -203,7 +210,7 @@ def send_alert_webhook(
             "alert_rule_ui_component_webhook.sent",
             organization_id=organization.id,
             sentry_app_id=sentry_app_id,
-            event=SentryAppEventType.EVENT_ALERT_TRIGGERED,
+            event=f"{request_data.resource}.{request_data.action}",
         )
 
 
@@ -491,10 +498,6 @@ def send_resource_change_webhook(
 def notify_sentry_app(event: GroupEvent, futures: Sequence[RuleFuture]):
     for f in futures:
         if not f.kwargs.get("sentry_app"):
-            logger.error(
-                "notify_sentry_app.future_missing_sentry_app",
-                extra={"event": event.as_dict(), "future": f, "event_id": event.event_id},
-            )
             continue
 
         extra_kwargs: dict[str, Any] = {
@@ -516,7 +519,7 @@ def notify_sentry_app(event: GroupEvent, futures: Sequence[RuleFuture]):
             instance_id=event.event_id,
             group_id=event.group_id,
             occurrence_id=event.occurrence_id if hasattr(event, "occurrence_id") else None,
-            rule_label=f.rule.label,
+            rule=f.rule.label,
             sentry_app_id=f.kwargs["sentry_app"].id,
             **extra_kwargs,
         )