[pkg/ottl] Fix the context inference order to prioritize scope over resource
#39307
Conversation
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
github-actions
bot
requested review from
bogdandrutu,
evan-bradley,
kentquirk and
TylerHelmuth
edmocosta
changed the title
scope over resource
dehaansa
reviewed
Apr 10, 2025
Hi @dehaansa, thanks for reviewing! the current testing strategy was ensuring the context priority list works (by mocking the priority values and checking the inferred value), and then testing if the default priority list is the one we expect so OTTL contexts would be properly inferred (see). Those tests cases should be enough to guarantee correctness, but I agree that it wouldn't hurt adding more explicit tests for the existing OTTL contexts. I've pushed the changes already. |
TylerHelmuth
approved these changes
Apr 11, 2025
akshays-19
pushed a commit
to akshays-19/opentelemetry-collector-contrib
that referenced
this pull request
Apr 23, 2025
… `resource` (open-telemetry#39307) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Changed the context inferrer so the `scope` context has priority over the `resource` context, fixing the error described on the linked issue. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#39155 <!--Please delete paragraphs that you did not use before submitting.-->
Fiery-Fenix
pushed a commit
to Fiery-Fenix/opentelemetry-collector-contrib
that referenced
this pull request
Apr 24, 2025
… `resource` (open-telemetry#39307) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Changed the context inferrer so the `scope` context has priority over the `resource` context, fixing the error described on the linked issue. <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#39155 <!--Please delete paragraphs that you did not use before submitting.-->
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.
Description
Changed the context inferrer so the
scopecontext has priority over theresourcecontext, fixing the error described on the linked issue.Link to tracking issue
Fixes #39155