🔧 chore: make retry errors for gitlab record as halt take 2 (#87785)

take 2 of #87578, `base_url` is
on client.

Author: iamrajjoshi

src/sentry/integrations/gitlab/client.py

@@ -369,5 +369,9 @@ def get_blame_for_files(
         return fetch_file_blames(
             self,
             files,
-            extra={**extra, "provider": "gitlab", "org_integration_id": self.org_integration_id},
+            extra={
+                **extra,
+                "provider": "gitlab",
+                "org_integration_id": self.org_integration_id,
+            },
         )

src/sentry/integrations/gitlab/constants.py

@@ -0,0 +1 @@
+GITLAB_CLOUD_BASE_URL = "https://gitlab.com"

src/sentry/integrations/source_code_management/commit_context.py

@@ -12,6 +12,7 @@
 
 from sentry import analytics
 from sentry.auth.exceptions import IdentityNotValid
+from sentry.integrations.gitlab.constants import GITLAB_CLOUD_BASE_URL
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.integrations.source_code_management.metrics import (
     CommitContextHaltReason,
@@ -32,7 +33,11 @@
     PullRequestCommit,
 )
 from sentry.models.repository import Repository
-from sentry.shared_integrations.exceptions import ApiInvalidRequestError, ApiRateLimitedError
+from sentry.shared_integrations.exceptions import (
+    ApiInvalidRequestError,
+    ApiRateLimitedError,
+    ApiRetryError,
+)
 from sentry.users.models.identity import Identity
 from sentry.utils import metrics
 from sentry.utils.cache import cache
@@ -131,6 +136,17 @@ def get_blame_for_files(
                     return []
                 else:
                     raise
+            except ApiRetryError as e:
+                # Ignore retry errors for GitLab
+                # TODO(ecosystem): Remove this once we have a better way to handle this
+                if (
+                    self.integration_name == ExternalProviderEnum.GITLAB.value
+                    and client.base_url != GITLAB_CLOUD_BASE_URL
+                ):
+                    lifecycle.record_halt(e)
+                    return []
+                else:
+                    raise
             return response
 
     def get_commit_context_all_frames(
@@ -377,6 +393,8 @@ def create_or_update_comment(
 
 
 class CommitContextClient(ABC):
+    base_url: str
+
     @abstractmethod
     def get_blame_for_files(
         self, files: Sequence[SourceLineInfo], extra: Mapping[str, Any]

tests/sentry/integrations/source_code_management/test_commit_context_slo.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from sentry.integrations.gitlab.constants import GITLAB_CLOUD_BASE_URL
 from sentry.integrations.source_code_management.commit_context import (
     CommitContextIntegration,
     SourceLineInfo,
@@ -20,6 +21,7 @@ class MockCommitContextIntegration(CommitContextIntegration):
 
     def __init__(self):
         self.client = Mock()
+        self.client.base_url = "https://example.com"
 
     def get_client(self):
         return self.client
@@ -122,6 +124,58 @@ class MockGitlabIntegration(MockCommitContextIntegration):
         assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
         assert_halt_metric(mock_record, ApiInvalidRequestError(text="Invalid request"))
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_retry_error(self, mock_record):
+        """Test retry error for Gitlab Self-hosted records halt"""
+        from sentry.shared_integrations.exceptions import ApiRetryError
+
+        # Because this is Gitlab Self-hosted, this should be halt
+        class MockGitlabIntegration(MockCommitContextIntegration):
+            integration_name = "gitlab"
+            base_url = "https://bufo-bot.gitlab.com"
+
+            def __init__(self):
+                super().__init__()
+                self.client.base_url = self.base_url
+
+        self.integration = MockGitlabIntegration()
+
+        self.integration.client.get_blame_for_files = Mock(
+            side_effect=ApiRetryError(text="Host error")
+        )
+
+        result = self.integration.get_blame_for_files([self.source_line], {})
+
+        assert result == []
+        assert_slo_metric(mock_record, EventLifecycleOutcome.HALTED)
+        assert_halt_metric(mock_record, ApiRetryError(text="Host error"))
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_retry_error_gitlab(self, mock_record):
+        """Test retry error for GitLab saas records failure"""
+        from sentry.shared_integrations.exceptions import ApiRetryError
+
+        # Because this is Gitlab SAAS, this should be failure
+        class MockGitlabIntegration(MockCommitContextIntegration):
+            integration_name = "gitlab"
+            base_url = GITLAB_CLOUD_BASE_URL
+
+            def __init__(self):
+                super().__init__()
+                self.client.base_url = self.base_url
+
+        self.integration = MockGitlabIntegration()
+
+        self.integration.client.get_blame_for_files = Mock(
+            side_effect=ApiRetryError(text="Host error")
+        )
+
+        with pytest.raises(ApiRetryError):
+            self.integration.get_blame_for_files([self.source_line], {})
+
+        assert_slo_metric(mock_record, EventLifecycleOutcome.FAILURE)
+        assert_failure_metric(mock_record, ApiRetryError(text="Host error"))
+
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_get_commit_context_all_frames(self, mock_record):
         """Test get_commit_context_all_frames records correct lifecycle events"""