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: new merge function #2484

Merged
merged 5 commits into from
Oct 12, 2021
Merged

feat: new merge function #2484

merged 5 commits into from
Oct 12, 2021

Conversation

obecny
Copy link
Member

@obecny obecny commented Sep 21, 2021

Which problem is this PR solving?

  • New merge function for merging configs, replacing dependency on lodash.merge
  • Moved from lodash only few small pieces - staying in separate file,
  • full unit tests

@obecny obecny requested a review from a team as a code owner September 21, 2021 19:43
@obecny obecny added the enhancement New feature or request label Sep 21, 2021
@codecov
Copy link

codecov bot commented Sep 21, 2021

Codecov Report

Merging #2484 (7a7c012) into main (ed0ba06) will decrease coverage by 0.16%.
The diff coverage is 86.04%.

@@            Coverage Diff             @@
##             main    #2484      +/-   ##
==========================================
- Coverage   93.23%   93.07%   -0.17%     
==========================================
  Files         137      139       +2     
  Lines        5044     5172     +128     
  Branches     1067     1110      +43     
==========================================
+ Hits         4703     4814     +111     
- Misses        341      358      +17     
Impacted Files Coverage Δ
...elemetry-sdk-trace-base/src/BasicTracerProvider.ts 94.44% <ø> (-0.06%) ⬇️
...kages/opentelemetry-core/src/utils/lodash.merge.ts 63.04% <63.04%> (ø)
packages/opentelemetry-core/src/utils/merge.ts 98.79% <98.79%> (ø)
...ckages/opentelemetry-sdk-metrics-base/src/Meter.ts 88.59% <0.00%> (ø)
...pentelemetry-sdk-metrics-base/src/MeterProvider.ts 88.57% <0.00%> (ø)
...emetry-core/src/platform/node/RandomIdGenerator.ts 93.75% <0.00%> (+6.25%) ⬆️

@@ -71,6 +71,7 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "4.0.2",
"lerna": "3.22.1",
Copy link
Member

Choose a reason for hiding this comment

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

why does lerna need to be in dev deps ?

Copy link
Member

Choose a reason for hiding this comment

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

he doesn't want to have to have it installed globally. The npm scripts call lerna so if you have it in dev deps they find it correctly. If not, it looks for global.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah but i meant why does it need to be commited ? We expect it to be available globally right ?

Copy link
Member Author

Choose a reason for hiding this comment

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

If you dont have lerna locally you cant compile it. Not mentioning that the lerna we are using should be compatible with the one that is in the project. This is also missing in other packages which should be added. We should not expect user to have lerna installed globally

Copy link
Member

Choose a reason for hiding this comment

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

Then do we need to add it to all other packages ? I would prefer to do this in another PR

@dyladan
Copy link
Member

dyladan commented Sep 22, 2021

Looks good to me once the comment valentin made is resolved. Thanks for adding comprehensive tests.

@obecny
Copy link
Member Author

obecny commented Oct 11, 2021

@dyladan @vmarchaud ^^

@vmarchaud
Copy link
Member

^^

My comment about lerna still stand i would prefer doing it in another PR but its not blocking

@obecny
Copy link
Member Author

obecny commented Oct 11, 2021

^^

My comment about lerna still stand i would prefer doing it in another PR but its not blocking

Seriously???, it stucked 20 days in review because of this comment ....... Without lerna you can't compile it separately it was broken during big refactoring, not even mentioning that now all packages cannot be compiled separately if you don't have lerna installed globally.

@vmarchaud
Copy link
Member

Seriously???, it stucked 20 days in review because of this comment

You don't need to do passive/aggresive for a review comment, i asked a question and you didn't answer (i guess because of your holiday and thats fine) so don't blame me please.

Without lerna you can't compile it separately it was broken during big refactoring, not even mentioning that now all packages cannot be compiled separately if you don't have lerna installed globally.

I understood this, i just stated that it wasn't linked to the original PR so it would make more sense to make a PR to add lerna to all packages since the problem will be the same with others.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants