-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(server-utils): Add @opentelemetry/instrumentation-koa orchestrion integration #22146
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
s1gr1d
wants to merge
2
commits into
develop
Choose a base branch
from
sig/rewrite-koa-orchestrion
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
2 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
9 changes: 9 additions & 0 deletions
9
dev-packages/node-integration-tests/suites/tracing/koa/instrument.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import * as Sentry from '@sentry/node'; | ||
| import { loggingTransport } from '@sentry-internal/node-integration-tests'; | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://public@dsn.ingest.sentry.io/1337', | ||
| release: '1.0', | ||
| tracesSampleRate: 1.0, | ||
| transport: loggingTransport, | ||
| }); |
36 changes: 36 additions & 0 deletions
36
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import Router from '@koa/router'; | ||
| import * as Sentry from '@sentry/node'; | ||
| import { sendPortToRunner } from '@sentry-internal/node-integration-tests'; | ||
| import Koa from 'koa'; | ||
|
|
||
| const port = 5698; | ||
|
|
||
| const app = new Koa(); | ||
|
|
||
| // Registered first so it wraps every downstream middleware/route in its try/catch. | ||
| Sentry.setupKoaErrorHandler(app); | ||
|
|
||
| // Plain middleware -> produces a `middleware.koa` span named after the function. | ||
| app.use(async function simpleMiddleware(ctx, next) { | ||
| await next(); | ||
| }); | ||
|
|
||
| const router = new Router(); | ||
|
|
||
| router.get('/', ctx => { | ||
| ctx.body = 'Hello World!'; | ||
| }); | ||
|
|
||
| router.get('/test-param/:id', ctx => { | ||
| ctx.body = { id: ctx.params.id }; | ||
| }); | ||
|
|
||
| router.get('/error', () => { | ||
| throw new Error('Sentry Test Error'); | ||
| }); | ||
|
|
||
| app.use(router.routes()).use(router.allowedMethods()); | ||
|
|
||
| app.listen(port, () => { | ||
| sendPortToRunner(port); | ||
| }); |
103 changes: 103 additions & 0 deletions
103
dev-packages/node-integration-tests/suites/tracing/koa/test.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,103 @@ | ||
| import { afterAll, describe, expect } from 'vitest'; | ||
| import { isOrchestrionEnabled } from '../../../utils'; | ||
| import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; | ||
|
|
||
| describe('koa auto-instrumentation', () => { | ||
| afterAll(async () => { | ||
| cleanupChildProcesses(); | ||
| }); | ||
|
|
||
| // `createEsmAndCjsTests` auto-runs this suite with orchestrion on CI. The | ||
| // orchestrion path keeps span ops/attributes identical to the OTel path; only | ||
| // the origin differs to signal the injection mechanism, so we branch on | ||
| // `isOrchestrionEnabled()`. | ||
| const origin = isOrchestrionEnabled() ? 'auto.http.orchestrion.koa' : 'auto.http.otel.koa'; | ||
|
|
||
| const EXPECTED_ERROR_EVENT = { | ||
| exception: { | ||
| values: [ | ||
| { | ||
| type: 'Error', | ||
| value: 'Sentry Test Error', | ||
| }, | ||
| ], | ||
| }, | ||
| }; | ||
|
|
||
| createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => { | ||
| test('should auto-instrument `koa` router and middleware layers.', async () => { | ||
| const runner = createRunner() | ||
| .expect({ | ||
| transaction: { | ||
| transaction: 'GET /', | ||
| spans: expect.arrayContaining([ | ||
| // Router layer span (from `@koa/router`), carrying the matched route. | ||
| expect.objectContaining({ | ||
| description: '/', | ||
| op: 'router.koa', | ||
| origin, | ||
| data: expect.objectContaining({ | ||
| 'http.route': '/', | ||
| 'koa.type': 'router', | ||
| 'koa.name': '/', | ||
| 'sentry.op': 'router.koa', | ||
| 'sentry.origin': origin, | ||
| }), | ||
| }), | ||
| // Plain middleware span. | ||
| expect.objectContaining({ | ||
| description: 'simpleMiddleware', | ||
| op: 'middleware.koa', | ||
| origin, | ||
| data: expect.objectContaining({ | ||
| 'koa.type': 'middleware', | ||
| 'koa.name': 'simpleMiddleware', | ||
| 'code.function.name': 'simpleMiddleware', | ||
| 'sentry.op': 'middleware.koa', | ||
| 'sentry.origin': origin, | ||
| }), | ||
| }), | ||
| ]), | ||
| }, | ||
| }) | ||
| .start(); | ||
| runner.makeRequest('get', '/'); | ||
| await runner.completed(); | ||
| }); | ||
|
|
||
| test('should assign a parameterized transaction name.', async () => { | ||
| const runner = createRunner() | ||
| .expect({ | ||
| transaction: { | ||
| transaction: 'GET /test-param/:id', | ||
| spans: expect.arrayContaining([ | ||
| expect.objectContaining({ | ||
| description: '/test-param/:id', | ||
| op: 'router.koa', | ||
| origin, | ||
| data: expect.objectContaining({ | ||
| 'http.route': '/test-param/:id', | ||
| 'koa.type': 'router', | ||
| 'koa.name': '/test-param/:id', | ||
| 'sentry.op': 'router.koa', | ||
| 'sentry.origin': origin, | ||
| }), | ||
| }), | ||
| ]), | ||
| }, | ||
| }) | ||
| .start(); | ||
| runner.makeRequest('get', '/test-param/123'); | ||
| await runner.completed(); | ||
| }); | ||
|
|
||
| test('should capture errors thrown in routes via the koa error handler.', async () => { | ||
| const runner = createRunner() | ||
| .expect({ transaction: { transaction: 'GET /error' } }) | ||
| .expect({ event: EXPECTED_ERROR_EVENT }) | ||
| .start(); | ||
| runner.makeRequest('get', '/error', { expectError: true }); | ||
| await runner.completed(); | ||
| }); | ||
| }); | ||
| }); |
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,28 @@ | ||
| import { koaChannelIntegration } from '@sentry/server-utils/orchestrion'; | ||
| import type { Integration, IntegrationFn } from '@sentry/core'; | ||
| import { defineIntegration, extendIntegration } from '@sentry/core'; | ||
| import { setAsyncLocalStorageAsyncContextStrategy } from '../async'; | ||
|
|
||
| const INTEGRATION_NAME = 'DenoKoa' as const; | ||
|
|
||
| /** | ||
| * Create spans for `koa` middleware/router layers under Deno. Requires the | ||
| * `@sentry/deno/import` loader. Delegates to the shared subscriber in | ||
| * `@sentry/server-utils`, adding Deno's `AsyncLocalStorage` context strategy so | ||
| * spans nest under the active HTTP server span. | ||
| */ | ||
| const _denoKoaIntegration = (() => { | ||
| const inner = koaChannelIntegration(); | ||
|
|
||
| return extendIntegration(inner, { | ||
| name: INTEGRATION_NAME, | ||
| setupOnce() { | ||
| setAsyncLocalStorageAsyncContextStrategy(); | ||
| }, | ||
| }); | ||
| }) satisfies IntegrationFn; | ||
|
|
||
| export const denoKoaIntegration = defineIntegration(_denoKoaIntegration) as () => Integration & { | ||
| name: 'DenoKoa'; | ||
| setupOnce: () => void; | ||
| }; | ||
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
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.
m: This loses the
ignoreLayersTypeoption. It should take the options and thread them through, like how we do inpackages/deno/src/integrations/postgres.ts