diff --git a/app/logging.py b/app/logging.py index 6106137..3a4264f 100644 --- a/app/logging.py +++ b/app/logging.py @@ -1,27 +1,17 @@ import json import logging -from datetime import datetime, timezone -from typing import Any +from urllib.parse import urlsplit, urlunsplit -class JsonFormatter(logging.Formatter): - def format(self, record: logging.LogRecord) -> str: - data: dict[str, Any] = { - "timestamp": datetime.now(timezone.utc).isoformat(), - "level": record.levelname, - "logger": record.name, - "message": record.getMessage(), - } - for key in ("event", "monitor_id", "url", "outcome", "error_code", "latency_ms"): - value = getattr(record, key, None) - if value is not None: - data[key] = value - return json.dumps(data, separators=(",", ":"), default=str) +def redacted_url(url: str) -> str: + parsed = urlsplit(url) + host = parsed.hostname or "" + if ":" in host and not host.startswith("["): + host = f"[{host}]" + if parsed.port: + host = f"{host}:{parsed.port}" + return urlunsplit((parsed.scheme, host, parsed.path, "REDACTED" if parsed.query else "", "")) -def configure_logging(level: str) -> None: - handler = logging.StreamHandler() - handler.setFormatter(JsonFormatter()) - root = logging.getLogger() - root.handlers[:] = [handler] - root.setLevel(level.upper()) +def log_event(logger: logging.Logger, event: str, **fields: object) -> None: + logger.info(json.dumps({"event": event, **fields}, default=str, sort_keys=True))