Skip to content

support grouping of log lines for KubernetesPodOperator #44428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Nov 28, 2024
+13 −2
Merged

support grouping of log lines for KubernetesPodOperator #44428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions providers/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,10 @@ def consume_logs(*, since_time: DateTime | None = None) -> tuple[DateTime | None
line=line, client=self._client, mode=ExecutionMode.SYNC
)
if message_to_log is not None:
self.log.info("[%s] %s", container_name, message_to_log)
if is_log_group_marker(message_to_log):
print(message_to_log)
else:
self.log.info("[%s] %s", container_name, message_to_log)
last_captured_timestamp = message_timestamp
message_to_log = message
message_timestamp = line_timestamp
Expand All @@ -467,7 +470,10 @@ def consume_logs(*, since_time: DateTime | None = None) -> tuple[DateTime | None
line=line, client=self._client, mode=ExecutionMode.SYNC
)
if message_to_log is not None:
self.log.info("[%s] %s", container_name, message_to_log)
if is_log_group_marker(message_to_log):
print(message_to_log)
else:
self.log.info("[%s] %s", container_name, message_to_log)
last_captured_timestamp = message_timestamp
except TimeoutError as e:
# in case of timeout, increment return time by 2 seconds to avoid
Expand Down Expand Up @@ -820,3 +826,8 @@ class OnFinishAction(str, enum.Enum):
KEEP_POD = "keep_pod"
DELETE_POD = "delete_pod"
DELETE_SUCCEEDED_POD = "delete_succeeded_pod"


def is_log_group_marker(line: str) -> bool:
"""Check if the line is a log group marker like `::group::` or `::endgroup::`."""
return line.startswith("::group::") or line.startswith("::endgroup::")