feat(trace): Add query param to trace logs (#92967)

- This is so the endpoint respects the query made as well

Author: wmak

src/sentry/api/endpoints/organization_trace_logs.py

@@ -54,6 +54,7 @@ def query_logs_data(
         snuba_params: SnubaParams,
         trace_ids: list[str],
         orderby: list[str],
+        additional_query: str | None,
         offset: int,
         limit: int,
     ) -> EventsResponse:
@@ -73,11 +74,16 @@ def query_logs_data(
                 raise ParseError(
                     f"{column.lstrip('-')} must be one of {','.join(selected_columns)}"
                 )
+        base_query = (
+            f"trace:{trace_ids[0]}" if len(trace_ids) == 1 else f"trace:[{','.join(trace_ids)}]"
+        )
+        if additional_query is not None:
+            query = f"{base_query} and {additional_query}"
+        else:
+            query = base_query
         results = ourlogs.query(
             selected_columns=selected_columns,
-            query=(
-                f"trace:{trace_ids[0]}" if len(trace_ids) == 1 else f"trace:[{','.join(trace_ids)}]"
-            ),
+            query=query,
             snuba_params=snuba_params,
             orderby=orderby,
             offset=offset,
@@ -101,12 +107,15 @@ def get(self, request: Request, organization: Organization) -> HttpResponse:
             raise ParseError("Need to pass at least one traceId")
 
         orderby = request.GET.getlist("orderby", ["-timestamp"])
+        additional_query = request.GET.get("query")
 
         update_snuba_params_with_timestamp(request, snuba_params)
 
         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.query_logs_data(
+                    snuba_params, trace_ids, orderby, additional_query, offset, limit
+                )
 
         return self.paginate(
             request=request,

tests/snuba/api/endpoints/test_organization_trace_logs.py

@@ -206,3 +206,32 @@ def test_cross_project_query(self):
         assert log_data["project.id"] == project2.id
         assert log_data["trace"] == trace_id_2
         assert log_data["message"] == "bar"
+
+    def test_query_field(self):
+        trace_id_1 = "1" * 32
+        trace_id_2 = "2" * 32
+        self.store_ourlogs(
+            [
+                self.create_ourlog(
+                    {"body": "foo", "trace_id": trace_id_1},
+                    timestamp=self.ten_mins_ago,
+                ),
+                self.create_ourlog(
+                    {"body": "bar", "trace_id": trace_id_2},
+                    timestamp=self.ten_mins_ago,
+                ),
+            ]
+        )
+
+        response = self.client.get(
+            self.url,
+            data={"traceId": [trace_id_1, trace_id_2], "query": "message:foo"},
+            format="json",
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 1
+        log_data = data[0]
+        assert log_data["project.id"] == self.project.id
+        assert log_data["trace"] == trace_id_1
+        assert log_data["message"] == "foo"