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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

SentryOptions#merge is now public and can be used to load ExternalOptions #2088

Merged
merged 5 commits into from Jun 14, 2022

Conversation

adinauer
Copy link
Member

馃摐 Description

Allows developers to deserialize ExternalOptions and then merge them into SentryOptions.

馃挕 Motivation and Context

Closes #2086

馃挌 How did you test it?

馃摑 Checklist

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

馃敭 Next steps

@adinauer adinauer changed the title Make SentryOptions.merge public SentryOptions.merge is now public and can be used to load ExternalOptions Jun 10, 2022
@@ -1710,7 +1710,7 @@ private SentryOptions(final boolean empty) {
*
* @param options options loaded from external locations
*/
void merge(final @NotNull ExternalOptions options) {
public void merge(final @NotNull ExternalOptions options) {
Copy link
Member Author

Choose a reason for hiding this comment

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

@marandaneto do you see any harm in making this public?

Copy link
Contributor

Choose a reason for hiding this comment

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

If there's a use case on the logging integrations, I'm fine with it, this is not used on Android, so your call.

CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com>
@adinauer adinauer changed the title SentryOptions.merge is now public and can be used to load ExternalOptions SentryOptions#merge is now public and can be used to load ExternalOptions Jun 13, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #2088 (47e8b3b) into main (2ae42b8) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2088   +/-   ##
=========================================
  Coverage     81.11%   81.11%           
  Complexity     3232     3232           
=========================================
  Files           230      230           
  Lines         11850    11850           
  Branches       1572     1572           
=========================================
  Hits           9612     9612           
  Misses         1652     1652           
  Partials        586      586           
Impacted Files Coverage 螖
sentry/src/main/java/io/sentry/SentryOptions.java 81.98% <酶> (酶)

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 2ae42b8...47e8b3b. Read the comment docs.

@adinauer adinauer merged commit fa9aaa4 into main Jun 14, 2022
@adinauer adinauer deleted the feat/make-sentry-options-merge-public branch June 14, 2022 04:49
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.

Can't deserialize SentryOptions from json using jackson blackbird on Openjdk17
4 participants