Fix event batcher flush span race - #7820
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a timing race in eventBatcher.flush span lifecycle by ensuring the flush span is ended before unblocking Record callers, aligning the synchronous Record contract with telemetry expectations.
Changes:
- Removes deferred span ending in
flushand ends the span explicitly afterRecordcompletes. - Ensures callers are notified (via
done) only after the flush span has been ended.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
pingsutw
marked this pull request as ready for review
August 10, 2026 20:16
AdilFayyaz
approved these changes
Aug 10, 2026
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
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.
Summary
Fixes a timing race in
eventBatcher.flushtelemetry recording. The flush span was ended viadefer, after callers were released through theirdonechannel, soRecordcould return before the span recorder observed the endedeventBatcher.flushspan.This makes the span end explicit before notifying callers, keeping the synchronous
Recordcontract aligned with the test expectation.Root cause
TestEventBatcher_FlushSpanLinksCallersinspects ended spans immediately afterRecordreturns. Becausespan.End()ran in a deferred call after writing todone, scheduler timing could let the test resume before the span was ended, producing zero flush spans.Validation
go test ./executor/pkg/controller -run TestEventBatcher_FlushSpanLinksCallers -count=100go test -race -coverprofile=coverage.out -covermode=atomic ./executor/pkg/controllergo test -race -coverprofile=coverage.out -covermode=atomic ./executor/...go test ./executor/pkg/controller -run TestEventBatcher_FlushSpanLinksCallers -count=20