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

Merge external map properties #1656

Merged
merged 2 commits into from
Aug 18, 2021
Merged

Merge external map properties #1656

merged 2 commits into from
Aug 18, 2021

Conversation

maciejwalkowiak
Copy link
Contributor

📜 Description

Merge external map properties

💡 Motivation and Context

Fixes #874

Now tags can be set in multiple places: some in properties file, some in env variables. The resulting options will contain tags from all places.

💚 How did you test it?

Unit tests

📝 Checklist

  • I reviewed the submitted code
  • I added tests to verify the changes
  • I updated the docs if needed
  • No breaking changes

Not breaking in terms of compilation, but resulting tags can differ if they were set in different places (unlikely though).

🔮 Next steps

The order of loading properties can (and probably should) be changed. Providers order by priority I think should be:

  • system property
  • properties files
  • environment variables

@codecov-commenter
Copy link

codecov-commenter commented Aug 18, 2021

Codecov Report

Merging #1656 (73ce1da) into main (fd71717) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #1656      +/-   ##
============================================
- Coverage     75.74%   75.74%   -0.01%     
+ Complexity     2017     2016       -1     
============================================
  Files           206      206              
  Lines          7038     7037       -1     
  Branches        699      699              
============================================
- Hits           5331     5330       -1     
  Misses         1369     1369              
  Partials        338      338              
Impacted Files Coverage Δ
.../io/sentry/config/CompositePropertiesProvider.java 100.00% <100.00%> (ø)

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 fd71717...73ce1da. Read the comment docs.

Copy link
Contributor

@marandaneto marandaneto left a comment

Choose a reason for hiding this comment

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

left a suggestion but LGTM

@maciejwalkowiak maciejwalkowiak merged commit d9f2498 into main Aug 18, 2021
@maciejwalkowiak maciejwalkowiak deleted the gh-874 branch August 18, 2021 14:31
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.

Unable to set tags at different levels
3 participants