Commit f17aa0a
authored
chore: fix ci-only flakey telemetry tests (#1383)
Fixes CI-only flakes in telemetry logging E2E tests caused by the
non-blocking tracing writer racing with stdout capture.
The capture helper now:
- waits for pending logs to drain before redirecting stdout
- keeps stdout redirected until logs emitted during the request are
drained
This prevents setup logs from leaking into the capture and request logs
from arriving after capture ends.
Furthermore, the text logging assertions in the telemetry now count only
`router::request` lines, excluding unrelated output from the OTLP test
collector that might pollute.
Fix was also tested in #1380.1 parent 0299232 commit f17aa0a
2 files changed
Lines changed: 19 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
112 | 118 | | |
113 | 119 | | |
114 | 120 | | |
| |||
141 | 147 | | |
142 | 148 | | |
143 | 149 | | |
144 | | - | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
145 | 157 | | |
146 | 158 | | |
147 | 159 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| 26 | + | |
| 27 | + | |
24 | 28 | | |
25 | 29 | | |
26 | 30 | | |
| |||
0 commit comments