fix(middleware): Integration Fetching Logic for Gitlab Parser (#70402)

Author: iamrajjoshi

src/sentry/middleware/integrations/parsers/gitlab.py

@@ -7,6 +7,7 @@
 from django.http.response import HttpResponseBase
 from django.urls import resolve
 
+from sentry import options
 from sentry.integrations.gitlab.webhooks import GitlabWebhookEndpoint, GitlabWebhookMixin
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.middleware.integrations.parsers.base import BaseRequestParser
@@ -15,7 +16,7 @@
 from sentry.models.outbox import WebhookProviderIdentifier
 from sentry.services.hybrid_cloud.util import control_silo_function
 from sentry.types.integrations import EXTERNAL_PROVIDERS, ExternalProviders
-from sentry.utils import json
+from sentry.utils import json, metrics
 
 logger = logging.getLogger(__name__)
 
@@ -24,6 +25,7 @@ class GitlabRequestParser(BaseRequestParser, GitlabWebhookMixin):
     provider = EXTERNAL_PROVIDERS[ExternalProviders.GITLAB]
     webhook_identifier = WebhookProviderIdentifier.GITLAB
     _integration: Integration | None = None
+    _METRIC_CONTROL_PATH_FAILURE_KEY = "integrations.gitlab.get_integration_from_request.failure"
 
     def _resolve_external_id(self) -> tuple[str, str] | HttpResponseBase:
         clear_tags_and_context()
@@ -43,14 +45,15 @@ def get_integration_from_request(self) -> Integration | None:
         if not self.is_json_request():
             return None
         try:
-            _view, _args, kwargs = resolve(self.request.path)
-            # Non-webhook endpoints
-            if "integration_id" in kwargs and "organization_slug" in kwargs:
-                self._integration = Integration.objects.filter(
-                    id=kwargs["integration_id"],
-                    organization_slug=kwargs["organization_slug"],
-                ).first()
-                return self._integration
+            if not options.get("api.remove-non-webhook-control-path-gitlab-parser"):
+                _view, _args, kwargs = resolve(self.request.path)
+                # Non-webhook endpoints
+                if "integration_id" in kwargs and "organization_slug" in kwargs:
+                    self._integration = Integration.objects.filter(
+                        id=kwargs["integration_id"],
+                        organization_slug=kwargs["organization_slug"],
+                    ).first()
+                    return self._integration
 
             # Webhook endpoints
             result = self._resolve_external_id()
@@ -60,8 +63,12 @@ def get_integration_from_request(self) -> Integration | None:
                     external_id=external_id, provider=self.provider
                 ).first()
                 return self._integration
-        except Exception:
-            pass
+        except Exception as e:
+            metrics.incr(
+                self._METRIC_CONTROL_PATH_FAILURE_KEY,
+                tags={"integration": self.provider, "error": str(e)},
+            )
+            logger.exception("Failed to get integration from request")
 
         return None
 

src/sentry/options/defaults.py

@@ -320,6 +320,13 @@
     flags=FLAG_ALLOW_EMPTY | FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
 )
 
+register(
+    "api.remove-non-webhook-control-path-gitlab-parser",
+    type=Bool,
+    default=False,
+    flags=FLAG_MODIFIABLE_BOOL | FLAG_AUTOMATOR_MODIFIABLE,
+)
+
 # Controls the rate of using the hashed value of User API tokens for lookups when logging in
 # and also updates tokens which are not hashed
 register(