Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/worker/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from shared.utils.manifest import prepare_output_dir, sync_manifest
from shared.utils.time import now_iso

from .executors.base_executor import Executor, TaskCancelledError
from .executors.base_executor import ExecutionError, Executor, TaskCancelledError
from .executors.utils.checkpoints import (
get_http_destination,
write_executor_result,
Expand Down Expand Up @@ -561,7 +561,10 @@ def start(self) -> None:
shard_total=shard_total,
)
self.lifecycle.set_failed(task_id, str(e), metadata=metadata)
self.logger.exception("Task %s failed", task_id)
if isinstance(e, ExecutionError):
self.logger.error("Task %s failed: %s", task_id, e)
else:
self.logger.exception("Task %s failed", task_id)
finally:
self._current_task_id = None
with self._active_executor_lock:
Expand Down
9 changes: 9 additions & 0 deletions src/worker/utils/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ def _run(self) -> None:
class TaskLogEmitter(logging.Handler):
"""Per-task log handler that emits Python logging records to the server."""

_traceback_formatter = logging.Formatter()

def __init__(
self,
stub: supervisor_pb2_grpc.SupervisorStub,
Expand Down Expand Up @@ -304,6 +306,13 @@ def emit(self, record: logging.LogRecord) -> None:
message = record.getMessage()
except Exception:
message = str(getattr(record, "msg", ""))
if record.exc_info:
if not record.exc_text:
record.exc_text = self._traceback_formatter.formatException(
record.exc_info
)
if exc_text := record.exc_text:
message = f"{message}\n{exc_text}" if message else exc_text
if not message:
return

Expand Down
73 changes: 73 additions & 0 deletions tests/worker/test_task_log_emitter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"""Tests for TaskLogEmitter payload construction."""

import logging
import sys
from typing import Any, cast
from unittest import mock

from worker.utils.logging import TaskLogEmitter


class _CapturingStream:
def __init__(self) -> None:
self.payloads: list[dict[str, Any]] = []

def send(self, payload: dict[str, Any]) -> None:
self.payloads.append(payload)

def close(self) -> None:
pass


def _make_emitter() -> tuple[TaskLogEmitter, _CapturingStream]:
with mock.patch("worker.utils.logging._GrpcLogStream"):
emitter = TaskLogEmitter(
stub=mock.Mock(),
metadata=(),
struct_from_payload=lambda payload: payload,
logger=logging.getLogger("test_task_log_emitter"),
task_id="tsk-1",
workflow_id="wfl-1",
owner_id="own-1",
worker_id="wrk-1",
)
capture = _CapturingStream()
emitter._stream = cast(Any, capture)
return emitter, capture


def _record(msg: str, args: tuple[Any, ...], exc_info: Any = None) -> logging.LogRecord:
return logging.LogRecord(
name="task",
level=logging.ERROR,
pathname=__file__,
lineno=1,
msg=msg,
args=args,
exc_info=exc_info,
)


def test_emit_includes_traceback_when_exc_info_present() -> None:
emitter, capture = _make_emitter()
try:
raise ValueError("spec.api.url is required")
except ValueError:
record = _record("Task %s failed", ("tsk-1",), exc_info=sys.exc_info())

emitter.emit(record)

assert len(capture.payloads) == 1
message = capture.payloads[0]["message"]
assert "Task tsk-1 failed" in message
assert "Traceback (most recent call last)" in message
assert "ValueError: spec.api.url is required" in message


def test_emit_plain_message_without_exc_info() -> None:
emitter, capture = _make_emitter()

emitter.emit(_record("Task %s failed: %s", ("tsk-1", "bad spec")))

assert len(capture.payloads) == 1
assert capture.payloads[0]["message"] == "Task tsk-1 failed: bad spec"