trails-cool/trails
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(planner): per-request requestId propagated through logs

Browse source 
Mirrors PR #429 for the planner app. Each HTTP request now gets a
requestId (inbound X-Request-Id honored, otherwise a fresh UUID),
echoed on the response, and propagated to every downstream log call via
AsyncLocalStorage + pino's \`mixin\`.

Tests: planner logger.server.test.ts (2 cases, same shape as the
journal version).

Full repo: pnpm typecheck, pnpm lint, pnpm test all green.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ullrich Schäfer 2026-05-25 22:43:58 +02:00
parent 59687162b8
commit 4ba98fa8f2
No known key found for this signature in database
GPG key ID: A32FF691A0F752D9
3 changed files with 92 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/planner/server.ts
View file

@ -1,6 +1,7 @@
import * as Sentry from "@sentry/node";
import { nodeSentryConfig, drop404s } from "@trails-cool/sentry-config";
import { logger } from "./app/lib/logger.server.ts";
import { logger, requestContext } from "./app/lib/logger.server.ts";
import { randomUUID } from "node:crypto";
import { httpRequestDuration } from "./app/lib/metrics.server.ts";
import { createRequestListener } from "@react-router/node";
import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
@ -92,23 +93,32 @@ const server = createServer((req, res) => {
const url = req.url ?? "/";
const start = Date.now();
// Log and track request on finish (skip static assets and health/metrics)
if (!url.startsWith("/assets/") && url !== "/health" && url !== "/metrics") {
res.on("finish", () => {
const duration = Date.now() - start;
logger.info({ method: req.method, path: url, status: res.statusCode, duration }, "request");
httpRequestDuration.observe(
{ method: req.method ?? "GET", route: url.split("?")[0]!, status: String(res.statusCode) },
duration / 1000,
);
});
}
// Honor an inbound X-Request-Id (e.g. from Caddy or a probe) so the
// request ID propagates across the proxy hop; otherwise mint a fresh
// UUID. Echo on the response so clients can correlate.
const inbound = req.headers["x-request-id"];
const requestId =
(Array.isArray(inbound) ? inbound[0] : inbound) || randomUUID();
res.setHeader("X-Request-Id", requestId);
if (url === "/health") { handleHealth(req, res); return; }
if (url === "/metrics") { handleMetrics(req, res); return; }
if (!serveStatic(req, res)) {
listener(req, res);
}
requestContext.run({ requestId }, () => {
if (!url.startsWith("/assets/") && url !== "/health" && url !== "/metrics") {
res.on("finish", () => {
const duration = Date.now() - start;
logger.info({ method: req.method, path: url, status: res.statusCode, duration }, "request");
httpRequestDuration.observe(
{ method: req.method ?? "GET", route: url.split("?")[0]!, status: String(res.statusCode) },
duration / 1000,
);
});
}
if (url === "/health") { handleHealth(req, res); return; }
if (url === "/metrics") { handleMetrics(req, res); return; }
if (!serveStatic(req, res)) {
listener(req, res);
}
});
});
setupYjsWebSocket(server);