Update resource merge behaviour #537
Merged
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
The resource merge behaviour changed 3 months ago to be consistent with Span.SetAttribute. It now specifies: > The resulting resource MUST have all attributes that are on any of the > two input resources. If a key exists on both the old and updating > resource, the value of the updating resource MUST be picked (even if > the updated value is empty). This updates sdk::Resource::merge to behave as described in the spec.
Codecov Report
@@ Coverage Diff @@
## main #537 +/- ##
=======================================
- Coverage 52.2% 52.2% -0.1%
=======================================
Files 96 96
Lines 8513 8505 -8
=======================================
- Hits 4451 4443 -8
Misses 4062 4062
Continue to review full report at Codecov.
|
jtescher
approved these changes
May 3, 2021
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.
The resource merge behaviour changed 3 months ago to be consistent with Span.SetAttribute (commit). It now specifies:
This updates sdk::Resource::merge to behave as described in the spec.
Note: I didn't have the time to check where
sdk::Resource::mergeis used and if this change affects anything, yet.