Commit 2e41f5e
fix(node): Avoid double-wrapping http module (#16177)
@s1gr1d and @Lms24 figured out that the duplicate spans we sometimes see
are related to esm and the http module. Especially, it seems to be
related to us using the `stealthWrap` function to wrap `server.emit` for
request isolation purposes.
While we still don't really know _why_ this is making such problems,
this PR seems to fix it (at least in integration tests) by avoiding
using import-in-the-middle here, and instead using diagnostics channel
with good old-fashioned monkey patching on the passed-in `server`
instance.
Some note: We need to make sure to still call this in the otel-wrapping
code of `init()`, otherwise there are weird timing issues in
top-level-import scenarios 😬
Hopefully fixes
#15830, and fixes
#15803
---------
Co-authored-by: Andrei <[email protected]>1 parent 0335cf7 commit 2e41f5e
File tree
7 files changed
+194
-333
lines changed- dev-packages
- e2e-tests
- test-applications/astro-5/tests
- node-integration-tests/suites/express/with-http
- packages/node/src/integrations/http
- vendor
7 files changed
+194
-333
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
13 | 35 | | |
14 | 36 | | |
15 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
| |||
Lines changed: 24 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
41 | 33 | | |
0 commit comments