chore(hybridcloud) Expand logging for gitlab webhooks (#68954)

The logs still don't make sense to me based on how many hooks we
receive.

Author: markstory

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

@@ -194,10 +194,15 @@ def get_mailbox_identifier(self, integration: RpcIntegration, data: Mapping[str,
         ratelimit_key = f"webhookpayload:{self.provider}:{integration.id}"
         use_buckets_key = f"{ratelimit_key}:use_buckets"
 
+        is_limited = False
+        ratelimit_val = None
+        reset = None
         use_buckets = cache.get(use_buckets_key)
-        if not use_buckets and ratelimiter.is_limited(
-            key=ratelimit_key, window=60 * 60, limit=3000
-        ):
+        if not use_buckets:
+            is_limited, ratelimit_val, reset = ratelimiter.is_limited_with_value(
+                key=ratelimit_key, window=60 * 60, limit=3000
+            )
+        if not use_buckets and is_limited:
             # Once we have gone over the rate limit in a day, we use smaller
             # buckets for the next day.
             cache.set(use_buckets_key, 1, timeout=ONE_DAY)
@@ -210,7 +215,14 @@ def get_mailbox_identifier(self, integration: RpcIntegration, data: Mapping[str,
         if extra_logging:
             logger.info(
                 "integrations.parser.use_buckets",
-                extra={"provider": self.provider, "result": use_buckets},
+                extra={
+                    "provider": self.provider,
+                    "result": use_buckets or False,
+                    "ratelimit_key": ratelimit_key,
+                    "is_limited": is_limited,
+                    "ratelimit_val": ratelimit_val,
+                    "reset": reset,
+                },
             )
         if not use_buckets:
             return str(integration.id)

tests/sentry/middleware/integrations/parsers/test_gitlab.py

@@ -147,9 +147,9 @@ def test_routing_webhook_with_mailbox_buckets(self):
             HTTP_X_GITLAB_EVENT="Push Hook",
         )
         with mock.patch(
-            "sentry.middleware.integrations.parsers.base.ratelimiter.is_limited"
+            "sentry.middleware.integrations.parsers.base.ratelimiter.is_limited_with_value"
         ) as mock_is_limited:
-            mock_is_limited.return_value = True
+            mock_is_limited.return_value = (True, 3500, 360)
             parser = GitlabRequestParser(request=request, response_handler=self.get_response)
             response = parser.get_response()
 

tests/sentry/middleware/integrations/parsers/test_jira_server.py

@@ -120,11 +120,11 @@ def test_routing_webhook_with_mailbox_buckets_high_volume(self):
         parser = JiraServerRequestParser(request=request, response_handler=self.get_response)
 
         with mock.patch(
-            "sentry.middleware.integrations.parsers.base.ratelimiter.is_limited"
+            "sentry.middleware.integrations.parsers.base.ratelimiter.is_limited_with_value"
         ) as mock_is_limited, mock.patch(
             "sentry.middleware.integrations.parsers.jira_server.get_integration_from_token"
         ) as mock_get_token:
-            mock_is_limited.return_value = True
+            mock_is_limited.return_value = (True, 3500, 360)
             mock_get_token.return_value = self.integration
             response = parser.get_response()
         assert isinstance(response, HttpResponse)