Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/sentry/middleware/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ def _record_time(request: Request, status_code: int) -> None:
getattr(request, "rate_limit_metadata", None), "rate_limit_type", None
)

# Extract owner from the Endpoint class if available
owner = "unknown"
if request.resolver_match is not None:
view_func = request.resolver_match.func
view_class = getattr(view_func, "cls", None)
if view_class is not None:
owner_enum = getattr(view_class, "owner", None)
if owner_enum is not None:
owner = owner_enum.value

tags = {
"method": request.method,
"status_code": status_code,
Expand All @@ -76,6 +86,7 @@ def _record_time(request: Request, status_code: int) -> None:
getattr(rate_limit_type, "value", None) if rate_limit_type else None
),
"url_name": url_name,
"owner": owner,
}
metrics.incr("view.response", instance=view_path, tags=tags, skip_internal=False)

Expand Down
42 changes: 41 additions & 1 deletion tests/sentry/middleware/test_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from django.urls.base import resolve
from rest_framework.permissions import AllowAny

from sentry.api.api_owners import ApiOwner
from sentry.api.base import Endpoint
from sentry.middleware.ratelimit import RatelimitMiddleware
from sentry.middleware.stats import RequestTimingMiddleware
Expand All @@ -25,6 +26,14 @@ def get(self):
raise NotImplementedError


class OwnedEndpoint(Endpoint):
permission_classes = (AllowAny,)
owner = ApiOwner.ISSUES

def get(self):
raise NotImplementedError


class RequestTimingMiddlewareTest(TestCase):
middleware = cached_property(RequestTimingMiddleware)

Expand All @@ -50,6 +59,7 @@ def test_records_default_api_metrics(self, incr: MagicMock) -> None:
"ui_request": False,
"rate_limit_type": None,
"url_name": "sentry",
"owner": "unknown",
},
skip_internal=False,
)
Expand All @@ -61,7 +71,9 @@ def test_records_default_api_metrics_with_rate_limit_type(self, incr: MagicMock)
test_endpoint = RateLimitedEndpoint.as_view()
request = self.factory.get("/")
request._view_path = "/"
request.resolver_match = resolve("/")
request.resolver_match = Mock()
request.resolver_match.func = test_endpoint
request.resolver_match.url_name = "sentry"
response = Mock(status_code=429)

rate_limit_middleware.process_view(request, test_endpoint, [], {})
Expand All @@ -76,6 +88,7 @@ def test_records_default_api_metrics_with_rate_limit_type(self, incr: MagicMock)
"ui_request": False,
"rate_limit_type": "fixed_window",
"url_name": "sentry",
"owner": "unowned",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Test Fails Due to Undefined Owner Tag

The test_records_default_api_metrics_with_rate_limit_type test asserts the owner tag as "unowned". However, the RateLimitedEndpoint class doesn't define an owner, so the middleware correctly defaults the owner tag to "unknown", causing the test to fail.

Fix in Cursor Fix in Web

},
skip_internal=False,
)
Expand All @@ -101,6 +114,33 @@ def test_records_ui_request(self, incr: MagicMock) -> None:
"ui_request": True,
"rate_limit_type": None,
"url_name": "unreachable-unknown",
"owner": "unknown",
},
skip_internal=False,
)

@patch("sentry.utils.metrics.incr")
def test_records_endpoint_owner(self, incr: MagicMock) -> None:
test_endpoint = OwnedEndpoint.as_view()
request = self.factory.get("/")
request._view_path = "/"
request.resolver_match = Mock()
request.resolver_match.func = test_endpoint
request.resolver_match.url_name = "test-endpoint"
response = Mock(status_code=200)

self.middleware.process_response(request, response)

incr.assert_called_with(
"view.response",
instance=request._view_path,
tags={
"method": "GET",
"status_code": 200,
"ui_request": False,
"rate_limit_type": None,
"url_name": "test-endpoint",
"owner": "issue-workflow",
},
skip_internal=False,
)
Loading