diff --git a/src/sentry/api/endpoints/organization_trace_logs.py b/src/sentry/api/endpoints/organization_trace_logs.py index d785d1b3d7f815..04f268dbc4f601 100644 --- a/src/sentry/api/endpoints/organization_trace_logs.py +++ b/src/sentry/api/endpoints/organization_trace_logs.py @@ -12,7 +12,7 @@ from sentry.models.organization import Organization from sentry.models.project import Project from sentry.organizations.services.organization import RpcOrganization -from sentry.search.events.types import SnubaParams, SnubaRow +from sentry.search.events.types import EventsResponse, SnubaParams from sentry.snuba import ourlogs from sentry.snuba.referrer import Referrer from sentry.utils.validators import INVALID_ID_DETAILS, is_event_id @@ -56,7 +56,7 @@ def query_logs_data( orderby: list[str], offset: int, limit: int, - ) -> list[SnubaRow]: + ) -> EventsResponse: """Queries log data for a given trace""" selected_columns = [ "sentry.item_id", @@ -84,7 +84,7 @@ def query_logs_data( limit=limit, referrer=Referrer.API_TRACE_VIEW_LOGS.value, ) - return results["data"] + return results def get(self, request: Request, organization: Organization) -> HttpResponse: try: @@ -104,11 +104,12 @@ def get(self, request: Request, organization: Organization) -> HttpResponse: update_snuba_params_with_timestamp(request, snuba_params) - def data_fn(offset: int, limit: int) -> list[SnubaRow]: + def data_fn(offset: int, limit: int) -> EventsResponse: with handle_query_errors(): return self.query_logs_data(snuba_params, trace_ids, orderby, offset, limit) return self.paginate( request=request, paginator=GenericOffsetPaginator(data_fn=data_fn), + max_per_page=1000, ) diff --git a/tests/snuba/api/endpoints/test_organization_trace_logs.py b/tests/snuba/api/endpoints/test_organization_trace_logs.py index 1d3e1e05ce8de4..56884d7531e1ad 100644 --- a/tests/snuba/api/endpoints/test_organization_trace_logs.py +++ b/tests/snuba/api/endpoints/test_organization_trace_logs.py @@ -76,7 +76,7 @@ def test_simple(self): format="json", ) assert response.status_code == 200, response.content - data = response.data + data = response.data["data"] assert len(data) == 1 log_data = data[0] assert log_data["project.id"] == self.project.id @@ -105,7 +105,7 @@ def test_multiple_traces(self): format="json", ) assert response.status_code == 200, response.content - data = response.data + data = response.data["data"] assert len(data) == 2 log_data = data[0] assert log_data["project.id"] == self.project.id @@ -138,7 +138,7 @@ def test_orderby(self): format="json", ) assert response.status_code == 200, response.content - data = response.data + data = response.data["data"] assert len(data) == 2 log_data = data[0] assert log_data["project.id"] == self.project.id @@ -196,7 +196,7 @@ def test_cross_project_query(self): format="json", ) assert response.status_code == 200, response.content - data = response.data + data = response.data["data"] assert len(data) == 2 log_data = data[0] assert log_data["project.id"] == self.project.id