Resource merge precedence#1728
Merged
cijothomas merged 12 commits intoopen-telemetry:mainfrom Jan 28, 2021
Austin-Tan:ResourceMergePrecedence
Merged
Resource merge precedence#1728cijothomas merged 12 commits intoopen-telemetry:mainfrom Austin-Tan:ResourceMergePrecedence
cijothomas merged 12 commits intoopen-telemetry:mainfrom
Austin-Tan:ResourceMergePrecedence
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1728 +/- ##
==========================================
- Coverage 82.15% 82.13% -0.02%
==========================================
Files 250 250
Lines 6774 6774
==========================================
- Hits 5565 5564 -1
- Misses 1209 1210 +1
|
cijothomas
approved these changes
Jan 27, 2021
CodeBlanch
reviewed
Jan 27, 2021
CodeBlanch
reviewed
Jan 27, 2021
CodeBlanch
approved these changes
Jan 27, 2021
Member
CodeBlanch
left a comment
CodeBlanch
left a comment
There was a problem hiding this comment.
Left a couple of nits, but LGTM.
…an/opentelemetry-dotnet into ResourceMergePrecedence
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
3 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.
Fixes #1712
Changes
When merging an "other" resource to "this" resource, we previously kept the values from "this" resource in conflicts. Due to recent changes in the OTel specification, this has been reversed to always use the incoming resource's attributes.
For significant contributions please make sure you have completed the following items:
CHANGELOG.mdupdated for non-trivial changes