feat!: Use function span op for terminal request handlers

dev-packages/deno-integration-tests/suites/orchestrion-express/test.ts

@@ -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');

dev-packages/deno-integration-tests/suites/orchestrion-koa/test.ts

@@ -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');
 });

dev-packages/e2e-tests/test-applications/elysia-bun/tests/transactions.test.ts

@@ -132,7 +132,7 @@ test('Creates lifecycle spans for Elysia hooks', async ({ baseURL, request }) =>
   expect(spans).toContainEqual(
     expect.objectContaining({
       description: 'Handle',
-      op: 'request_handler.elysia',
+      op: 'function',
       origin: 'auto.http.elysia',
     }),
   );
@@ -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',
     }),
   );

dev-packages/e2e-tests/test-applications/elysia-node/tests/transactions.test.ts

@@ -132,7 +132,7 @@ test('Creates lifecycle spans for Elysia hooks', async ({ baseURL, request }) =>
   expect(spans).toContainEqual(
     expect.objectContaining({
       description: 'Handle',
-      op: 'request_handler.elysia',
+      op: 'function',
       origin: 'auto.http.elysia',
     }),
   );
@@ -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',
     }),
   );

dev-packages/e2e-tests/test-applications/hono-4/tests/basepath-and-late-routes.test.ts

@@ -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();

dev-packages/e2e-tests/test-applications/hono-4/tests/errors.test.ts

@@ -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');
   });
 
@@ -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');
     }
 

dev-packages/e2e-tests/test-applications/hono-4/tests/middleware.test.ts

@@ -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',
         }),
       );
@@ -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');
@@ -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');
@@ -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();
     });
@@ -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');
       });
@@ -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);
     });
   });
@@ -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');
   });

dev-packages/e2e-tests/test-applications/hono-4/tests/multi-fetch.test.ts

@@ -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',
         }),
       );
@@ -185,7 +185,7 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
   });
 
   test.describe('trace propagation through internal .request() calls', () => {
-    test('single internal fetch produces a hono.request child span', async ({ baseURL }) => {
+    test('single internal fetch produces an internal-request child span', async ({ baseURL }) => {
       const transactionPromise = waitForTransaction(APP_NAME, event => {
         return (
           event.contexts?.trace?.op === 'http.server' && event.transaction === `GET ${STOREFRONT}/product/:productId`
@@ -198,20 +198,22 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       const traceId = transaction.contexts?.trace?.trace_id;
       const spans = transaction.spans || [];
 
-      const internalRequestSpans = spans.filter((s: { op?: string }) => s.op === 'hono.request');
+      const internalRequestSpans = spans.filter(
+        (s: { origin?: string }) => s.origin === 'auto.http.hono.internal_request',
+      );
 
       expect(internalRequestSpans).toHaveLength(1);
       expect(internalRequestSpans[0]).toEqual(
         expect.objectContaining({
-          op: 'hono.request',
+          op: 'http.server',
           origin: 'auto.http.hono.internal_request',
           trace_id: traceId,
         }),
       );
       expect(internalRequestSpans[0]?.description).toContain('GET /item/self-watering-plant');
     });
 
-    test('parallel internal fetches produce two sibling hono.request spans', async ({ baseURL }) => {
+    test('parallel internal fetches produce two sibling internal-request spans', async ({ baseURL }) => {
       const transactionPromise = waitForTransaction(APP_NAME, event => {
         return (
           event.contexts?.trace?.op === 'http.server' &&
@@ -225,7 +227,9 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       const traceId = transaction.contexts?.trace?.trace_id;
       const spans = transaction.spans || [];
 
-      const internalRequestSpans = spans.filter((s: { op?: string }) => s.op === 'hono.request');
+      const internalRequestSpans = spans.filter(
+        (s: { origin?: string }) => s.origin === 'auto.http.hono.internal_request',
+      );
 
       expect(internalRequestSpans).toHaveLength(2);
 
@@ -238,7 +242,7 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       expect(internalRequestSpans[1]?.origin).toBe('auto.http.hono.internal_request');
     });
 
-    test('sequential chained fetches produce two ordered hono.request spans', async ({ baseURL }) => {
+    test('sequential chained fetches produce two ordered internal-request spans', async ({ baseURL }) => {
       const transactionPromise = waitForTransaction(APP_NAME, event => {
         return (
           event.contexts?.trace?.op === 'http.server' &&
@@ -253,7 +257,7 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       const spans = transaction.spans || [];
 
       const internalRequestSpans = spans
-        .filter((s: { op?: string }) => s.op === 'hono.request')
+        .filter((s: { origin?: string }) => s.origin === 'auto.http.hono.internal_request')
         .sort(
           (a: { start_timestamp?: number }, b: { start_timestamp?: number }) =>
             (a.start_timestamp ?? 0) - (b.start_timestamp ?? 0),
@@ -270,7 +274,7 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       expect(internalRequestSpans[1]?.trace_id).toBe(traceId);
     });
 
-    test('hono.request span has no error status for internal 4xx HTTPException', async ({ baseURL }) => {
+    test('internal-request span has no error status for internal 4xx HTTPException', async ({ baseURL }) => {
       const transactionPromise = waitForTransaction(APP_NAME, event => {
         return (
           event.contexts?.trace?.op === 'http.server' &&
@@ -283,7 +287,9 @@ test.describe('multi-fetch: internal .request() calls between sub-apps', () => {
       const transaction = await transactionPromise;
       const spans = transaction.spans || [];
 
-      const internalRequestSpans = spans.filter((s: { op?: string }) => s.op === 'hono.request');
+      const internalRequestSpans = spans.filter(
+        (s: { origin?: string }) => s.origin === 'auto.http.hono.internal_request',
+      );
 
       expect(internalRequestSpans).toHaveLength(1);
       expect(internalRequestSpans[0]?.status).not.toBe('internal_error');

dev-packages/e2e-tests/test-applications/hono-4/tests/route-patterns.test.ts

@@ -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([]);
     });
   });
@@ -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([]);
     });
   });
@@ -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([]);
     });
   });
@@ -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([]);
 });