Danijel Martinek
f0775d6ecc
Plan 10 documented R44 (capture at originating-throw layer) but only the R43 repo leg was wired. captureException had zero call sites in any controller or use-case body. This commit closes the gap. Mechanism: - Extract __sentryReported flag helpers into core-shared/instrumentation/ reported-flag.ts. SentryLogger switches to importing them; RecordingLogger carries an inlined copy (tooling → core boundary disallows the import). - Add withCapture(logger, tags, fn) higher-order wrapper paralleling withSpan. On throw: capture-with-tags, mark, re-throw. Bail if the flag was already set — covers the bubbled-from-repo case so each error surfaces in the logger exactly once with the inner-most layer's tags. - Apply withSpan(withCapture(factory)) in every feature's bind-production and bind-dev-seed: auth (3 use cases × 3 controllers), blog (3×3), marketing-pages (2×2), navigation (1×1), media (3×3). Span is outermost so the errored span timing reflects the capture-and-rethrow. - RecordingLogger.captureException now also honours the flag — test capture counts stay honest when both repo and outer layer wrap. Tests: - packages/core-shared/src/instrumentation/with-capture.test.ts — 4 cases covering success, capture-on-throw, mark-on-capture, no-double via the flag. - packages/blog/tests/r44-no-double-capture.test.ts — 3 cases: repo throw → 1 capture with repo tags; controller parse fail → 1 capture with controller tags; success → 0 captures. Verification: pnpm test 26/26, pnpm lint 15/15, pnpm typecheck 14/14. Docs: ADR-014 and the refactor log gain a "Post-merge follow-up" section recording the gap, the fix, and the underlying lesson (don't describe intent as shipped state — grep first). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
63 lines
2.2 KiB
TypeScript
63 lines
2.2 KiB
TypeScript
import { describe, it, expect, vi } from "vitest";
|
|
import { withCapture } from "@/instrumentation/with-capture";
|
|
import type { ILogger } from "@/instrumentation/logger.interface";
|
|
import { isReported } from "@/instrumentation/reported-flag";
|
|
|
|
function makeLogger(): ILogger & { captureException: ReturnType<typeof vi.fn> } {
|
|
return {
|
|
captureException: vi.fn(),
|
|
captureMessage: vi.fn(),
|
|
addBreadcrumb: vi.fn(),
|
|
setUser: vi.fn(),
|
|
};
|
|
}
|
|
|
|
describe("withCapture", () => {
|
|
it("does not capture on success", async () => {
|
|
const logger = makeLogger();
|
|
const wrapped = withCapture(logger, { layer: "use-case" }, async (x: number) => x + 1);
|
|
await expect(wrapped(1)).resolves.toBe(2);
|
|
expect(logger.captureException).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("captures with tags and re-throws on failure", async () => {
|
|
const logger = makeLogger();
|
|
const err = new Error("boom");
|
|
const wrapped = withCapture(logger, { layer: "use-case", name: "blog.x" }, async () => {
|
|
throw err;
|
|
});
|
|
await expect(wrapped()).rejects.toBe(err);
|
|
expect(logger.captureException).toHaveBeenCalledTimes(1);
|
|
expect(logger.captureException).toHaveBeenCalledWith(err, {
|
|
tags: { layer: "use-case", name: "blog.x" },
|
|
});
|
|
});
|
|
|
|
it("marks the error as reported after first capture", async () => {
|
|
const logger = makeLogger();
|
|
const err = new Error("boom");
|
|
const wrapped = withCapture(logger, { layer: "use-case" }, async () => {
|
|
throw err;
|
|
});
|
|
await expect(wrapped()).rejects.toBe(err);
|
|
expect(isReported(err)).toBe(true);
|
|
});
|
|
|
|
it("does NOT capture again when the same error already carries the flag", async () => {
|
|
const logger = makeLogger();
|
|
const err = new Error("boom");
|
|
// Simulate an inner layer (repo) having already captured + marked.
|
|
const inner = withCapture(logger, { layer: "repo" }, async () => {
|
|
throw err;
|
|
});
|
|
const outer = withCapture(logger, { layer: "use-case" }, () => inner());
|
|
|
|
await expect(outer()).rejects.toBe(err);
|
|
// Only the inner layer captured it; outer saw the flag and bailed.
|
|
expect(logger.captureException).toHaveBeenCalledTimes(1);
|
|
expect(logger.captureException).toHaveBeenCalledWith(err, {
|
|
tags: { layer: "repo" },
|
|
});
|
|
});
|
|
});
|