-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(node): Auto-register Koa error handler on app start #23463
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mydea
wants to merge
5
commits into
develop
Choose a base branch
from
fn/koa-error-handler
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 2 additions & 3 deletions
5
dev-packages/node-integration-tests/suites/tracing/koa/scenario.mjs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { attachKoaErrorHandler } from '@sentry/server-utils'; | ||
|
|
||
| /** | ||
| * Add a Koa error handler to capture errors to Sentry. | ||
| * | ||
| * @deprecated The error handler is now registered automatically when the Koa app | ||
| * starts (via the orchestrion `koa` instrumentation), so calling this is no | ||
| * longer necessary. It remains a safe, idempotent operation, and is kept for | ||
| * setups where auto-registration is unavailable. This will be removed in a | ||
| * future major version. | ||
| * | ||
| * @param app The Koa app instance | ||
| * | ||
| * @example | ||
| * ```javascript | ||
| * const Sentry = require('@sentry/node'); | ||
| * const Koa = require("koa"); | ||
| * | ||
| * const app = new Koa(); | ||
| * | ||
| * // Add your routes, etc. | ||
| * | ||
| * app.listen(3000); | ||
| * ``` | ||
| */ | ||
|
|
||
| export const setupKoaErrorHandler = (app: { | ||
| // oxlint-disable-next-line no-explicit-any | ||
| on: (event: 'error', listener: (...args: any[]) => void) => unknown; | ||
| }): void => { | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| // oxlint-disable-next-line typescript/no-deprecated -- internal delegation to the shared implementation | ||
| attachKoaErrorHandler(app); | ||
| }; | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
packages/server-utils/src/integrations/koa/koa-error-handler.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import type { Span } from '@sentry/core'; | ||
| import { addNonEnumerableProperty, captureException, withActiveSpan } from '@sentry/core'; | ||
|
|
||
| // Marks a koa app as already carrying the Sentry error listener, so repeat | ||
| // attachments only ever register a single listener — whether reached via the | ||
| // `callback` channel or a lingering manual `setupKoaErrorHandler` call. | ||
| const ERROR_HANDLER_ATTACHED = '__SENTRY_KOA_ERROR_HANDLER_ATTACHED__'; | ||
|
|
||
| /** | ||
| * Key under which the koa instrumentation stashes the request's active span on | ||
| * the koa `ctx`. Koa emits its `error` event from `handleRequest`'s `.catch()`, | ||
| * *after* the middleware chain has unwound and no span is active — so we capture | ||
| * within this stashed span to keep the error linked to the request's trace. | ||
| */ | ||
| export const KOA_CONTEXT_SPAN = '__SENTRY_KOA_SPAN__'; | ||
|
|
||
| /** The subset of a koa `Application` the error handler needs (it extends `EventEmitter`). */ | ||
| export interface KoaApp { | ||
| on(event: 'error', listener: (error: unknown, context?: unknown) => void): unknown; | ||
| [key: string]: unknown; | ||
| } | ||
|
|
||
| type MarkedKoaApp = KoaApp & { [ERROR_HANDLER_ATTACHED]?: boolean }; | ||
|
|
||
| /** | ||
| * Attach a Sentry error listener to a koa app's `error` event. | ||
| * | ||
| * Koa emits `'error'` for every request error that bubbles up unhandled, so a | ||
| * single `app.on('error')` listener captures the same errors a top-level | ||
| * try/catch middleware would — without depending on middleware order. The error | ||
| * is captured within the request's koa span (stashed on the koa `ctx` under | ||
| * {@link KOA_CONTEXT_SPAN}) so it keeps its trace linkage, since koa emits the | ||
| * event after the middleware spans have already ended. | ||
| * | ||
| * Idempotent — the app is marked so auto-registration (via the `callback` | ||
| * channel) and any explicit `setupKoaErrorHandler` call never stack up multiple | ||
| * listeners. | ||
| * | ||
| * @deprecated Internal. The error handler is registered automatically by the koa | ||
| * instrumentation; there is no need to call this directly. It is exported only | ||
| * so the deprecated `setupKoaErrorHandler` can delegate to it, and will be | ||
| * removed in a future major version. | ||
| */ | ||
| export function attachKoaErrorHandler(app: KoaApp): void { | ||
| const markedApp = app as MarkedKoaApp; | ||
| if (!markedApp || typeof markedApp.on !== 'function' || markedApp[ERROR_HANDLER_ATTACHED]) { | ||
| return; | ||
| } | ||
| addNonEnumerableProperty(markedApp, ERROR_HANDLER_ATTACHED, true); | ||
|
|
||
| markedApp.on('error', (error: unknown, context?: unknown) => { | ||
| const span = (context as { [KOA_CONTEXT_SPAN]?: Span } | undefined)?.[KOA_CONTEXT_SPAN]; | ||
| const capture = (): void => { | ||
| captureException(error, { | ||
| mechanism: { | ||
| type: 'auto.middleware.koa', | ||
| handled: false, | ||
| }, | ||
| }); | ||
| }; | ||
|
|
||
| if (span) { | ||
| withActiveSpan(span, capture); | ||
| } else { | ||
| capture(); | ||
| } | ||
| }); | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we do not add a middleware ourselves anymore, so this disappears here.