refactor: convert f-string logging to lazy %-style format (G004)
Sweep all 1676 G004 violations across 112 files, converting
`logger.<level>(f"…{x}…")` to `logger.<level>("…%s…", x)`.
Why: ruff rule G004 was added to pyproject.toml to enforce lazy
%-style logging — defers formatting until the log level is enabled
and lets structured log tooling match the unformatted template.
Conversion preserves rendered output byte-for-byte:
- `{x}` → `%s` + `x`
- `{x!r}` / `{x!s}` / `{x!a}` → `%r` / `%s` / `%a`
- Format specs (`{x:.2f}`, `{x:>10}`) → `%s` + `format(x, 'spec')`
(printf-style specs aren't 1:1 with Python format specs, so we
delegate to `format()` to keep identical output)
- Literal `%` → `%%`
- Concatenated f-strings (`f"a {x} " "b"`) flattened
- Trailing kwargs (`exc_info=True`) preserved
Verified:
- `uv run ruff check --select G004` → 0 violations
- `uv run ty check -- nextcloud_mcp_server` → passes
- `uv run pytest tests/unit/` → 1010 passed
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
a4e6125d28
commit
665cb9b1eb
@@ -177,8 +177,10 @@ def setup_logging(
|
||||
configure_component_loggers(log_level)
|
||||
|
||||
root_logger.info(
|
||||
f"Logging configured: format={log_format}, level={log_level}, "
|
||||
f"trace_context={include_trace_context}"
|
||||
"Logging configured: format=%s, level=%s, trace_context=%s",
|
||||
log_format,
|
||||
log_level,
|
||||
include_trace_context,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -231,14 +231,15 @@ def setup_metrics(port: int = 9090) -> None:
|
||||
"""
|
||||
try:
|
||||
start_http_server(port)
|
||||
logger.info(f"Prometheus metrics server started on port {port}")
|
||||
logger.info("Prometheus metrics server started on port %s", port)
|
||||
except OSError as e:
|
||||
if "Address already in use" in str(e):
|
||||
logger.warning(
|
||||
f"Metrics port {port} already in use (metrics server likely already running)"
|
||||
"Metrics port %s already in use (metrics server likely already running)",
|
||||
port,
|
||||
)
|
||||
else:
|
||||
logger.error(f"Failed to start metrics server on port {port}: {e}")
|
||||
logger.error("Failed to start metrics server on port %s: %s", port, e)
|
||||
raise
|
||||
|
||||
|
||||
|
||||
@@ -127,7 +127,9 @@ class ObservabilityMiddleware(BaseHTTPMiddleware):
|
||||
)
|
||||
|
||||
logger.error(
|
||||
f"Request failed: {method} {path}",
|
||||
"Request failed: %s %s",
|
||||
method,
|
||||
path,
|
||||
exc_info=True,
|
||||
extra={
|
||||
"method": method,
|
||||
@@ -212,7 +214,10 @@ class ObservabilityMiddleware(BaseHTTPMiddleware):
|
||||
# Log slow requests (>1 second)
|
||||
if duration > 1.0:
|
||||
logger.warning(
|
||||
f"Slow request: {method} {endpoint} took {duration:.3f}s",
|
||||
"Slow request: %s %s took %ss",
|
||||
method,
|
||||
endpoint,
|
||||
format(duration, ".3f"),
|
||||
extra={
|
||||
"method": method,
|
||||
"endpoint": endpoint,
|
||||
|
||||
@@ -73,11 +73,12 @@ def setup_tracing(
|
||||
span_processor = BatchSpanProcessor(otlp_exporter)
|
||||
provider.add_span_processor(span_processor)
|
||||
logger.info(
|
||||
f"OpenTelemetry tracing enabled with OTLP endpoint: {otlp_endpoint}"
|
||||
"OpenTelemetry tracing enabled with OTLP endpoint: %s", otlp_endpoint
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
f"Failed to initialize OTLP exporter: {e}. Continuing without trace export."
|
||||
"Failed to initialize OTLP exporter: %s. Continuing without trace export.",
|
||||
e,
|
||||
)
|
||||
else:
|
||||
logger.info(
|
||||
@@ -93,7 +94,7 @@ def setup_tracing(
|
||||
# Get and store tracer
|
||||
_tracer = trace.get_tracer(__name__)
|
||||
|
||||
logger.info(f"OpenTelemetry tracing initialized for service: {service_name}")
|
||||
logger.info("OpenTelemetry tracing initialized for service: %s", service_name)
|
||||
return _tracer
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user