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

* Make SentryOptions.merge public

* Add changelog

* Update CHANGELOG.md

Co-authored-by: Manoel Aranda Neto <[email protected]>

Co-authored-by: Manoel Aranda Neto <[email protected]>

Author: adinauer

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 - Implement local scope by adding overloads to the capture methods that accept a ScopeCallback ([#2084](https://github.com/getsentry/sentry-java/pull/2084))
+- SentryOptions#merge is now public and can be used to load ExternalOptions ([#2088](https://github.com/getsentry/sentry-java/pull/2088))
 
 ### Fixes
 

sentry/api/sentry.api

@@ -1240,6 +1240,7 @@ public class io/sentry/SentryOptions {
 	public fun isSendDefaultPii ()Z
 	public fun isTraceSampling ()Z
 	public fun isTracingEnabled ()Z
+	public fun merge (Lio/sentry/ExternalOptions;)V
 	public fun setAttachServerName (Z)V
 	public fun setAttachStacktrace (Z)V
 	public fun setAttachThreads (Z)V

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -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) {
     if (options.getDsn() != null) {
       setDsn(options.getDsn());
     }