Skip to content

[v3-1-test] Add number of queries guard in public event logs list endpoints (#57508) #57558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierrejeambrun merged 1 commit into from
Oct 31, 2025
Merged

[v3-1-test] Add number of queries guard in public event logs list endpoints (#57508) #57558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/api_fastapi/core_api/routes/public/event_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def get_event_logs(
event_pattern: Annotated[_SearchParam, Depends(search_param_factory(Log.event, "event_pattern"))],
) -> EventLogCollectionResponse:
"""Get all Event Logs."""
query = select(Log)
query = select(Log).options(joinedload(Log.task_instance), joinedload(Log.dag_model))
event_logs_select, total_entries = paginated_select(
statement=query,
order_by=order_by,
Expand Down
4 changes: 3 additions & 1 deletion airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_event_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from airflow.models.log import Log
from airflow.utils.session import provide_session

from tests_common.test_utils.asserts import assert_queries_count
from tests_common.test_utils.db import clear_db_logs, clear_db_runs
from tests_common.test_utils.format_datetime import from_datetime_to_zulu, from_datetime_to_zulu_without_ms

Expand Down Expand Up @@ -315,7 +316,8 @@ class TestGetEventLogs(TestEventLogsEndpoint):
def test_get_event_logs(
self, test_client, query_params, expected_status_code, expected_total_entries, expected_events
):
response = test_client.get("/eventLogs", params=query_params)
with assert_queries_count(2):
response = test_client.get("/eventLogs", params=query_params)
assert response.status_code == expected_status_code
if expected_status_code != 200:
return
Expand Down