fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lforst merged 6 commits into from
Aug 28, 2024
Merged

fix(node): Suppress tracing for transport request execution rather than transport creation #13491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
462df8f
fix(node): Suppress tracing for transport request execution rather th…
Aug 28, 2024
43a2cf1
Remove logic to not create span for sentry requests (replaced with pr…
Aug 28, 2024
9bf399c
Wrap all transport implementations in `suppressTracing`
Aug 28, 2024
c29c190
format & lint
Aug 28, 2024
5aedd74
Don't suppress for browser SDK
Aug 28, 2024
691b527
fix
Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/browser/src/transports/fetch.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
}

try {
// TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
return nativeFetch(options.url, requestOptions).then(response => {
pendingBodySize -= requestSize;
pendingCount--;
Expand Down
20 changes: 11 additions & 9 deletions packages/cloudflare/src/transport.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
...options.fetchOptions,
};

return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
return suppressTracing(() => {
return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
});
});
}

Expand Down
20 changes: 11 additions & 9 deletions packages/deno/src/transports/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
};

try {
return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
return suppressTracing(() => {
return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
});
});
} catch (e) {
return rejectedSyncPromise(e);
Expand Down
5 changes: 0 additions & 5 deletions packages/node/src/integrations/http.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
getCapturedScopesOnSpan,
getCurrentScope,
getIsolationScope,
isSentryRequestUrl,
setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
return false;
}

if (isSentryRequestUrl(url, getClient())) {
return true;
}

const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
return true;
Expand Down
108 changes: 55 additions & 53 deletions packages/node/src/transports/http.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
? (new HttpsProxyAgent(proxy) as http.Agent)
: new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

// This ensures we do not generate any spans in OpenTelemetry for the transport
return suppressTracing(() => {
const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
return createTransport(options, requestExecutor);
});
const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
const { hostname, pathname, port, protocol, search } = new URL(options.url);
return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
return new Promise((resolve, reject) => {
let body = streamFromBody(request.body);

const headers: Record<string, string> = { ...options.headers };

if (request.body.length > GZIP_THRESHOLD) {
headers['content-encoding'] = 'gzip';
body = body.pipe(createGzip());
}

const req = httpModule.request(
{
method: 'POST',
agent,
headers,
hostname,
path: `${pathname}${search}`,
port,
protocol,
ca: options.caCerts,
},
res => {
res.on('data', () => {
// Drain socket
});

res.on('end', () => {
// Drain socket
});

res.setEncoding('utf8');

// "Key-value pairs of header names and values. Header names are lower-cased."
// https://nodejs.org/api/http.html#http_message_headers
const retryAfterHeader = res.headers['retry-after'] ?? null;
const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

resolve({
statusCode: res.statusCode,
headers: {
'retry-after': retryAfterHeader,
'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
},
});
},
);

req.on('error', reject);
body.pipe(req);
// This ensures we do not generate any spans in OpenTelemetry for the transport
suppressTracing(() => {
let body = streamFromBody(request.body);

const headers: Record<string, string> = { ...options.headers };

if (request.body.length > GZIP_THRESHOLD) {
headers['content-encoding'] = 'gzip';
body = body.pipe(createGzip());
}

const req = httpModule.request(
{
method: 'POST',
agent,
headers,
hostname,
path: `${pathname}${search}`,
port,
protocol,
ca: options.caCerts,
},
res => {
res.on('data', () => {
// Drain socket
});

res.on('end', () => {
// Drain socket
});

res.setEncoding('utf8');

// "Key-value pairs of header names and values. Header names are lower-cased."
// https://nodejs.org/api/http.html#http_message_headers
const retryAfterHeader = res.headers['retry-after'] ?? null;
const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

resolve({
statusCode: res.statusCode,
headers: {
'retry-after': retryAfterHeader,
'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
? rateLimitsHeader[0] || null
: rateLimitsHeader,
},
});
},
);

req.on('error', reject);
body.pipe(req);
});
});
};
}
20 changes: 11 additions & 9 deletions packages/vercel-edge/src/transports/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
...options.fetchOptions,
};

return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
return suppressTracing(() => {
return fetch(options.url, requestOptions).then(response => {
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
});
});
}

Expand Down
, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

, '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
fix(node): Suppress tracing for transport request execution rather than transport creation#13491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 6 commits into

from

Aug 28, 2024
 Merged


fix(node): Suppress tracing for transport request execution rather than transport creation
#13491
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
462df8f

fix(node): Suppress tracing for transport request execution rather th…

Aug 28, 2024
43a2cf1

