Commit 19ee457
Mark check raw file injection as @flaky on Zulu 8
The smoketest fails ~0.25% of the time on Zulu 8 with
`logLines.size() == 7` (got 3) — root cause is a JDK 8 race between
java.util.logging.LogManager.<clinit> and ClassLoader.initSystemClassLoader()
when a JFR-instrumented class (Zulu 8 backports JFR) loads JUL during
agent premain. The Agent.java waitForJUL guard mitigates most cases but
leaks ~0.25%. The same failure mode already justifies @flaky on Oracle
JDK 8 (same JFR backport) and IBM 8 (IBMSASL triggers the same race);
Zulu 8 belongs alongside them.
This adds JavaVirtualMachine.isZulu8() + a test + extends the @flaky
condition. No production code path changes — Zulu 8 users on a custom
LogManager (e.g. Log4j2 JUL bridge) are still potentially affected by
the underlying agent race; this only suppresses the flaky CI signal.
Match isIbm8 ordering: vendor check first, drop redundant javadoc
ci: retrigger (muzzle Maven mirror flakes)
Merge branch 'master' into brian.marks/flaky-zulu8-log-injection
Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent ed7e5f3 commit 19ee457
3 files changed
Lines changed: 15 additions & 1 deletion
File tree
- components/environment/src
- main/java/datadog/environment
- test/java/datadog/environment
- dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
119 | 123 | | |
120 | 124 | | |
121 | 125 | | |
| |||
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
141 | 151 | | |
142 | 152 | | |
143 | 153 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
416 | 416 | | |
417 | 417 | | |
418 | 418 | | |
419 | | - | |
| 419 | + | |
420 | 420 | | |
421 | 421 | | |
422 | 422 | | |
| |||
0 commit comments