diff --git a/app/logging_config.py b/app/logging_config.py index 2c3253c..2216994 100644 --- a/app/logging_config.py +++ b/app/logging_config.py @@ -1,21 +1,8 @@ import json import logging from datetime import datetime, timezone -from urllib.parse import urlsplit, urlunsplit - -SAFE_EXTRA = ("monitor_id", "url", "status", "http_status", "latency_ms", "error") - - -def redact_url(value: str) -> str: - try: - parts = urlsplit(value) - host = parts.hostname or "" - if parts.port: - host = f"{host}:{parts.port}" - return urlunsplit((parts.scheme, host, parts.path, "", "")) - except (TypeError, ValueError): - return "[invalid-url]" +_FIELDS = ("event", "monitor_id", "url", "outcome", "latency_ms", "http_status", "error") class JsonFormatter(logging.Formatter): @@ -24,12 +11,14 @@ class JsonFormatter(logging.Formatter): "timestamp": datetime.now(timezone.utc).isoformat(), "level": record.levelname, "logger": record.name, - "event": record.getMessage(), + "message": record.getMessage(), } - for key in SAFE_EXTRA: - if hasattr(record, key): - value = getattr(record, key) - payload[key] = redact_url(str(value)) if key == "url" else value + for field in _FIELDS: + value = getattr(record, field, None) + if value is not None: + payload[field] = value + if record.exc_info: + payload["exception"] = self.formatException(record.exc_info) return json.dumps(payload, separators=(",", ":"), default=str) @@ -37,5 +26,6 @@ def configure_logging(level: str) -> None: handler = logging.StreamHandler() handler.setFormatter(JsonFormatter()) root = logging.getLogger() - root.handlers = [handler] - root.setLevel(level.upper()) + root.handlers.clear() + root.addHandler(handler) + root.setLevel(level)