Remove logic to not create span for sentry requests (replaced with pr…

Aug 28, 2024
9bf399c

Wrap all transport implementations in `suppressTracing`

Aug 28, 2024
c29c190

format & lint

Aug 28, 2024
5aedd74

Don't suppress for browser SDK

Aug 28, 2024
691b527

fix

Aug 28, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/browser/src/transports/fetch.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function makeFetchTransport(
 }

 try {
 // TODO: This may need a `suppresTracing` call in the future when we switch the browser SDK to OTEL
 return nativeFetch(options.url, requestOptions).then(response => {
 pendingBodySize -= requestSize;
 pendingCount--;
Expand Down

20 changes: 11 additions & 9 deletions
packages/cloudflare/src/transport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down

20 changes: 11 additions & 9 deletions
packages/deno/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/utils';

Expand DownExpand Up@@ -37,14 +37,16 @@ export function makeFetchTransport(options: DenoTransportOptions): Transport {
 };

 try {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 } catch (e) {
 return rejectedSyncPromise(e);
Expand Down

5 changes: 0 additions & 5 deletions
packages/node/src/integrations/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
 getCapturedScopesOnSpan,
 getCurrentScope,
 getIsolationScope,
 isSentryRequestUrl,
 setCapturedScopesOnSpan,
} from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
Expand DownExpand Up@@ -102,10 +101,6 @@ export const instrumentHttp = Object.assign(
 return false;
 }

 if (isSentryRequestUrl(url, getClient())) {
 return true;
 }

 const _ignoreOutgoingRequests = _httpOptions.ignoreOutgoingRequests;
 if (_ignoreOutgoingRequests && _ignoreOutgoingRequests(url, request)) {
 return true;
Expand Down

108 changes: 55 additions & 53 deletions
packages/node/src/transports/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,8 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
 ? (new HttpsProxyAgent(proxy) as http.Agent)
 : new nativeHttpModule.Agent({ keepAlive, maxSockets: 30, timeout: 2000 });

 // This ensures we do not generate any spans in OpenTelemetry for the transport
 return suppressTracing(() => {
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
 });
 const requestExecutor = createRequestExecutor(options, options.httpModule ?? nativeHttpModule, agent);
 return createTransport(options, requestExecutor);
}

/**
Expand DownExpand Up@@ -122,54 +119,59 @@ function createRequestExecutor(
 const { hostname, pathname, port, protocol, search } = new URL(options.url);
 return function makeRequest(request: TransportRequest): Promise<TransportMakeRequestResponse> {
 return new Promise((resolve, reject) => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader) ? rateLimitsHeader[0] || null : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 // This ensures we do not generate any spans in OpenTelemetry for the transport
 suppressTracing(() => {
 let body = streamFromBody(request.body);

 const headers: Record<string, string> = { ...options.headers };

 if (request.body.length > GZIP_THRESHOLD) {
 headers['content-encoding'] = 'gzip';
 body = body.pipe(createGzip());
 }

 const req = httpModule.request(
 {
 method: 'POST',
 agent,
 headers,
 hostname,
 path: `${pathname}${search}`,
 port,
 protocol,
 ca: options.caCerts,
 },
 res => {
 res.on('data', () => {
 // Drain socket
 });

 res.on('end', () => {
 // Drain socket
 });

 res.setEncoding('utf8');

 // "Key-value pairs of header names and values. Header names are lower-cased."
 // https://nodejs.org/api/http.html#http_message_headers
 const retryAfterHeader = res.headers['retry-after'] ?? null;
 const rateLimitsHeader = res.headers['x-sentry-rate-limits'] ?? null;

 resolve({
 statusCode: res.statusCode,
 headers: {
 'retry-after': retryAfterHeader,
 'x-sentry-rate-limits': Array.isArray(rateLimitsHeader)
 ? rateLimitsHeader[0] || null
 : rateLimitsHeader,
 },
 });
 },
 );

 req.on('error', reject);
 body.pipe(req);
 });
 });
 };
}

20 changes: 11 additions & 9 deletions
packages/vercel-edge/src/transports/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { createTransport } from '@sentry/core';
import { createTransport, suppressTracing } from '@sentry/core';
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types';
import { SentryError } from '@sentry/utils';

Expand DownExpand Up@@ -89,14 +89,16 @@ export function makeEdgeTransport(options: VercelEdgeTransportOptions): Transpor
 ...options.fetchOptions,
 };

 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 return suppressTracing(() => {
 return fetch(options.url, requestOptions).then(response => {
 return {
 statusCode: response.status,
 headers: {
 'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
 'retry-after': response.headers.get('Retry-After'),
 },
 };
 });
 });
 }

Expand Down