Restore function scoped httpx import in file_task_handler for perf (#36753)

vchiapaikeo · web-flow · commit c792b2596995 · 2024-01-12T16:53:55.000+02:00
diff --git a/airflow/utils/log/file_task_handler.py b/airflow/utils/log/file_task_handler.py
@@ -29,7 +29,6 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterable
 from urllib.parse import urljoin
 
-import httpx
 import pendulum
 
 from airflow.configuration import conf
@@ -79,6 +78,9 @@ def _set_task_deferred_context_var():
 
 
 def _fetch_logs_from_service(url, log_relative_path):
+    # Import occurs in function scope for perf. Ref: https://github.com/apache/airflow/pull/21438
+    import httpx
+
     from airflow.utils.jwt_signer import JWTSigner
 
     timeout = conf.getint("webserver", "log_fetch_timeout_sec", fallback=None)
@@ -557,7 +559,9 @@ def _read_from_logs_server(self, ti, worker_log_rel_path) -> tuple[list[str], li
                 messages.append(f"Found logs served from host {url}")
                 logs.append(response.text)
         except Exception as e:
-            if isinstance(e, httpx.UnsupportedProtocol) and ti.task.inherits_from_empty_operator is True:
+            from httpx import UnsupportedProtocol
+
+            if isinstance(e, UnsupportedProtocol) and ti.task.inherits_from_empty_operator is True:
                 messages.append(self.inherits_from_empty_operator_log_message)
             else:
                 messages.append(f"Could not read served logs: {e}")
