ref(rate limits): Tag DD metric w/ rate limit type (#33621)

* ref(rate limits): Tag DD metric w/ rate limit type

Author: ceorourke

src/sentry/middleware/stats.py

@@ -66,15 +66,21 @@ def _record_time(request: Request, status_code: int) -> None:
         if not view_path:
             return
 
+        rate_limit_type = getattr(
+            getattr(request, "rate_limit_metadata", None), "rate_limit_type", None
+        )
+
         tags = getattr(request, "_metric_tags", {})
         tags.update(
             {
                 "method": request.method,
                 "status_code": status_code,
                 "ui_request": is_frontend_request(request),
+                "rate_limit_type": getattr(rate_limit_type, "value", None)
+                if rate_limit_type
+                else None,
             }
         )
-
         metrics.incr("view.response", instance=view_path, tags=tags, skip_internal=False)
 
         start_time = getattr(request, "_start_time", None)

tests/sentry/middleware/test_stats.py

@@ -2,10 +2,25 @@
 
 from django.test import RequestFactory
 from exam import fixture
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
 
+from sentry.api.base import Endpoint
+from sentry.middleware.ratelimit import RatelimitMiddleware
 from sentry.middleware.stats import RequestTimingMiddleware, add_request_metric_tags
 from sentry.testutils import TestCase
 from sentry.testutils.helpers.faux import Mock
+from sentry.types.ratelimit import RateLimit, RateLimitCategory
+
+
+class RateLimitedEndpoint(Endpoint):
+    permission_classes = (AllowAny,)
+
+    enforce_rate_limit = True
+    rate_limits = {"GET": {RateLimitCategory.IP: RateLimit(0, 10)}}
+
+    def get(self):
+        return Response({"ok": True})
 
 
 class RequestTimingMiddlewareTest(TestCase):
@@ -23,7 +38,35 @@ def test_records_default_api_metrics(self, incr):
         incr.assert_called_with(
             "view.response",
             instance=request._view_path,
-            tags={"method": "GET", "status_code": 200, "ui_request": False},
+            tags={
+                "method": "GET",
+                "status_code": 200,
+                "ui_request": False,
+                "rate_limit_type": None,
+            },
+            skip_internal=False,
+        )
+
+    @patch("sentry.utils.metrics.incr")
+    def test_records_default_api_metrics_with_rate_limit_type(self, incr):
+        rate_limit_middleware = RatelimitMiddleware(None)
+        test_endpoint = RateLimitedEndpoint.as_view()
+        request = self.factory.get("/")
+        request._view_path = "/"
+        response = Mock(status_code=429)
+
+        rate_limit_middleware.process_view(request, test_endpoint, [], {})
+        self.middleware.process_response(request, response)
+
+        incr.assert_called_with(
+            "view.response",
+            instance=request._view_path,
+            tags={
+                "method": "GET",
+                "status_code": 429,
+                "ui_request": False,
+                "rate_limit_type": "fixed_window",
+            },
             skip_internal=False,
         )
 
@@ -39,7 +82,7 @@ def test_records_ui_request(self, incr):
         incr.assert_called_with(
             "view.response",
             instance=request._view_path,
-            tags={"method": "GET", "status_code": 200, "ui_request": True},
+            tags={"method": "GET", "status_code": 200, "ui_request": True, "rate_limit_type": None},
             skip_internal=False,
         )
 
@@ -56,7 +99,13 @@ def test_records_endpoint_specific_metrics(self, incr):
         incr.assert_called_with(
             "view.response",
             instance=request._view_path,
-            tags={"method": "GET", "status_code": 200, "ui_request": False, "a": "b"},
+            tags={
+                "method": "GET",
+                "status_code": 200,
+                "ui_request": False,
+                "a": "b",
+                "rate_limit_type": None,
+            },
             skip_internal=False,
         )
 
@@ -74,6 +123,12 @@ def test_add_request_metric_tags(self, incr):
         incr.assert_called_with(
             "view.response",
             instance=request._view_path,
-            tags={"method": "GET", "status_code": 200, "ui_request": False, "foo": "bar"},
+            tags={
+                "method": "GET",
+                "status_code": 200,
+                "ui_request": False,
+                "foo": "bar",
+                "rate_limit_type": None,
+            },
             skip_internal=False,
         )