60d71da90e
Cuts CPU on the `engine/v1/worker-actions/*` routes a managed supervisor calls, and adds the benchmark harness the numbers come from. Measured on a local stack: **on-CPU per completed run 9.07ms → 6.59ms (−27%)**, busy fraction 45.6% → 33.8%, with every worker-action p50 down 23–27%. Load was 5,000 runs / 24 virtual supervisors / 90s window / 30,120 requests / 0 errors. Query-count work from the same investigation is deliberately **not** here — it will follow as a separate PR. ## The three changes **1. Split the event-loop monitor in two (~14% of on-CPU, plus ~5pp of GC).** `eventLoopMonitor.server.ts` installs a global `async_hooks` hook: `init` writes a `Map` entry for *every* async resource the process creates, `before` calls `process.hrtime()` and `context.active()` on every one. Enabling any async hook also puts V8 on the slow path for promise instrumentation process-wide. `EVENT_LOOP_MONITOR_ENABLED` defaulted to `"1"`, so this was the shipping configuration. The blocked-loop detector is now opt-in (`EVENT_LOOP_MONITOR_ENABLED`, default `0`). The event-loop *utilization* gauge — a single interval timer with no per-request cost — moves to its own flag (`EVENT_LOOP_UTILIZATION_MONITOR_ENABLED`, default `1`) and stays on, so the useful half survives without the expensive half. A/B under identical load: | | monitor on | monitor off | change | |---|---|---|---| | on-CPU per run | 9.08ms | 7.25ms | −20% | | GC self time | 9.80% | 5.05% | −4.75pp | | dequeue p50 | 76.6ms | 62.8ms | −18% | | attempts/start p50 | 56.3ms | 43.5ms | −23% | **2. Bucket route matching by first static path segment (10.4% → 3.9% of on-CPU).** `patches/@remix-run__router@1.23.3.patch` already memoized flattened branches and compiled path regexes. What remained was the linear scan: `matchRouteBranch` walked the ranked branch list calling `matchPath` per branch across 521 route files, so every worker-action request paid a scan proportional to the whole route table. Branches are now indexed by their lowercased leading segment, with one always-considered list for branches whose leading segment is dynamic, splat or optional (and for root/pathless paths). A request walks only its own bucket merged with that list. Route-matching self time dropped 64% (3.6s → 1.3s over a 90s window). Ordering is preserved exactly: both lists hold indexes into the already rank-sorted branch array and are walked in ascending-index order, so the first match found is the same branch the full scan would have found. Bucketing lowercases on both sides, so case-insensitive matching still resolves and `caseSensitive: true` routes are still rejected by `matchPath` itself. A pathname whose own leading segment can't be bucketed falls back to the full scan. Verified equivalent to the unpatched matcher over 20,050 pathnames (literal, dynamic, splat, optional, case variants, basenames, percent-encoded) with zero mismatches. `apps/webapp/test/routeMatchingPatch.test.ts` pins the matching semantics rather than the optimisation, so it still passes without the patch. **3. Demote per-heartbeat and per-dequeue `info` logs to `debug`.** These are the two highest-rate engine calls and each wrote a synchronous structured log line on every request. Synchronous `console` writes can block the loop when stdout backs up, which costs more than the ~1.3% CPU share suggests. ## The harness Two benchmarks, neither in the default suite (they run for minutes, attach the V8 profiler, and report numbers rather than assert on them). See `apps/webapp/test/bench/README.md`. - `apps/webapp/test/bench/engineHttp.bench.test.ts` — spawns a real webapp against throwaway Postgres/Redis containers, seeds a production environment with a promoted managed deployment, and drives a closed-loop supervisor pool through the full lifecycle. Profiling runs over CDP rather than `--cpu-prof` so it covers only the measured window instead of being swamped by boot, and `performance.eventLoopUtilization()` is sampled *inside* the webapp process. - `internal-packages/run-engine/src/engine/bench/runEngineLifecycle.bench.test.ts` — drives `RunEngine` directly, profiling enqueue and lifecycle separately so engine cost isn't mixed with request-stack overhead. - `apps/webapp/test/bench/analyzeProfile.ts` — dependency-free `.cpuprofile` analyzer that symbolicates through the build's source maps and ranks CPU by package, self time and total time. Percentages are shares of on-CPU time (V8's `(idle)`/`(program)` excluded). `startWebapp` gains `overrideEnv`, applied after the worker-disable defaults, so the HTTP bench can re-enable the run engine worker that drains the master queue into the worker queues a supervisor dequeues from. The local OTel collector gains a traces pipeline. It only defined a metrics pipeline, so pointing `INTERNAL_OTEL_TRACE_EXPORTER_URL` at it locally failed and the webapp silently fell back to the console span logger. ## Configuration For operators upgrading: - `EVENT_LOOP_MONITOR_ENABLED` (now defaults to `0`) — the per-async-resource blocked-loop detector. Set to `1` to restore the previous behaviour and keep emitting `event-loop-blocked` spans. - `EVENT_LOOP_UTILIZATION_MONITOR_ENABLED` (new, defaults to `1`) — the `nodejs.event_loop.utilization` gauge. Unchanged in behaviour; it just has its own flag now so it survives turning the detector off. ## Notes for review - `pnpm-lock.yaml` changes only because the router patch content changed, which changes its patch hash. - One thing the profile ruled out: with a real OTLP collector receiving spans, tracing costs ~1.7% of on-CPU at 100% sampling and ~0.8% at the production rate. Span shipping is not a hidden cost, so nothing here touches it. - Caveats on the numbers: a laptop, not production hardware, so DB and Redis *latency* are unrepresentative (client-side CPU is what's ranked); single webapp process; throughput varies ~5% run to run, which is why the claims rest on on-CPU per run rather than req/s. ## Verification - 20,050-pathname router equivalence check vs the unpatched matcher, zero mismatches - `apps/webapp/test/routeMatchingPatch.test.ts` (12 cases) passes - webapp e2e smoke suite (68 tests) passes through the patched router - run-engine suites covering the snapshot/attempt paths pass - `typecheck`, `format`, `lint`, `knip` clean
160 lines
4.4 KiB
TypeScript
160 lines
4.4 KiB
TypeScript
/**
|
|
* Just enough source-map support to turn a bundled `.cpuprofile` frame back
|
|
* into a repo-relative source path.
|
|
*
|
|
* Deliberately dependency-free: the only thing needed is generated
|
|
* (line, column) to original source path, and adding a resolver package to the
|
|
* webapp for a bench-only tool is not worth the lockfile churn.
|
|
*/
|
|
import { readFileSync } from "node:fs";
|
|
import { dirname, relative, resolve } from "node:path";
|
|
|
|
const BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
|
|
|
const BASE64_INDEX = new Map<string, number>([...BASE64].map((char, index) => [char, index]));
|
|
|
|
const FILE_URL_PREFIX = /^file:[/][/]/;
|
|
|
|
function decodeVlq(segment: string, state: { pos: number }): number {
|
|
let result = 0;
|
|
let shift = 0;
|
|
let continuation = true;
|
|
|
|
while (continuation) {
|
|
const digit = BASE64_INDEX.get(segment[state.pos]!);
|
|
if (digit === undefined) {
|
|
throw new Error(`Invalid VLQ character at ${state.pos} in "${segment}"`);
|
|
}
|
|
state.pos += 1;
|
|
continuation = (digit & 32) !== 0;
|
|
result += (digit & 31) << shift;
|
|
shift += 5;
|
|
}
|
|
|
|
const negative = (result & 1) === 1;
|
|
result >>>= 1;
|
|
return negative ? -result : result;
|
|
}
|
|
|
|
type Mapping = {
|
|
generatedColumn: number;
|
|
sourceIndex: number;
|
|
originalLine: number;
|
|
};
|
|
|
|
type RawSourceMap = {
|
|
sources: (string | null)[];
|
|
sourceRoot?: string;
|
|
mappings: string;
|
|
};
|
|
|
|
type ParsedSourceMap = { sources: string[]; lines: Mapping[][] };
|
|
|
|
export class SourceMapResolver {
|
|
private byGeneratedFile = new Map<string, ParsedSourceMap | null>();
|
|
private repoRoot: string;
|
|
|
|
constructor(repoRoot: string) {
|
|
this.repoRoot = repoRoot;
|
|
}
|
|
|
|
private load(generatedPath: string): ParsedSourceMap | null {
|
|
if (this.byGeneratedFile.has(generatedPath)) {
|
|
return this.byGeneratedFile.get(generatedPath)!;
|
|
}
|
|
|
|
let parsed: ParsedSourceMap | null = null;
|
|
|
|
try {
|
|
const raw = JSON.parse(readFileSync(`${generatedPath}.map`, "utf8")) as RawSourceMap;
|
|
const mapDir = dirname(generatedPath);
|
|
const sourceRoot = raw.sourceRoot ?? "";
|
|
|
|
const sources = raw.sources.map((source) => {
|
|
if (!source) return "(unknown)";
|
|
const absolute = resolve(mapDir, sourceRoot, source.replace(FILE_URL_PREFIX, ""));
|
|
return relative(this.repoRoot, absolute);
|
|
});
|
|
|
|
parsed = { sources, lines: decodeMappings(raw.mappings) };
|
|
} catch {
|
|
parsed = null;
|
|
}
|
|
|
|
this.byGeneratedFile.set(generatedPath, parsed);
|
|
return parsed;
|
|
}
|
|
|
|
/**
|
|
* Returns the repo-relative original source and 1-based line for a generated
|
|
* position, or undefined when there is no map or no mapping at or before
|
|
* that column.
|
|
*/
|
|
resolve(
|
|
generatedPath: string,
|
|
line: number,
|
|
column: number
|
|
): { source: string; line: number } | undefined {
|
|
const map = this.load(generatedPath);
|
|
if (!map) return undefined;
|
|
|
|
const mappings = map.lines[line];
|
|
if (!mappings || mappings.length === 0) return undefined;
|
|
|
|
let low = 0;
|
|
let high = mappings.length - 1;
|
|
let found: Mapping | undefined;
|
|
|
|
while (low <= high) {
|
|
const mid = (low + high) >> 1;
|
|
const candidate = mappings[mid]!;
|
|
if (candidate.generatedColumn <= column) {
|
|
found = candidate;
|
|
low = mid + 1;
|
|
} else {
|
|
high = mid - 1;
|
|
}
|
|
}
|
|
|
|
const mapping = found ?? mappings[0]!;
|
|
const source = map.sources[mapping.sourceIndex];
|
|
if (source === undefined) return undefined;
|
|
return { source, line: mapping.originalLine + 1 };
|
|
}
|
|
}
|
|
|
|
function decodeMappings(mappings: string): Mapping[][] {
|
|
const lines: Mapping[][] = [];
|
|
|
|
let sourceIndex = 0;
|
|
let originalLine = 0;
|
|
|
|
for (const lineSegments of mappings.split(";")) {
|
|
const decoded: Mapping[] = [];
|
|
let generatedColumn = 0;
|
|
|
|
if (lineSegments.length > 0) {
|
|
for (const segment of lineSegments.split(",")) {
|
|
if (segment.length === 0) continue;
|
|
|
|
const state = { pos: 0 };
|
|
generatedColumn += decodeVlq(segment, state);
|
|
|
|
if (state.pos < segment.length) {
|
|
sourceIndex += decodeVlq(segment, state);
|
|
originalLine += decodeVlq(segment, state);
|
|
decodeVlq(segment, state);
|
|
if (state.pos < segment.length) decodeVlq(segment, state);
|
|
|
|
decoded.push({ generatedColumn, sourceIndex, originalLine });
|
|
}
|
|
}
|
|
}
|
|
|
|
decoded.sort((a, b) => a.generatedColumn - b.generatedColumn);
|
|
lines.push(decoded);
|
|
}
|
|
|
|
return lines;
|
|
}
|