Skip to content

Provider Migration: Update elasticsearch for Airflow 3.0 compatibility #52628

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
kaxil merged 1 commit into from
Jul 1, 2025
Merged

Provider Migration: Update elasticsearch for Airflow 3.0 compatibility #52628

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
9 changes: 1 addition & 8 deletions providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
ElasticsearchJSONFormatter,
)
from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit
from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS
from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS, EsLogMsgType
from airflow.utils import timezone
from airflow.utils.log.file_task_handler import FileTaskHandler
from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
Expand All @@ -57,13 +57,6 @@

from airflow.models.taskinstance import TaskInstance, TaskInstanceKey

if AIRFLOW_V_3_0_PLUS:
from airflow.utils.log.file_task_handler import StructuredLogMessage

EsLogMsgType = list[StructuredLogMessage] | str
else:
EsLogMsgType = list[tuple[str, str]] # type: ignore[misc]


LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
# Elasticsearch hosted log type
Expand Down
7 changes: 7 additions & 0 deletions providers/elasticsearch/src/airflow/providers/elasticsearch/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,10 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:


AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)

if AIRFLOW_V_3_0_PLUS:
from airflow.utils.log.file_task_handler import StructuredLogMessage

EsLogMsgType = list[StructuredLogMessage] | str
else:
EsLogMsgType = list[tuple[str, str]] # type: ignore[misc]