Skip to content

Commit 6358a98

Browse files
committed
Rework StackdriverTaskHandler for the structlog era apache#65191
1 parent 9813bf5 commit 6358a98

3 files changed

Lines changed: 443 additions & 179 deletions

File tree

‎airflow-core/src/airflow/config_templates/airflow_local_settings.py‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,19 +241,25 @@ def _default_conn_name_from(mod_path, hook_name):
241241
)
242242
_handler_kwargs = {}
243243
elif remote_base_log_folder.startswith("stackdriver://"):
244+
from airflow.providers.google.cloud.log.stackdriver_task_handler import StackdriverRemoteLogIO
245+
244246
key_path = conf.get_mandatory_value("logging", "GOOGLE_KEY_PATH", fallback=None)
245247
# stackdriver:///airflow-tasks => airflow-tasks
246248
log_name = urlsplit(remote_base_log_folder).path[1:]
247-
STACKDRIVER_REMOTE_HANDLERS = {
248-
"task": {
249-
"class": "airflow.providers.google.cloud.log.stackdriver_task_handler.StackdriverTaskHandler",
250-
"formatter": "airflow",
251-
"gcp_log_name": log_name,
252-
"gcp_key_path": key_path,
253-
}
254-
}
255249

256-
DEFAULT_LOGGING_CONFIG["handlers"].update(STACKDRIVER_REMOTE_HANDLERS)
250+
REMOTE_TASK_LOG = StackdriverRemoteLogIO(
251+
**cast(
252+
"dict[str, Any]",
253+
{
254+
"base_log_folder": BASE_LOG_FOLDER,
255+
"gcp_log_name": log_name,
256+
"gcp_key_path": key_path,
257+
"delete_local_copy": delete_local_copy,
258+
}
259+
| _handler_kwargs,
260+
)
261+
)
262+
_handler_kwargs = {}
257263
elif remote_base_log_folder.startswith("oss://"):
258264
from airflow.providers.alibaba.cloud.log.oss_task_handler import OSSRemoteLogIO
259265

0 commit comments

Comments
 (0)