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.

Sign up for GitHub

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

Jump to bottom

Move config.Map to its own package which does not depend on any component concept #5237

Merged
merged 1 commit into from
May 31, 2022
Merged

Move config.Map to its own package which does not depend on any component concept #5237

merged 1 commit into from
May 31, 2022

Conversation

bogdandrutu
Copy link
Member

@bogdandrutu bogdandrutu commented Apr 20, 2022 •
edited
Loading

Signed-off-by: Bogdan Drutu bogdandrutu@gmail.com

@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 3 times, most recently from b4f5546 to 7fc2c8c Compare April 21, 2022 22:08
@codecov
Copy link

codecov bot commented Apr 21, 2022 •
edited
Loading

Codecov Report

Merging #5237 (c902592) into main (8dfdc1c) will increase coverage by 0.08%.
The diff coverage is 97.77%.

❗ Current head c902592 differs from pull request most recent head 921e802. Consider uploading reports for the commit 921e802 to get more accurate results

@@            Coverage Diff             @@
##             main    #5237      +/-   ##
==========================================
+ Coverage   90.88%   90.97%   +0.08%     
==========================================
  Files         190      191       +1     
  Lines       11424    11392      -32     
==========================================
- Hits        10383    10364      -19     
+ Misses        820      809      -11     
+ Partials      221      219       -2
Impacted Files Coverage Δ
config/configtest/configtest.go 100.00% <ø> (ø)
confmap/confmap.go 90.09% <93.33%> (ø)
confmap/confmaptest/configtest.go 100.00% <100.00%> (ø)
confmap/converter/expandconverter/expand.go 100.00% <100.00%> (ø)
...nverter/overwritepropertiesconverter/properties.go 100.00% <100.00%> (ø)
confmap/provider.go 100.00% <100.00%> (ø)
confmap/provider/envprovider/mapprovider.go 100.00% <100.00%> (ø)
confmap/provider/fileprovider/mapprovider.go 100.00% <100.00%> (ø)
confmap/provider/yamlprovider/mapprovider.go 100.00% <100.00%> (ø)
service/telemetry.go 76.08% <0.00%> (-2.21%) ⬇️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8dfdc1c...921e802. Read the comment docs.

@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 2 times, most recently from bf0717e to 3a5ebd4 Compare April 22, 2022 15:48
mx-psi
mx-psi reviewed Apr 27, 2022
View reviewed changes
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

I don't have good ideas for the name but I am in favor of moving this to its own package; I think it will allow for gradually marking parts of the codebase as stable

@github-actions
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label May 12, 2022
@bogdandrutu
Copy link
Member Author

I think it will allow for gradually marking parts of the codebase as stable

More than that, I think this package becomes completely independent on any other collector component/concept.

@github-actions github-actions bot removed the Stale label May 14, 2022
@bogdandrutu
Copy link
Member Author

@mx-psi decided on confmap, I think is not generic and is a cool name.

@bogdandrutu bogdandrutu marked this pull request as ready for review May 19, 2022 00:20
@bogdandrutu bogdandrutu requested review from a team and dmitryax May 19, 2022 00:20
@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 4 times, most recently from c902592 to 71a7c39 Compare May 19, 2022 20:56
codeboten
codeboten reviewed May 19, 2022
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

Just a few minor comments/suggestion and a question.

CHANGELOG.md Outdated Show resolved Hide resolved
confmap/provider.go Outdated Show resolved Hide resolved
confmap/provider.go Show resolved Hide resolved
confmap/confmap.go Outdated Show resolved Hide resolved
confmap/confmap.go Outdated Show resolved Hide resolved
@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 4 times, most recently from 2bba583 to 61b1f56 Compare May 25, 2022 17:05
@bogdandrutu
Copy link
Member Author

@codeboten @mx-psi all updates done, using confmap.Conf

@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 4 times, most recently from 001e72d to b8734b5 Compare May 26, 2022 20:24
@bogdandrutu bogdandrutu force-pushed the mvconfigmap branch 4 times, most recently from c9392f5 to b947482 Compare May 26, 2022 22:45
codeboten
codeboten approved these changes May 31, 2022
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

👍

@codeboten
Copy link
Contributor

Please resolve conflicts

@bogdandrutu
Move config.Map to its own package which does not depend on any compo…
921e802 
…nent concept

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
@bogdandrutu bogdandrutu merged commit 3356863 into open-telemetry:main May 31, 2022
@bogdandrutu bogdandrutu deleted the mvconfigmap branch May 31, 2022 17:51
bogdandrutu added a commit to bogdandrutu/opentelemetry-collector that referenced this pull request Jun 2, 2022
@bogdandrutu
Deprecate confmap.Received.AsMap in favor of confmap.Received.AsConf
7343c71 
Followup after open-telemetry#5237 when I forgot to change the name of this func accordingly to the new Conf name.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
@bogdandrutu bogdandrutu mentioned this pull request Jun 2, 2022
Merged
bogdandrutu added a commit to bogdandrutu/opentelemetry-collector that referenced this pull request Jun 2, 2022
@bogdandrutu
Deprecate confmap.Received.AsMap in favor of confmap.Received.AsConf
9309905 
Followup after open-telemetry#5237 when I forgot to change the name of this func accordingly to the new Conf name.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu added a commit to bogdandrutu/opentelemetry-collector that referenced this pull request Jun 3, 2022
@bogdandrutu
Deprecate confmap.Received.AsMap in favor of confmap.Received.AsConf
4f151c3 
Followup after open-telemetry#5237 when I forgot to change the name of this func accordingly to the new Conf name.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu added a commit to bogdandrutu/opentelemetry-collector that referenced this pull request Jun 3, 2022
@bogdandrutu
Deprecate confmap.Received.AsMap in favor of confmap.Received.AsConf
0a19e1d 
Followup after open-telemetry#5237 when I forgot to change the name of this func accordingly to the new Conf name.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu added a commit to bogdandrutu/opentelemetry-collector that referenced this pull request Jun 3, 2022
@bogdandrutu
Deprecate confmap.Received.AsMap in favor of confmap.Received.AsConf
475aefe 
Followup after open-telemetry#5237 when I forgot to change the name of this func accordingly to the new Conf name.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeboten codeboten codeboten approved these changes

@mx-psi mx-psi mx-psi approved these changes

@dmitryax dmitryax Awaiting requested review from dmitryax

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bogdandrutu @codeboten @mx-psi