chore(sentry apps): Ignore RestircedIPAddress error (#95680)

Author: Christinarlong

src/sentry/sentry_apps/metrics.py

@@ -68,6 +68,7 @@ class SentryAppWebhookHaltReason(StrEnum):
     GOT_CLIENT_ERROR = "got_client_error"
     INTEGRATOR_ERROR = "integrator_error"
     MISSING_INSTALLATION = "missing_installation"
+    RESTRICTED_IP = "restricted_ip"
 
 
 class SentryAppExternalRequestFailureReason(StrEnum):

src/sentry/sentry_apps/tasks/sentry_apps.py

@@ -15,6 +15,7 @@
 from sentry.constants import SentryAppInstallationStatus
 from sentry.db.models.base import Model
 from sentry.eventstore.models import BaseEvent, Event, GroupEvent
+from sentry.exceptions import RestrictedIPAddress
 from sentry.hybridcloud.rpc.caching import region_caching_service
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.models.activity import Activity
@@ -48,7 +49,7 @@
 from sentry.taskworker.config import TaskworkerConfig
 from sentry.taskworker.constants import CompressionType
 from sentry.taskworker.namespaces import sentryapp_control_tasks, sentryapp_tasks
-from sentry.taskworker.retry import Retry, retry_task
+from sentry.taskworker.retry import NoRetriesRemainingError, Retry, retry_task
 from sentry.types.rules import RuleFuture
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
@@ -78,7 +79,14 @@
 
 retry_decorator = retry(
     on=(RequestException, ApiHostError, ApiTimeoutError),
-    ignore=(ClientError, SentryAppSentryError, AssertionError, ValueError),
+    ignore=(
+        ClientError,
+        SentryAppSentryError,
+        AssertionError,
+        ValueError,
+        RestrictedIPAddress,
+        NoRetriesRemainingError,
+    ),
     ignore_and_capture=(),
 )
 

src/sentry/utils/sentry_apps/webhooks.py

@@ -9,6 +9,7 @@
 from rest_framework import status
 
 from sentry import options
+from sentry.exceptions import RestrictedIPAddress
 from sentry.http import safe_urlopen
 from sentry.sentry_apps.metrics import (
     SentryAppEventType,
@@ -120,6 +121,11 @@ def send_and_save_webhook_request(
             lifecycle.record_halt(e)
             # Re-raise the exception because some of these tasks might retry on the exception
             raise
+        except RestrictedIPAddress:
+            lifecycle.record_halt(
+                halt_reason=f"send_and_save_webhook_request.{SentryAppWebhookHaltReason.RESTRICTED_IP}"
+            )
+            raise
 
         track_response_code(response.status_code, slug, event)
         buffer.add_request(

tests/sentry/sentry_apps/tasks/test_sentry_apps.py

@@ -10,6 +10,7 @@
 from sentry.constants import SentryAppStatus
 from sentry.eventstore.models import GroupEvent
 from sentry.eventstream.types import EventStreamEventType
+from sentry.exceptions import RestrictedIPAddress
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.issues.ingest import save_issue_occurrence
 from sentry.models.activity import Activity
@@ -568,6 +569,30 @@ def test_group_created_sends_webhook(self, mock_record, safe_urlopen):
             mock_record=mock_record, outcome=EventLifecycleOutcome.SUCCESS, outcome_count=4
         )
 
+    @patch("sentry_sdk.capture_exception")
+    def test_ignores_restricted_ip_error(self, capture_exception, safe_urlopen):
+        safe_urlopen.side_effect = RestrictedIPAddress("12.8391.231")
+
+        event = self.store_event(data={}, project_id=self.project.id)
+        assert event.group is not None
+
+        # The task should complete without retrying when RestrictedIPAddress is raised
+        # because it's in the ignore list of the retry decorator
+        with self.tasks():
+            post_process_group(
+                is_new=True,
+                is_regression=False,
+                is_new_group_environment=False,
+                cache_key=write_event_to_cache(event),
+                group_id=event.group_id,
+                project_id=self.project.id,
+                eventstream_type=EventStreamEventType.Error.value,
+            )
+
+        # Verify that the exception was not captured by Sentry since it's ignored
+        assert len(capture_exception.mock_calls) == 0
+        assert safe_urlopen.called
+
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_does_not_process_no_event(self, mock_record, safe_urlopen):
         process_resource_change_bound(