fix(llmobs): fix parenting logic with apm spans mixed in [backport 3.3] #12827
+58
−6
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Fixes the parenting logic for llmobs when there is a root apm span.
Previously with this logic:
```
while new_active and new_active.finished:
new_active = new_active._parent
if new_active and not new_active.finished and new_active.span_type == SpanTypes.LLM:
break
```
1. We activate a non-LLMObs span when we break out of the while loop by
bumping into an unfinished non-LLMObs span.
2. We always stop traversing up when we find an unfinished span (apm or
llmobs). Instead, we should keep going until we hit the top of the tree
OR we hit an unfinished llmobs span.
We update for updating the active span to:
1. traverse up until we find an unfinished LLM Obs span - if we do, we
activate and return it
2. if we bump into the end of the tree, we activate and return `None`
## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
---------
Co-authored-by: lievan <evan.li@datadoqhq.com>
(cherry picked from commit 1aa3946)
lievan
approved these changes
Mar 20, 2025
|
|
Bootstrap import analysisComparison of import times between this PR and main. SummaryThe average import time in this PR is: 280 ± 10 ms. The average import time in main is: 258 ± 8 ms. The import time difference between this PR and main is: 20.3 ± 0.5 ms. Import time breakdownThe following import paths have appeared:
|
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.
Backport 1aa3946 from #12815 to 3.3.
Fixes the parenting logic for llmobs when there is a root apm span.
Previously with this logic:
We update for updating the active span to:
NoneChecklist
Reviewer Checklist