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

sdk::resource::Resource::Merge should be const #1905

Merged
merged 1 commit into from
Jan 7, 2023

Conversation

esigo
Copy link
Member

@esigo esigo commented Jan 7, 2023

Fixes #1898 (issue)

Changes

changes sdk::resource::Resource::Merge to const.
Please provide a brief description of the changes here.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@esigo esigo requested a review from a team January 7, 2023 12:30
@codecov
Copy link

codecov bot commented Jan 7, 2023

Codecov Report

Merging #1905 (8d2464c) into main (d557191) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1905      +/-   ##
==========================================
- Coverage   85.72%   85.71%   -0.01%     
==========================================
  Files         171      171              
  Lines        5252     5252              
==========================================
- Hits         4502     4501       -1     
- Misses        750      751       +1     
Impacted Files Coverage Δ
sdk/include/opentelemetry/sdk/resource/resource.h 100.00% <ø> (ø)
sdk/src/resource/resource.cc 96.30% <100.00%> (ø)
sdk/src/trace/batch_span_processor.cc 90.70% <0.00%> (-0.77%) ⬇️

Copy link
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix.

Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

LGTM

@lalitb lalitb merged commit 201b347 into open-telemetry:main Jan 7, 2023
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.

opentelemetry::sdk::resource::Resource::Merge should be const method
3 participants