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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ describe('outgoing http spans - strip query', () => {
'http.request.method': 'GET',
'url.query': 'id=1',
'http.response.status_code': 200,
'http.response.body.decoded_size': 0,
'http.response.body.size': 0,
'http.response.status_text': 'OK',
'network.peer.address': '::1',
'server.address': 'localhost',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ describe('httpIntegration', () => {
expect(transaction.contexts?.trace?.data).toEqual({
'http.request.method': 'POST',
'url.query': 'a=1&b=2',
'http.request.body.decoded_size': 9,
'http.request.body.size': 9,
'http.response.status_code': 200,
'http.route': '/test',
'url.scheme': 'http',
Expand Down
2 changes: 2 additions & 0 deletions docs/migration/v11-end-state.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,8 @@ Legacy HTTP span attributes were replaced by their current semantic-convention e

`SanitizedRequestData` — the shape used for `http` breadcrumb data and `http.client` span data — now uses `http.request.method` instead of `http.method` as a key for the request method.

On server-side HTTP spans, the `content-length` header is now always reported as `http.request.body.size`/`http.response.body.size` instead of switching to `http.request_body_size_uncompressed` when the no encoding was present.

#### Network attributes

Network-related span attributes now use the current Sentry semantic conventions, aligned across SDKs. If you query, transform, or alert on the legacy `net.*` fields, update those references:
Expand Down
15 changes: 2 additions & 13 deletions packages/core/src/integrations/http/get-outgoing-span-data.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { Span, SpanAttributes } from '../../types/span';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';
import { filterCollectedUrl } from '../../utils/data-collection/filterCollectedUrl';
import { getContentLengthFromHeaders } from '../../utils/request';
import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';
import type { HttpClientRequest, HttpIncomingMessage } from './types';
import { getRequestUrlFromClientRequest } from './get-request-url';
Expand DownExpand Up@@ -67,7 +68,7 @@ export function setIncomingResponseSpanData(response: HttpIncomingMessage, span:
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: transport,
'http.response.status_text': statusMessage?.toUpperCase(),
...getResponseContentLengthAttributes(response),
[HTTP_RESPONSE_BODY_SIZE]: getContentLengthFromHeaders(response.headers),
...getSocketAttrs(socket),
});
}
Expand All@@ -82,15 +83,3 @@ function getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {
[NETWORK_PEER_PORT]: remotePort,
};
}

function getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {
const { headers } = response;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { [HTTP_RESPONSE_BODY_SIZE]: length }
: { 'http.response.body.decoded_size': length }
: {};
}
22 changes: 7 additions & 15 deletions packages/core/src/integrations/http/server-subscription.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,12 @@ import { DEBUG_BUILD } from '../../debug-build';
import { debug } from '../../utils/debug-logger';
import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from '../../currentScopes';
import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
import { headersToDict, httpHeadersToSpanAttributes, httpRequestToRequestData } from '../../utils/request';
import {
getContentLengthFromHeaders,
headersToDict,
httpHeadersToSpanAttributes,
httpRequestToRequestData,
} from '../../utils/request';
import { patchRequestToCaptureBody } from './patch-request-to-capture-body';
import { getUrlFragment, getUrlQuery, parseStringToURLObject, stripUrlQueryAndFragment } from '../../utils/url';
import { recordRequestSession } from './record-request-session';
Expand All@@ -34,7 +39,6 @@ import { continueTrace, startSpanManual } from '../../tracing/trace';
import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR } from '../../tracing';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
import { safeMathRandom } from '../../utils/randomSafeContext';
import type { SpanAttributes } from '../../types/span';
import type { SpanStatus } from '../../types/spanStatus';
import {
CLIENT_ADDRESS,
Expand DownExpand Up@@ -335,7 +339,7 @@ function buildServerSpanWrap(
[USER_AGENT_ORIGINAL]: userAgent,
[URL_SCHEME]: scheme,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, dataCollectionOptions),
},
},
Expand DownExpand Up@@ -439,15 +443,3 @@ function isKnownPrefetchRequest(req: HttpIncomingMessage): boolean {
// Currently only handles Next.js prefetch requests but may check other frameworks in the future.
return req.headers['next-router-prefetch'] === '1';
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const { headers } = request;
const contentLengthHeader = headers['content-length'];
const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
const encoding = headers['content-encoding'];
return length >= 0
? encoding && encoding !== 'identity'
? { 'http.request.body.size': length }
: { 'http.request.body.decoded_size': length }
: {};
}
1 change: 1 addition & 0 deletions packages/core/src/shared-exports.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -135,6 +135,7 @@ export {
extractQueryParamsFromUrl,
headersToDict,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
getMaxBodyByteLength,
MAX_BODY_BYTE_LENGTH,
} from './utils/request';
Expand Down
19 changes: 19 additions & 0 deletions packages/core/src/utils/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,3 +375,22 @@ export function extractQueryParamsFromUrl(url: string): string | undefined {
return undefined;
}
}

