fix: bring parent span into ThreadLocals to maintain Observation and span hierarchy parity#6249
Merged
Merged
Conversation
…span hierarchy parity Signed-off-by: Dariusz Jędrzejczyk <2554306+chemicL@users.noreply.github.com>
Signed-off-by: Dariusz Jędrzejczyk <2554306+chemicL@users.noreply.github.com>
Signed-off-by: Dariusz Jędrzejczyk <2554306+chemicL@users.noreply.github.com>
tzolov
added a commit
that referenced
this pull request
Jun 3, 2026
Apply the same Micrometer Tracing parent scope fix from #6249 to Anthropic, Bedrock Converse, DeepSeek, Google GenAI, MiniMax, Mistral AI, and Ollama chat models — briefly opening the parent observation's scope before observation.start() so span parenting is derived from the explicit parentObservation rather than the ambient thread scope. Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
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
2 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.
TracingObservationHandler.getParentSpanuses the span present on a Spring MVC thread to be the parent span forObservations for which we provide explicitparentObservationwhich causes the span hierarchy mismatch theObservationhieararchy.The reason for the mismatch is this change in Micrometer Tracing: micrometer-metrics/tracing@3bece1e
I'll discuss with the maintainers the path forward, but the interim fix should ensure the proper hierarchy without the need to use automatic context propagation.