ashb commented on code in PR #63365:
URL: https://github.com/apache/airflow/pull/63365#discussion_r2923787755
##########
shared/logging/src/airflow_shared/logging/structlog.py:
##########
@@ -560,6 +560,79 @@ def is_atty():
logging.config.dictConfig(config)
+ if json_output:
+ _install_excepthook()
+
+ _WarningsInterceptor.register(_showwarning)
+
+
+class _WarningsInterceptor:
+ """Holds a reference to the original ``warnings.showwarning`` so it can be
restored."""
+
+ _original_showwarning: Callable | None = None
+
+ @staticmethod
+ def register(new_callable: Callable) -> None:
+ import warnings
+
+ if _WarningsInterceptor._original_showwarning is None:
+ _WarningsInterceptor._original_showwarning = warnings.showwarning
+ warnings.showwarning = new_callable
+
+ @staticmethod
+ def reset() -> None:
+ import warnings
+
+ if _WarningsInterceptor._original_showwarning is not None:
+ warnings.showwarning = _WarningsInterceptor._original_showwarning
+ _WarningsInterceptor._original_showwarning = None
+
+ @staticmethod
+ def emit_warning(*args: Any) -> None:
+ if _WarningsInterceptor._original_showwarning is not None:
+ _WarningsInterceptor._original_showwarning(*args)
+
+
+def _showwarning(
+ message: Warning | str,
+ category: type[Warning],
+ filename: str,
+ lineno: int,
+ file: Any = None,
+ line: str | None = None,
+) -> None:
+ """
+ Redirect Python warnings to structlog.
+
+ If ``file`` is not None the warning is forwarded to the original handler
+ (e.g. when warnings are written directly to a file handle). Otherwise the
+ warning is emitted as a structured log event on the ``py.warnings`` logger
+ so it flows through the same processor chain as all other log output.
+ """
+ if file is not None:
+ _WarningsInterceptor.emit_warning(message, category, filename, lineno,
file, line)
+ else:
+ warning_log = reconfigure_logger(
+ structlog.get_logger("py.warnings").bind(),
+ structlog.processors.CallsiteParameterAdder,
+ )
+ warning_log.warning(str(message), category=category.__name__,
filename=filename, lineno=lineno)
+
+
+def _install_excepthook() -> None:
Review Comment:
Not a real issue -- yes this might wrap the fn more than once, but this is
only hit for KeyboardInterrupt case, in which there is a few python ops more to
get to the main handler.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
