This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new c792b25969 Restore function scoped httpx import in file_task_handler
for perf (#36753)
c792b25969 is described below
commit c792b259699550d06054984f1643bb62df5ea37d
Author: Victor Chiapaikeo <[email protected]>
AuthorDate: Fri Jan 12 09:53:55 2024 -0500
Restore function scoped httpx import in file_task_handler for perf (#36753)
---
airflow/utils/log/file_task_handler.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/airflow/utils/log/file_task_handler.py
b/airflow/utils/log/file_task_handler.py
index f86cc77736..6151d0c15f 100644
--- a/airflow/utils/log/file_task_handler.py
+++ b/airflow/utils/log/file_task_handler.py
@@ -29,7 +29,6 @@ from pathlib import Path
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 @@ class FileTaskHandler(logging.Handler):
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}")