/**
* Read the `content-length` header as a number, if it holds a valid one.
*
* `content-length` is the encoded (on-the-wire) body size whether or not a `content-encoding` is
* applied, so it maps to `http.request.body.size` / `http.response.body.size`. The decoded body size
* cannot be derived from it.
*/
export function getContentLengthFromHeaders(
headers: Record<string, string | string[] | undefined>,
): number | undefined {
const contentLength = headers['content-length'];
if (typeof contentLength !== 'string') {
return undefined;
}

const length = parseInt(contentLength, 10);
return length >= 0 ? length : undefined;
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -159,16 +159,16 @@ describe('setIncomingResponseSpanData', () => {
);
});

it('includes uncompressed content-length when content-encoding is identity', () => {
it('includes content-length as the encoded body size when content-encoding is identity', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '42', 'content-encoding': 'identity' },
});
setIncomingResponseSpanData(response, span);
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.decoded_size': 42 }));
expect(span.setAttributes).toHaveBeenCalledWith(expect.objectContaining({ 'http.response.body.size': 42 }));
});

it('includes compressed content-length when content-encoding is gzip', () => {
it('includes content-length as the encoded body size when content-encoding is gzip', () => {
const span = makeMockSpan();
const response = makeMockResponse({
headers: { 'content-length': '100', 'content-encoding': 'gzip' },
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { errorMonitor } from 'node:events';
import type { IncomingHttpHeaders } from 'node:http';
import {
SENTRY_SEGMENT_NAME_SOURCE,
HTTP_REQUEST_METHOD,
Expand DownExpand Up@@ -39,6 +38,7 @@ import {
debug,
getSpanStatusFromHttpCode,
httpHeadersToSpanAttributes,
getContentLengthFromHeaders,
parseStringToURLObject,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand DownExpand Up@@ -173,7 +173,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
[NETWORK_PROTOCOL_NAME]: 'http',
[NETWORK_PROTOCOL_VERSION]: httpVersion,
[NETWORK_TRANSPORT]: httpVersion?.toUpperCase() === 'QUIC' ? 'udp' : 'tcp',
...getRequestContentLengthAttribute(request),
'http.request.body.size': getContentLengthFromHeaders(request.headers),
...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, client.getDataCollectionOptions()),
},
});
Expand DownExpand Up@@ -338,39 +338,6 @@ function shouldIgnoreSpansForIncomingRequest(
return false;
}

function getRequestContentLengthAttribute(request: HttpIncomingMessage): SpanAttributes {
const length = getContentLength(request.headers);
if (length == null) {
return {};
}

if (isCompressed(request.headers)) {
return {
['http.request.body.size']: length,
};
} else {
return {
['http.request.body.decoded_size']: length,
};
}
}

function getContentLength(headers: IncomingHttpHeaders): number | null {
const contentLengthHeader = headers['content-length'];
if (contentLengthHeader === undefined) return null;

const contentLength = parseInt(contentLengthHeader, 10);
if (isNaN(contentLength)) return null;

return contentLength;
}

function isCompressed(headers: IncomingHttpHeaders): boolean {
const encoding = headers['content-encoding'];

return !!encoding && encoding !== 'identity';
}

/**
* First entry of `X-Forwarded-For`: the client as seen by the outermost proxy.
* https://opentelemetry.io/docs/specs/semconv/registry/attributes/client/#client-address
Expand Down
Loading