Skip to content

Commit 6fd0142

Browse files
authored
Fix elasticsearch provider to use SDK imports for Airflow 3.2+ (#64931)
Update es_task_handler.py to import timezone and import_string from airflow.sdk when running on Airflow 3.2+, with backwards-compatible fallback to airflow.utils for older versions. Keep FileTaskHandler and LoggingMixin imports from airflow.utils.log as they remain there.
1 parent 666879c commit 6fd0142

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@
4646
from airflow.providers.elasticsearch.log.es_json_formatter import ElasticsearchJSONFormatter
4747
from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit, resolve_nested
4848
from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS, AIRFLOW_V_3_2_PLUS
49-
from airflow.utils import timezone
5049
from airflow.utils.log.file_task_handler import FileTaskHandler
5150
from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
5251

5352
if AIRFLOW_V_3_2_PLUS:
5453
from airflow._shared.module_loading import import_string
54+
from airflow.sdk import timezone
5555
else:
56+
from airflow.utils import timezone # type: ignore[attr-defined,no-redef]
5657
from airflow.utils.module_loading import import_string # type: ignore[no-redef]
5758

5859
if TYPE_CHECKING:

0 commit comments

Comments
 (0)