Commit d6d262e

committed

leave otel status mapping as-is, default to internal_error in http status

1 parent 7de6915 commit d6d262eCopy full SHA for d6d262e

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatus {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- return { code: SPAN_STATUS_ERROR, message: 'unknown_error' };`
	`54`	`+ return { code: SPAN_STATUS_ERROR, message: 'internal_error' };`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@ describe('setHttpStatus', () => {`
`27`	`27`	`expect(data).toMatchObject({ 'http.response.status_code': code });`
`28`	`28`	`});`
`29`	`29`
`30`		`- it("doesn't set the status for an unknown http status code", () => {`
	`30`	`+ it('defaults to internal_error', () => {`
`31`	`31`	`const span = new SentrySpan({ name: 'test' });`
`32`	`32`
`33`	`33`	`setHttpStatus(span, 600);`
`34`	`34`
`35`	`35`	`const { status: spanStatus, data } = spanToJSON(span);`
`36`	`36`
`37`		`- expect(spanStatus).toBeUndefined();`
	`37`	`+ expect(spanStatus).toBe('internal_error');`
`38`	`38`	`expect(data).toMatchObject({ 'http.response.status_code': 600 });`
`39`	`39`	`});`
`40`	`40`	`});`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export function mapStatus(span: AbstractSpan): SpanStatus {`
`56`	`56`	`if (status.message && isStatusErrorMessageValid(status.message)) {`
`57`	`57`	`return { code: SPAN_STATUS_ERROR, message: status.message };`
`58`	`58`	`} else {`
`59`		`- return { code: SPAN_STATUS_ERROR, message: 'internal_error' };`
	`59`	`+ return { code: SPAN_STATUS_ERROR, message: 'unknown_error' };`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -72,7 +72,7 @@ export function mapStatus(span: AbstractSpan): SpanStatus {`
`72`	`72`	`if (status?.code === SpanStatusCode.UNSET) {`
`73`	`73`	`return { code: SPAN_STATUS_OK };`
`74`	`74`	`} else {`
`75`		`- return { code: SPAN_STATUS_ERROR, message: 'internal_error' };`
	`75`	`+ return { code: SPAN_STATUS_ERROR, message: 'unknown_error' };`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`@@ -96,7 +96,7 @@ function inferStatusFromAttributes(attributes: SpanAttributes): SpanStatus \| und`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (typeof grpcCodeAttribute === 'string') {`
`99`		`- return { code: SPAN_STATUS_ERROR, message: canonicalGrpcErrorCodesMap[grpcCodeAttribute] \|\| 'internal_error' };`
	`99`	`+ return { code: SPAN_STATUS_ERROR, message: canonicalGrpcErrorCodesMap[grpcCodeAttribute] \|\| 'unknown_error' };`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`return undefined;`

Comments

(0)