Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Deno.test('express instrumentation: orchestrion:express:handle channel produces
"'parent' transaction",
);

const expressSpan = parent.spans?.find(s => s.op === 'middleware.express');
assertExists(expressSpan, `expected a middleware.express span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`);
const expressSpan = parent.spans?.find(s => s.op === 'middleware');
assertExists(expressSpan, `expected an express middleware span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`);
assertEquals(expressSpan!.description, 'myMiddleware');
assertEquals(expressSpan!.data?.['express.name'], 'myMiddleware');
assertEquals(expressSpan!.data?.['express.type'], 'middleware');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ Deno.test('koa instrumentation: orchestrion:koa:use channel wraps middleware int
"'parent' transaction",
);

const koaSpan = parent.spans?.find(s => s.op === 'middleware.koa');
assertExists(koaSpan, `expected a middleware.koa child span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`);
const koaSpan = parent.spans?.find(s => s.op === 'middleware');
assertExists(koaSpan, `expected a koa middleware child span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`);
assertEquals(koaSpan!.description, 'myMiddleware');
assertEquals(koaSpan!.data?.['sentry.origin'], 'auto.http.koa');
});
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ test('Creates lifecycle spans for route-specific middleware', async ({ baseURL,
expect(spans).toContainEqual(
expect.objectContaining({
description: 'BeforeHandle',
op: 'middleware.elysia',
op: 'middleware',
origin: 'auto.http.elysia',
}),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ test('Creates lifecycle spans for route-specific middleware', async ({ baseURL,
expect(spans).toContainEqual(
expect.objectContaining({
description: 'BeforeHandle',
op: 'middleware.elysia',
op: 'middleware',
origin: 'auto.http.elysia',
}),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test.skip('.basePath() middleware instrumentation', () => {
const spans = transaction.spans || [];
const middlewareSpan = spans.find(
(span: { description?: string; op?: string }) =>
span.op === 'middleware.hono' && span.description === 'basepathMiddleware',
span.op === 'middleware' && span.description === 'basepathMiddleware',
);

expect(middlewareSpan).toBeDefined();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ test.describe('middleware errors', () => {
expect(errorEvent.transaction).toBe('GET /test-errors/middleware-http-exception');

const transaction = await transactionPromise;
const middlewareSpan = (transaction.spans || []).find(s => s.op === 'middleware.hono');
const middlewareSpan = (transaction.spans || []).find(s => s.op === 'middleware');
expect(middlewareSpan?.status).toBe('internal_error');
});

Expand Down Expand Up @@ -187,7 +187,7 @@ test.describe('middleware errors', () => {
if (RUNTIME === 'cloudflare') {
expect(transaction.transaction).toBe('GET /test-errors/middleware-http-exception-4xx');

const middlewareSpan = (transaction.spans || []).find(s => s.op === 'middleware.hono');
const middlewareSpan = (transaction.spans || []).find(s => s.op === 'middleware');
expect(middlewareSpan?.status).not.toBe('internal_error');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ for (const { name, prefix } of SCENARIOS) {
const spans = transaction.spans || [];

const middlewareSpan = spans.find(
(span: { description?: string; op?: string }) =>
span.op === 'middleware.hono' && span.description === 'middlewareA',
(span: { description?: string; op?: string }) => span.op === 'middleware' && span.description === 'middlewareA',
);

expect(middlewareSpan).toEqual(
expect.objectContaining({
description: 'middlewareA',
op: 'middleware.hono',
op: 'middleware',
origin: 'auto.middleware.hono',
}),
);
Expand All @@ -62,8 +61,7 @@ for (const { name, prefix } of SCENARIOS) {
const spans = transaction.spans || [];

const anonymousSpan = spans.find(
(span: { description?: string; op?: string }) =>
span.op === 'middleware.hono' && span.description === '<anonymous>',
(span: { description?: string; op?: string }) => span.op === 'middleware' && span.description === '<anonymous>',
);
expect(anonymousSpan).toBeDefined();
expect(anonymousSpan?.origin).toBe('auto.middleware.hono');
Expand Down Expand Up @@ -133,9 +131,7 @@ for (const { name, prefix } of SCENARIOS) {

const spans = transaction.spans || [];

const failingSpan = spans.find(
(span: SpanJSON) => span.op === 'middleware.hono' && span.status === 'internal_error',
);
const failingSpan = spans.find((span: SpanJSON) => span.op === 'middleware' && span.status === 'internal_error');

expect(failingSpan).toBeDefined();
expect(failingSpan?.status).toBe('internal_error');
Expand All @@ -154,8 +150,7 @@ for (const { name, prefix } of SCENARIOS) {

const spans = transaction.spans || [];
const middlewareSpan = spans.find(
(span: { description?: string; op?: string }) =>
span.op === 'middleware.hono' && span.description === 'middlewareA',
(span: { description?: string; op?: string }) => span.op === 'middleware' && span.description === 'middlewareA',
);
expect(middlewareSpan).toBeDefined();
});
Expand Down Expand Up @@ -241,7 +236,7 @@ test.describe('inline middleware spans (sub-app)', () => {

const inlineSpan = (transaction.spans || []).find(s => s.description === expectedDescription);
expect(inlineSpan).toBeDefined();
expect(inlineSpan?.op).toBe('middleware.hono');
expect(inlineSpan?.op).toBe('middleware');
expect(inlineSpan?.origin).toBe('auto.middleware.hono');
expect(inlineSpan?.status).not.toBe('internal_error');
});
Expand Down Expand Up @@ -276,11 +271,11 @@ test.describe('inline middleware spans (main app)', () => {
const inlineSpan = spans.find(s => s.description === expectedMiddlewareName);

expect(inlineSpan).toBeDefined();
expect(inlineSpan?.op).toBe('middleware.hono');
expect(inlineSpan?.op).toBe('middleware');
expect(inlineSpan?.origin).toBe('auto.middleware.hono');
expect(inlineSpan?.status).not.toBe('internal_error');

const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');
expect(middlewareSpans).toHaveLength(1);
});
});
Expand All @@ -299,18 +294,18 @@ test.describe('inline middleware spans (main app)', () => {
expect(transaction.transaction).toBe(`GET ${fullPath}`);

const spans = transaction.spans || [];
const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');

expect(middlewareSpans).toHaveLength(2);

const [spanA, spanB] = middlewareSpans.sort((a, b) => (a.description ?? '').localeCompare(b.description ?? ''));
expect(spanA?.description).toBe('combinedInlineMw');
expect(spanA?.op).toBe('middleware.hono');
expect(spanA?.op).toBe('middleware');
expect(spanA?.origin).toBe('auto.middleware.hono');
expect(spanA?.status).not.toBe('internal_error');

expect(spanB?.description).toBe('middlewareA');
expect(spanB?.op).toBe('middleware.hono');
expect(spanB?.op).toBe('middleware');
expect(spanB?.origin).toBe('auto.middleware.hono');
expect(spanB?.status).not.toBe('internal_error');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {

const middlewareSpan = spans.find(
(span: { description?: string; op?: string }) =>
span.op === 'middleware.hono' && span.description === 'storefrontAuth',
span.op === 'middleware' && span.description === 'storefrontAuth',
);

expect(middlewareSpan).toEqual(
expect.objectContaining({
description: 'storefrontAuth',
op: 'middleware.hono',
op: 'middleware',
origin: 'auto.middleware.hono',
}),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.describe('HTTP methods', () => {
expect(transaction.contexts?.trace?.data?.['sentry.source']).toBe('route');

const spans = transaction.spans || [];
const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');
expect(middlewareSpans).toEqual([]);
});
});
Expand All @@ -48,7 +48,7 @@ test.describe('route registration styles', () => {
expect(transaction.contexts?.trace?.data?.['sentry.source']).toBe('route');

const spans = transaction.spans || [];
const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');
expect(middlewareSpans).toEqual([]);
});
});
Expand All @@ -70,7 +70,7 @@ test.describe('route registration styles', () => {
expect(transaction.contexts?.trace?.data?.['sentry.source']).toBe('route');

const spans = transaction.spans || [];
const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');
expect(middlewareSpans).toEqual([]);
});
});
Expand Down Expand Up @@ -142,6 +142,6 @@ test('async handler sends transaction', async ({ baseURL }) => {
expect(transaction.contexts?.trace?.data?.['sentry.source']).toBe('route');

const spans = transaction.spans || [];
const middlewareSpans = spans.filter(s => s.op === 'middleware.hono');
const middlewareSpans = spans.filter(s => s.op === 'middleware');
expect(middlewareSpans).toEqual([]);
});
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ test('API route transaction includes nest middleware span. Spans created in and
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs',
},
description: 'ExampleMiddleware',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs',
},
]),
Expand Down Expand Up @@ -231,15 +231,15 @@ test('API route transaction includes nest guard span and span started in guard i
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.guard',
},
description: 'ExampleGuard',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.guard',
},
]),
Expand Down Expand Up @@ -295,15 +295,15 @@ test('API route transaction includes nest pipe span for valid request', async ({
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.pipe',
},
description: 'ParseIntPipe',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.pipe',
},
]),
Expand Down Expand Up @@ -332,15 +332,15 @@ test('API route transaction includes nest pipe span for invalid request', async
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.pipe',
},
description: 'ParseIntPipe',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'internal_error',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.pipe',
},
]),
Expand Down Expand Up @@ -371,30 +371,30 @@ test('API route transaction includes nest interceptor spans before route executi
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.interceptor',
},
description: 'ExampleInterceptor1',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.interceptor',
},
{
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.interceptor',
},
description: 'ExampleInterceptor2',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.interceptor',
},
]),
Expand Down Expand Up @@ -489,15 +489,15 @@ test('API route transaction includes exactly one nest interceptor span after rou
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.interceptor',
},
description: 'Interceptors - After Route',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.interceptor',
},
]),
Expand Down Expand Up @@ -571,15 +571,15 @@ test('API route transaction includes nest async interceptor spans before route e
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.interceptor',
},
description: 'AsyncInterceptor',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.interceptor',
},
]),
Expand Down Expand Up @@ -656,15 +656,15 @@ test('API route transaction includes exactly one nest async interceptor span aft
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.op': 'middleware.nestjs',
'sentry.op': 'middleware',
'sentry.origin': 'auto.middleware.nestjs.interceptor',
},
description: 'Interceptors - After Route',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
op: 'middleware.nestjs',
op: 'middleware',
origin: 'auto.middleware.nestjs.interceptor',
},
]),
Expand Down
Loading
Loading