Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse order of attribute precedence when merging two Resources #1501

Merged
merged 3 commits into from
Jan 29, 2021

Conversation

evantorrie
Copy link
Contributor

@evantorrie evantorrie commented Jan 29, 2021

This reflects a change in the specification itself.
open-telemetry/opentelemetry-specification#1345

Resolves #1500

@codecov
Copy link

codecov bot commented Jan 29, 2021

Codecov Report

Merging #1501 (39cc1d7) into main (ad7b471) will decrease coverage by 0.2%.
The diff coverage is 100.0%.

Impacted file tree graph

@@           Coverage Diff           @@
##            main   #1501     +/-   ##
=======================================
- Coverage   79.2%   79.0%   -0.3%     
=======================================
  Files        127     127             
  Lines       6659    6683     +24     
=======================================
  Hits        5280    5280             
- Misses      1124    1148     +24     
  Partials     255     255             
Impacted Files Coverage Δ
sdk/resource/resource.go 67.5% <100.0%> (ø)
sdk/export/metric/exportkind_string.go 57.1% <0.0%> (-42.9%) ⬇️
label/type_string.go 7.1% <0.0%> (-26.2%) ⬇️
metric/instrumentkind_string.go 10.0% <0.0%> (-23.4%) ⬇️
metric/number/kind_string.go 16.6% <0.0%> (-16.7%) ⬇️

Copy link
Member

@XSAM XSAM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Base automatically changed from master to main January 29, 2021 19:39
@MrAlias MrAlias merged commit 1952d7b into open-telemetry:main Jan 29, 2021
@MrAlias MrAlias mentioned this pull request Feb 12, 2021
ldelossa pushed a commit to ldelossa/opentelemetry-go that referenced this pull request Mar 5, 2021
…n-telemetry#1501)

* Reverse order of attribute precedence when merging two Resources

This reflects a change in the specification itself.
open-telemetry/opentelemetry-specification#1345

* Resolves open-telemetry#1500

Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Resource.Merge to be compliant with spec change
3 participants