Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71ac3be
Add `http.response.status_code` to `span.data`
krystofwoldrich Jun 20, 2023
c397a8d
Merge branch 'develop' into kw-add-http-response-status-code
krystofwoldrich Jun 27, 2023
fe7330c
Fix tests failing on unexpected http response status code
krystofwoldrich Jun 27, 2023
0fc01d3
Merge branch 'develop' into kw-add-http-response-status-code
krystofwoldrich Jun 27, 2023
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
1 change: 1 addition & 0 deletions packages/core/src/tracing/span.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
krystofwoldrich marked this conversation as resolved.
Show resolved Hide resolved
const spanStatus = spanStatusfromHttpCode(httpStatus);
if (spanStatus !== 'unknown_error') {
this.setStatus(spanStatus);
Expand Down
9 changes: 9 additions & 0 deletions packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
Expand Down Expand Up @@ -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}`,
Expand Down Expand Up @@ -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}`,
Expand Down
3 changes: 3 additions & 0 deletions packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions packages/nextjs/test/integration/test/server/tracing200.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions packages/nextjs/test/integration/test/server/tracing500.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/test/integration/test/server/tracingHttp.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ describe('Tracing HTTP', () => {
op: 'http.server',
status: 'ok',
tags: { 'http.status_code': '200' },
data: {
'http.response.status_code': 200,
},
},
},
spans: [
Expand All @@ -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',
Expand Down
4 changes: 4 additions & 0 deletions packages/node-integration-tests/suites/express/tracing/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -71,6 +73,7 @@ test.each([['array1'], ['array5']])(
trace: {
data: {
url: `/test/${segment}`,
'http.response.status_code': 200,
},
op: 'http.server',
status: 'ok',
Expand Down Expand Up @@ -107,6 +110,7 @@ test.each([
trace: {
data: {
url: `/test/${segment}`,
'http.response.status_code': 200,
},
op: 'http.server',
status: 'ok',
Expand Down
1 change: 1 addition & 0 deletions packages/node/test/handlers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});
Expand Down
21 changes: 21 additions & 0 deletions packages/remix/test/integration/test/server/action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
},
});
Expand Down Expand Up @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down
9 changes: 9 additions & 0 deletions packages/remix/test/integration/test/server/loader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
},
});
Expand Down Expand Up @@ -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: {
Expand All @@ -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: {
Expand Down
1 change: 1 addition & 0 deletions packages/replay/test/fixtures/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions packages/tracing/test/span.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down