Commit 4e48384
authored
Fix field-injection of ForkJoinTask on Java 25 (#10084)
* Turning off crash-tracking was hiding a bug on Java 25
* Preload a future no-op task to ensure workQueue.take() will use await with timeout during premain - otherwise on Java 25 it will load ForkJoinPool which in turn loads ForkJoinTask, which then means we lose the chance to field-inject context into ForkJoinTask instances
* Only apply workaround to the global task scheduler used during premain1 parent a2f3c7a commit 4e48384
File tree
2 files changed
+10
-1
lines changed- dd-smoke-tests/field-injection/src/test/groovy/datadog/smoketest
- internal-api/src/main/java/datadog/trace/util
2 files changed
+10
-1
lines changedLines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | 64 | | |
66 | 65 | | |
67 | 66 | | |
| |||
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
225 | 226 | | |
226 | 227 | | |
227 | 228 | | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
228 | 235 | | |
229 | 236 | | |
230 | 237 | | |
| |||
302 | 309 | | |
303 | 310 | | |
304 | 311 | | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
305 | 315 | | |
306 | 316 | | |
307 | 317 | | |
| |||
0 commit comments