feat(instrumentation): close R44 gap — throw-site capture for use cases + controllers
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>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import {
|
||||
withSpan,
|
||||
withCapture,
|
||||
INSTRUMENTATION_SYMBOLS,
|
||||
type ITracer,
|
||||
type ILogger,
|
||||
@@ -54,17 +55,29 @@ export async function bindDevSeedMedia(tracer: ITracer, logger: ILogger): Promis
|
||||
const wrappedGetMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.getMedia", op: "use-case" },
|
||||
getMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.getMedia" },
|
||||
getMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
const wrappedListMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.listMedia", op: "use-case" },
|
||||
listMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.listMedia" },
|
||||
listMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
const wrappedDeleteMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.deleteMedia", op: "use-case" },
|
||||
deleteMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.deleteMedia" },
|
||||
deleteMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
|
||||
for (const sym of [
|
||||
@@ -87,7 +100,11 @@ export async function bindDevSeedMedia(tracer: ITracer, logger: ILogger): Promis
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.getMedia", op: "controller" },
|
||||
getMediaController(wrappedGetMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.getMedia" },
|
||||
getMediaController(wrappedGetMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
mediaContainer
|
||||
@@ -96,7 +113,11 @@ export async function bindDevSeedMedia(tracer: ITracer, logger: ILogger): Promis
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.listMedia", op: "controller" },
|
||||
listMediaController(wrappedListMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.listMedia" },
|
||||
listMediaController(wrappedListMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
mediaContainer
|
||||
@@ -105,7 +126,11 @@ export async function bindDevSeedMedia(tracer: ITracer, logger: ILogger): Promis
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.deleteMedia", op: "controller" },
|
||||
deleteMediaController(wrappedDeleteMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.deleteMedia" },
|
||||
deleteMediaController(wrappedDeleteMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { SanitizedConfig } from "payload";
|
||||
import {
|
||||
withSpan,
|
||||
withCapture,
|
||||
INSTRUMENTATION_SYMBOLS,
|
||||
type ITracer,
|
||||
type ILogger,
|
||||
@@ -39,21 +40,33 @@ export function bindProductionMedia(
|
||||
.bind(MEDIA_SYMBOLS.IMediaRepository)
|
||||
.toConstantValue(repo);
|
||||
|
||||
// Use cases — wrapped with span at bind time
|
||||
// Use cases — wrapped with span + capture at bind time
|
||||
const wrappedGetMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.getMedia", op: "use-case" },
|
||||
getMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.getMedia" },
|
||||
getMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
const wrappedListMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.listMedia", op: "use-case" },
|
||||
listMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.listMedia" },
|
||||
listMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
const wrappedDeleteMedia = withSpan(
|
||||
tracer,
|
||||
{ name: "media.deleteMedia", op: "use-case" },
|
||||
deleteMediaUseCase(repo),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "use-case", name: "media.deleteMedia" },
|
||||
deleteMediaUseCase(repo),
|
||||
),
|
||||
);
|
||||
|
||||
for (const sym of [
|
||||
@@ -81,7 +94,11 @@ export function bindProductionMedia(
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.getMedia", op: "controller" },
|
||||
getMediaController(wrappedGetMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.getMedia" },
|
||||
getMediaController(wrappedGetMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
mediaContainer
|
||||
@@ -90,7 +107,11 @@ export function bindProductionMedia(
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.listMedia", op: "controller" },
|
||||
listMediaController(wrappedListMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.listMedia" },
|
||||
listMediaController(wrappedListMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
mediaContainer
|
||||
@@ -99,7 +120,11 @@ export function bindProductionMedia(
|
||||
withSpan(
|
||||
tracer,
|
||||
{ name: "media.deleteMedia", op: "controller" },
|
||||
deleteMediaController(wrappedDeleteMedia),
|
||||
withCapture(
|
||||
logger,
|
||||
{ feature: "media", layer: "controller", name: "media.deleteMedia" },
|
||||
deleteMediaController(wrappedDeleteMedia),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user