fix(node): Avoid double-wrapping http module#16177

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
mydea merged 10 commits into from
May 5, 2025
Merged

fix(node): Avoid double-wrapping http module #16177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7f35f7c
fix(node): Avoid double-wrapping http module
mydea Apr 30, 2025
6ad5c03
fix astro stuff
mydea Apr 30, 2025
5c99873
one more cleanup
mydea Apr 30, 2025
030f222
fix order with otel instrumentation
mydea May 2, 2025
3a6317e
fix comment
mydea May 2, 2025
db3b340
improve dedupe logic
mydea May 2, 2025
1f82471
fix comment
mydea May 2, 2025
f4fa109
fix logger statements
mydea May 2, 2025
56825c1
Apply suggestions from code review
mydea May 5, 2025
0cd1834
add changelog entry
mydea May 5, 2025
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
22 changes: 22 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:
Comment on lines +19 to +20

@andreiborzaandreiborzaMay 5, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?

@mydeamydeaMay 5, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!


The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
method: string;
protocol: string;
host: string;
hostname: string; // same as host
path: string;
headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
"clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
"ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
"ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
"clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
"clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
"clean:pnpm": "pnpm store prune"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
});

expect(serverPageRequestTxn).toMatchObject({
breadcrumbs: expect.any(Array),

@mydeamydeaMay 2, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..

@Lms24Lms24May 2, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D

contexts: {
app: expect.any(Object),
cloud_resource: expect.any(Object),
Expand Down
56 changes: 24 additions & 32 deletions dev-packages/node-integration-tests/suites/express/with-http/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
cleanupChildProcesses();
});

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createRunner, test) => {
test('it works when importing the http module', async () => {
const runner = createRunner()
.expect({
transaction: {
transaction: 'GET /test2',
},
})
.expect({
transaction: {
transaction: 'GET /test',
},
})
.expect({
transaction: {
transaction: 'GET /test3',
},
})
.start();
await runner.makeRequest('get', '/test');
await runner.makeRequest('get', '/test3');
await runner.completed();
});
// TODO: This is failing on ESM because importing http is triggering the http spans twice :(
// We need to fix this!
},
{ failsOnEsm: true },
);
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
test('it works when importing the http module', async () => {
const runner = createRunner()
.expect({
transaction: {
transaction: 'GET /test2',
},
})
.expect({
transaction: {
transaction: 'GET /test',
},
})
.expect({
transaction: {
transaction: 'GET /test3',
},
})
.start();
await runner.makeRequest('get', '/test');
await runner.makeRequest('get', '/test3');
await runner.completed();
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(node): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(node): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(node): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(node): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(node): Avoid double-wrapping http module#16177

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

mydea
merged 10 commits into

from

May 5, 2025
 Merged


fix(node): Avoid double-wrapping http module
#16177
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7f35f7c

fix(node): Avoid double-wrapping http module


mydea Apr 30, 2025
6ad5c03

fix astro stuff


mydea Apr 30, 2025
5c99873

one more cleanup


mydea Apr 30, 2025
030f222

fix order with otel instrumentation


mydea May 2, 2025
3a6317e

fix comment


mydea May 2, 2025
db3b340

improve dedupe logic


mydea May 2, 2025
1f82471

fix comment


mydea May 2, 2025
f4fa109

fix logger statements


mydea May 2, 2025
56825c1

Apply suggestions from code review


mydea May 5, 2025
0cd1834

add changelog entry


mydea May 5, 2025

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


22 changes: 22 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,28 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

### Important Changes

- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**

When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.

In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:

Comment on lines

+19
 to 
+20

@andreiborzaandreiborzaMay 5, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Markdown formatting here seems odd, is that on purpose?
@mydeamydeaMay 5, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no!

The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:

```ts
ignoreOutgoingRequests(url: string, {
 method: string;
 protocol: string;
 host: string;
 hostname: string; // same as host
 path: string;
 headers: OutgoingHttpHeaders;
})
```

## 9.15.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 "clean": "rimraf tmp node_modules && yarn clean:test-applications && yarn clean:pnpm",
 "ci:build-matrix": "ts-node ./lib/getTestMatrix.ts",
 "ci:build-matrix-optional": "ts-node ./lib/getTestMatrix.ts --optional=true",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:test-applications": "rimraf --glob test-applications/**/{node_modules,dist,build,.next,.nuxt,.sveltekit,.react-router,.astro,.output,pnpm-lock.yaml,.last-run.json,test-results}",
 "clean:pnpm": "pnpm store prune"
 },
 "devDependencies": {
Expand Down

1 change: 0 additions & 1 deletion
dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
 });

 expect(serverPageRequestTxn).toMatchObject({
 breadcrumbs: expect.any(Array),
@mydeamydeaMay 2, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this used to be the breadcrumbs of other errors from other tests.. which seems wrong to me, actually? So I wonder if this actually fixes something with astro, which is possible as now this is unrelated to when this is initialized, I guess..
@Lms24Lms24May 2, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could fix some kind of isolation problem since request isolation in Astro was limited to the middleware lifecycle previously. Maybe something didn't work as expected in there or there was a timing issue. Gonna say it's finde until proven otherwise :D
 contexts: {
 app: expect.any(Object),
 cloud_resource: expect.any(Object),
Expand Down

56 changes: 24 additions & 32 deletions
dev-packages/node-integration-tests/suites/express/with-http/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,36 +6,28 @@ describe('express with http import', () => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 // TODO: This is failing on ESM because importing http is triggering the http spans twice :(
 // We need to fix this!
 },
 { failsOnEsm: true },
 );
 createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('it works when importing the http module', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test2',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test',
 },
 })
 .expect({
 transaction: {
 transaction: 'GET /test3',
 },
 })
 .start();
 await runner.makeRequest('get', '/test');
 await runner.makeRequest('get', '/test3');
 await runner.completed();
 });
 });
});
Loading