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

feat(sdk-*)!: align merge resource behavior with spec #5219

Open
wants to merge 3 commits into
base: next
Choose a base branch
from

Conversation

david-luna
Copy link
Contributor

Which problem is this PR solving?

Aligns SDKs resource merging strategy with the specification:

Fixes #5132

Short description of the changes

  • remove config mergeResourcesWithDefault option
  • do not merge default resource if one provided in config
  • update tests

Type of change

Please delete options that are not relevant.

  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

Compiled and ran the tests in all packages.

Checklist:

  • Followed the style guidelines of this project
  • Unit tests have been added

@david-luna david-luna requested a review from a team as a code owner November 29, 2024 10:17
Copy link

codecov bot commented Nov 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.12%. Comparing base (4a394cc) to head (93f52c0).
Report is 5 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #5219      +/-   ##
==========================================
- Coverage   93.15%   93.12%   -0.04%     
==========================================
  Files         315      315              
  Lines        8113     8087      -26     
  Branches     1633     1627       -6     
==========================================
- Hits         7558     7531      -27     
- Misses        555      556       +1     
Files with missing lines Coverage Δ
...imental/packages/opentelemetry-sdk-node/src/sdk.ts 97.35% <ø> (-0.04%) ⬇️
...perimental/packages/sdk-logs/src/LoggerProvider.ts 97.77% <100.00%> (-0.23%) ⬇️
experimental/packages/sdk-logs/src/config.ts 100.00% <ø> (ø)
...elemetry-sdk-trace-base/src/BasicTracerProvider.ts 96.19% <100.00%> (+0.50%) ⬆️
...ackages/opentelemetry-sdk-trace-base/src/config.ts 88.63% <ø> (ø)
packages/sdk-metrics/src/MeterProvider.ts 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

@david-luna david-luna changed the title refactor(sdk-*): aling merge resource behavior with spec refactor(sdk-*): align merge resource behavior with spec Nov 29, 2024
@@ -53,14 +53,15 @@ const udsAddr = 'unix:///tmp/otlp-metrics.sock';
type TestParams = {
Copy link
Member

@pichlermarc pichlermarc Nov 29, 2024

Choose a reason for hiding this comment

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

oh, I actually removed all of these tests on main already. I'll open a PR to sync main to next.
It's time again to do so anyway.

CHANGELOG_NEXT.md Outdated Show resolved Hide resolved
Co-authored-by: Marc Pichler <[email protected]>
@david-luna david-luna changed the title refactor(sdk-*): align merge resource behavior with spec feat(sdk-*): align merge resource behavior with spec Dec 2, 2024
@david-luna david-luna changed the title feat(sdk-*): align merge resource behavior with spec feat(sdk-*)!: align merge resource behavior with spec Dec 2, 2024
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.

2 participants