Repository navigation
Commit aaeb9a8
committed
fix(core): release finished spans from captured async-context frames
`Plugin#enter` writes a fresh `{ ...store, span }` object into the current
async-context frame. Any async resource created while that frame is active
snapshots it and keeps the object — and its `span` — reachable for the
resource's whole lifetime. When the resource is never freed (a pooled socket, a
long-lived emitter), the finished span and its entire parent chain stay pinned,
so retention grows one span per request until the process runs out of memory
(#9227).
`enter` now returns the store it wrote into storage; a caller whose span outlives
the request keeps that object and nulls its `span` once the span is finished and
no in-scope continuation can still read it as active. Applied at the three sites
that enter a store for such a span:
1. router — null every entered store at `request:finish`, not at
`middleware:finish` (which fires before `next.apply(...)`, while work the
middleware schedules after `next()` must still see the correct active span).
2. google-cloud-pubsub push — null the push-receive store at request finish.
3. test-api-manual — null the entered store once the manual test is finished.
Nulling the store in place, rather than routing through a span-keyed WeakMap on
the base class, keeps the release off the hot path (no per-span map insert plus
lookup and delete) and off the npm-exported `Plugin` surface.
Refs: #92281 parent 0175f0c commit aaeb9a8
4 files changed
Lines changed: 50 additions & 12 deletions
File tree
- packages
- datadog-plugin-google-cloud-pubsub/src
- datadog-plugin-router/src
- dd-trace/src
- ci-visibility/test-api-manual
- plugins
Lines changed: 11 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | 13 | | |
| |||
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
38 | | - | |
39 | | - | |
40 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
41 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
42 | 47 | | |
43 | 48 | | |
44 | 49 | | |
| |||
90 | 95 | | |
91 | 96 | | |
92 | 97 | | |
93 | | - | |
94 | | - | |
| 98 | + | |
| 99 | + | |
95 | 100 | | |
96 | 101 | | |
97 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
42 | 47 | | |
43 | 48 | | |
44 | 49 | | |
| |||
91 | 96 | | |
92 | 97 | | |
93 | 98 | | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
94 | 110 | | |
95 | 111 | | |
96 | 112 | | |
| |||
130 | 146 | | |
131 | 147 | | |
132 | 148 | | |
133 | | - | |
134 | | - | |
| 149 | + | |
| 150 | + | |
135 | 151 | | |
136 | 152 | | |
137 | 153 | | |
138 | 154 | | |
139 | 155 | | |
140 | 156 | | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
141 | 160 | | |
142 | 161 | | |
143 | 162 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
37 | 41 | | |
38 | 42 | | |
39 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
101 | 110 | | |
102 | 111 | | |
103 | | - | |
| 112 | + | |
104 | 113 | | |
105 | 114 | | |
106 | | - | |
107 | | - | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
108 | 118 | | |
109 | 119 | | |
110 | 120 | | |
| |||
0 commit comments