Remove log-injection diagnostic and workaround code (fixed by #11509)#11548
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intoJun 3, 2026
Merged
Conversation
bm1549
added
tag: ai generated
…1509 The DDTraceId/DD64bTraceId class-initialization deadlock was the root cause of the traceCount=0 flakiness that prompted these diagnostics. With the deadlock fixed, the diagnostic instrumentation is no longer needed. Removes from #11075 and #11400: - waitForTraceCountAlive() and all helpers (dumpThreadStacks, filterThreadDump, isBoilerplateThread, isHighPriorityThread, getTestedProcessPid, runJstack, tailProcessLog, INLINE_DUMP_CAP) - The OperatingSystem import that was only used by dumpThreadStacks Keeps the actual fixes from #10999, #11375: - BaseApplication TIMEOUT_IN_NANOS 10s→30s (prevents app-side timeout racing the test-side timeout under CI load) - @flaky(isZulu8()) and JavaVirtualMachine.isZulu8() (covers a separate JUL race on Zulu 8 that is not fixed by #11509) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
bm1549
force-pushed
the
brian.marks/remove-log-injection-diagnostics
branch
from
9f96ca9 to
4c0fb1f
Compare
PerfectSlayer
approved these changes
Jun 3, 2026
This comment has been minimized.
This comment has been minimized.
mhlidd
approved these changes
Jun 3, 2026
Contributor
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
Contributor
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
|
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
gh-worker-dd-mergequeue-cf854d
Bot
deleted the
brian.marks/remove-log-injection-diagnostics
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Does This Do
Removes the diagnostic instrumentation added to
LogInjectionSmokeTestwhile investigating thecheck raw file injectionflakiness. Since #11509 fixed the root cause (aDDTraceId/DD64bTraceIdclass-initialization deadlock), the diagnostics are no longer needed.Only
LogInjectionSmokeTest.groovyis changed. The actual fixes from the earlier PRs (#10999, #11375) are kept.Removed (from #11075 and #11400):
waitForTraceCountAlive()and all helper methods:dumpThreadStacks,filterThreadDump,isBoilerplateThread,isHighPriorityThread,getTestedProcessPid,runJstack,tailProcessLog,INLINE_DUMP_CAPimport datadog.environment.OperatingSystem(was only used bydumpThreadStacks)Kept (actual fixes, not diagnostics):
BaseApplication.TIMEOUT_IN_NANOS30s — aligns app-side timeout with the test's polling timeout; prevents the app from crashing before traces are delivered under CI load (Fix log injection smoke test flakiness under CI load #10999)@Flaky(isZulu8())andJavaVirtualMachine.isZulu8()— covers a separate JUL race on Zulu 8 that is not addressed by Fix DDTraceId/DD64bTraceId class-initialization deadlock #11509 (Mark check raw file injection as @Flaky on Zulu 8 #11375)assert testedProcess.waitFor(...)assertion and ordering ofwaitForTraceCount(4)beforewaitFor(improvements from Diagnose log injection smoke test flakiness instead of masking it #11075)Motivation
The
traceCount=0failures incheck raw file injectionwere caused by a class-initialization deadlock betweenDDTraceIdandDD64bTraceId, diagnosed using the thread dumps added in #11400 and fixed in #11509. With the deadlock fixed, the ~260-line diagnostic block inLogInjectionSmokeTestis dead weight.Additional Notes
N/A — only the diagnostic instrumentation is removed.
Contributor Checklist
type:andcomp:labels assignedJira ticket: N/A