Add http.response.status_code to span.data (#8366)

getsentry · Jun 28, 2023 · da295ff · da295ff
1 parent b3ee89e
commit da295ff
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 8 deletions.
diff --git a/packages/core/src/tracing/span.ts b/packages/core/src/tracing/span.ts
@@ -227,6 +227,7 @@ export class Span implements SpanInterface {
    */
   public setHttpStatus(httpStatus: number): this {
     this.setTag('http.status_code', String(httpStatus));
+    this.setData('http.response.status_code', httpStatus);
     const spanStatus = spanStatusfromHttpCode(httpStatus);
     if (spanStatus !== 'unknown_error') {
       this.setStatus(spanStatus);

diff --git a/packages/nextjs/test/integration/test/client/tracingFetch.test.ts b/packages/nextjs/test/integration/test/client/tracingFetch.test.ts
@@ -36,6 +36,7 @@ test('should correctly instrument `fetch` for performance tracing', async ({ pag
           url: 'http://example.com',
           type: 'fetch',
           'http.response_content_length': expect.any(Number),
+          'http.response.status_code': 200,
         },
         description: 'GET http://example.com',
         op: 'http.client',

diff --git a/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts b/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts
@@ -18,6 +18,9 @@ describe('CommonJS API Endpoints', () => {
           op: 'http.server',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       },
       transaction: `GET ${unwrappedRoute}`,
@@ -51,6 +54,9 @@ describe('CommonJS API Endpoints', () => {
           op: 'http.server',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       },
       transaction: `GET ${wrappedRoute}`,
@@ -84,6 +90,9 @@ describe('CommonJS API Endpoints', () => {
           op: 'http.server',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       },
       transaction: `GET ${route}`,

diff --git a/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts b/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts
@@ -45,6 +45,9 @@ describe('Error API Endpoints', () => {
           op: 'http.server',
           status: 'internal_error',
           tags: { 'http.status_code': '500' },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       transaction: 'GET /api/error',

diff --git a/packages/nextjs/test/integration/test/server/tracing200.test.ts b/packages/nextjs/test/integration/test/server/tracing200.test.ts
@@ -16,6 +16,9 @@ describe('Tracing 200', () => {
           op: 'http.server',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       },
       transaction: 'GET /api/users',

diff --git a/packages/nextjs/test/integration/test/server/tracing500.test.ts b/packages/nextjs/test/integration/test/server/tracing500.test.ts
@@ -16,6 +16,9 @@ describe('Tracing 500', () => {
           op: 'http.server',
           status: 'internal_error',
           tags: { 'http.status_code': '500' },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       transaction: 'GET /api/broken',

diff --git a/packages/nextjs/test/integration/test/server/tracingHttp.test.ts b/packages/nextjs/test/integration/test/server/tracingHttp.test.ts
@@ -20,6 +20,9 @@ describe('Tracing HTTP', () => {
           op: 'http.server',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       },
       spans: [
@@ -28,6 +31,9 @@ describe('Tracing HTTP', () => {
           op: 'http.client',
           status: 'ok',
           tags: { 'http.status_code': '200' },
+          data: {
+            'http.response.status_code': 200,
+          },
         },
       ],
       transaction: 'GET /api/http',

diff --git a/packages/node-integration-tests/suites/express/tracing/test.ts b/packages/node-integration-tests/suites/express/tracing/test.ts
@@ -11,6 +11,7 @@ test('should create and send transactions for Express routes and spans for middl
       trace: {
         data: {
           url: '/test/express',
+          'http.response.status_code': 200,
         },
         op: 'http.server',
         status: 'ok',
@@ -43,6 +44,7 @@ test('should set a correct transaction name for routes specified in RegEx', asyn
       trace: {
         data: {
           url: '/test/regex',
+          'http.response.status_code': 200,
         },
         op: 'http.server',
         status: 'ok',
@@ -71,6 +73,7 @@ test.each([['array1'], ['array5']])(
         trace: {
           data: {
             url: `/test/${segment}`,
+            'http.response.status_code': 200,
           },
           op: 'http.server',
           status: 'ok',
@@ -107,6 +110,7 @@ test.each([
       trace: {
         data: {
           url: `/test/${segment}`,
+          'http.response.status_code': 200,
         },
         op: 'http.server',
         status: 'ok',

diff --git a/packages/node/test/handlers.test.ts b/packages/node/test/handlers.test.ts
@@ -351,6 +351,7 @@ describe('tracingHandler', () => {
       expect(finishTransaction).toHaveBeenCalled();
       expect(transaction.status).toBe('ok');
       expect(transaction.tags).toEqual(expect.objectContaining({ 'http.status_code': '200' }));
+      expect(transaction.data).toEqual(expect.objectContaining({ 'http.response.status_code': 200 }));
       done();
     });
   });

diff --git a/packages/node/test/integrations/undici.test.ts b/packages/node/test/integrations/undici.test.ts
@@ -56,9 +56,9 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       {
         description: 'GET http://localhost:18099/',
         op: 'http.client',
-        data: {
+        data: expect.objectContaining({
           'http.method': 'GET',
-        },
+        }),
       },
     ],
     [
@@ -68,10 +68,10 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       {
         description: 'GET http://localhost:18099/',
         op: 'http.client',
-        data: {
+        data: expect.objectContaining({
           'http.method': 'GET',
           'http.query': '?foo=bar',
-        },
+        }),
       },
     ],
     [
@@ -80,9 +80,9 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       { method: 'POST' },
       {
         description: 'POST http://localhost:18099/',
-        data: {
+        data: expect.objectContaining({
           'http.method': 'POST',
-        },
+        }),
       },
     ],
     [
@@ -91,9 +91,9 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       { method: 'POST' },
       {
         description: 'POST http://localhost:18099/',
-        data: {
+        data: expect.objectContaining({
           'http.method': 'POST',
-        },
+        }),
       },
     ],
     [

diff --git a/packages/remix/test/integration/test/server/action.test.ts b/packages/remix/test/integration/test/server/action.test.ts
@@ -65,6 +65,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
           tags: {
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
     });
@@ -160,6 +163,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'POST',
             'http.status_code': '302',
           },
+          data: {
+            'http.response.status_code': 302,
+          },
         },
       },
       tags: {
@@ -176,6 +182,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'GET',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {
@@ -226,6 +235,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'POST',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {
@@ -276,6 +288,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'POST',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {
@@ -326,6 +341,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'POST',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {
@@ -376,6 +394,9 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
             method: 'POST',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {

diff --git a/packages/remix/test/integration/test/server/loader.test.ts b/packages/remix/test/integration/test/server/loader.test.ts
@@ -23,6 +23,9 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
           tags: {
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
     });
@@ -97,6 +100,9 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
             method: 'GET',
             'http.status_code': '302',
           },
+          data: {
+            'http.response.status_code': 302,
+          },
         },
       },
       tags: {
@@ -113,6 +119,9 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
             method: 'GET',
             'http.status_code': '500',
           },
+          data: {
+            'http.response.status_code': 500,
+          },
         },
       },
       tags: {

diff --git a/packages/replay/test/fixtures/transaction.ts b/packages/replay/test/fixtures/transaction.ts
@@ -59,6 +59,7 @@ export function Transaction(traceId?: string, obj?: Partial<Event>): any {
           method: 'GET',
           url: '/api/0/projects/sentry-emerging-tech/billy-test/replays/c11bd625b0e14081a0827a22a0a9be4e/',
           type: 'fetch',
+          'http.response.status_code': 200,
         },
         description: 'GET /api/0/projects/sentry-emerging-tech/billy-test/replays/c11bd625b0e14081a0827a22a0a9be4e/',
         op: 'http.client',

diff --git a/packages/tracing/test/span.test.ts b/packages/tracing/test/span.test.ts
@@ -96,6 +96,7 @@ describe('Span', () => {
       span.setHttpStatus(404);
       expect((span.getTraceContext() as any).status).toBe('not_found');
       expect(span.tags['http.status_code']).toBe('404');
+      expect(span.data['http.response.status_code']).toBe(404);
     });
 
     test('isSuccess', () => {