fix(core): Store child span timeout handle in _childSpanTimeoutID - #23429
Open
suhailopensource wants to merge 1 commit into
Open
fix(core): Store child span timeout handle in _childSpanTimeoutID#23429suhailopensource wants to merge 1 commit into
suhailopensource wants to merge 1 commit into
Conversation
suhailopensource
marked this pull request as ready for review
August 14, 2026 03:46
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.
_restartChildSpanTimeoutstored its timer handle in_idleTimeoutIDinstead of_childSpanTimeoutID, so_childSpanTimeoutIDwas never assigned and_cancelChildSpanTimeout()was dead at both of its call sites.Root cause
On the
idleSpanEnableAutoFinishpath,_restartIdleTimeout()arms the idle timer and the immediatelyfollowing
_restartChildSpanTimeout()overwrites its handle without clearing it, orphaning an armed idle timerthat nothing can cancel. When the in-flight children finish,
_popActivity's_cancelIdleTimeout()cancels thechild timer instead, and the orphan later fires and ends the idle span at
signalTime + idleTimeoutrather thanlastChildEnd + idleTimeout. Child spans starting in that window are dropped from the transaction.The other caller,
_pushActivity, is unaffected because_cancelIdleTimeout()already runs immediately beforeit — which is why no existing test covered this.
childSpanTimeoutitself kept working by accident via_cancelIdleTimeout, so this does not change itsbehaviour; it only makes the two timers independent, as the code already intended.
Fixes #23404
yarn lint) & (yarn test).