Drop reflection, bind to SentryOptions in Logback integration.

sentry-core/src/main/java/io/sentry/core/SentryCommonOptions.java

@@ -3,7 +3,6 @@
 import static io.sentry.core.SentryOptions.DEFAULT_DIAGNOSTIC_LEVEL;
 
 import com.jakewharton.nopen.annotation.Open;
-import io.sentry.core.util.ReflectionUtils;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.jetbrains.annotations.NotNull;
@@ -107,7 +106,42 @@ public class SentryCommonOptions {
    * @param options the instance of {@link SentryOptions} to apply the configuration to
    */
   public void applyTo(SentryOptions options) {
-    ReflectionUtils.copyNonNullFields(this, options);
+    if (dsn != null) {
+      options.setDsn(dsn);
+    }
+    if (environment != null) {
+      options.setEnvironment(environment);
+    }
+    if (sampleRate != null) {
+      options.setSampleRate(sampleRate);
+    }
+    if (dist != null) {
+      options.setDist(dist);
+    }
+    if (release != null) {
+      options.setRelease(release);
+    }
+    if (sampleRate != null) {
+      options.setSampleRate(sampleRate);
+    }
+    if (serverName != null) {
+      options.setServerName(serverName);
+    }
+    for (String inAppExclude : inAppExcludes) {
+      options.addInAppExclude(inAppExclude);
+    }
+    for (String inAppInclude : inAppIncludes) {
+      options.addInAppInclude(inAppInclude);
+    }
+    options.setMaxBreadcrumbs(maxBreadcrumbs);
+    options.setShutdownTimeout(shutdownTimeout);
+    options.setFlushTimeoutMillis(flushTimeoutMillis);
+    options.setReadTimeoutMillis(readTimeoutMillis);
+    options.setBypassSecurity(bypassSecurity);
+    options.setDebug(debug);
+    options.setAttachThreads(attachThreads);
+    options.setAttachStacktrace(attachStacktrace);
+    options.setDiagnosticLevel(diagnosticLevel);
   }
 
   /**

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

@@ -6,7 +6,6 @@
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import io.sentry.core.DateUtils;
 import io.sentry.core.Sentry;
-import io.sentry.core.SentryCommonOptions;
 import io.sentry.core.SentryEvent;
 import io.sentry.core.SentryLevel;
 import io.sentry.core.SentryOptions;
@@ -28,19 +27,16 @@
 
 /** Appender for logback in charge of sending the logged events to a Sentry server. */
 public final class SentryAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
-  private @Nullable SentryCommonOptions options;
+  private @Nullable SentryOptions options;
   private @Nullable ITransport transport;
 
   @Override
   public void start() {
     if (options != null && options.getDsn() != null) {
-      Sentry.init(
-          sentryOptions -> {
-            options.applyTo(sentryOptions);
-            sentryOptions.setSentryClientName(BuildConfig.SENTRY_LOGBACK_SDK_NAME);
-            sentryOptions.setSdkVersion(createSdkVersion(sentryOptions));
-            Optional.ofNullable(transport).ifPresent(sentryOptions::setTransport);
-          });
+      options.setSentryClientName(BuildConfig.SENTRY_LOGBACK_SDK_NAME);
+      options.setSdkVersion(createSdkVersion(options));
+      Optional.ofNullable(transport).ifPresent(options::setTransport);
+      Sentry.init(options);
     }
     super.start();
   }
@@ -130,7 +126,7 @@ protected void append(@NotNull ILoggingEvent eventObject) {
     return sdkVersion;
   }
 
-  public void setOptions(@Nullable SentryCommonOptions options) {
+  public void setOptions(@Nullable SentryOptions options) {
     this.options = options;
   }
 

sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt

@@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.check
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import io.sentry.core.SentryCommonOptions
 import io.sentry.core.SentryEvent
 import io.sentry.core.SentryLevel
+import io.sentry.core.SentryOptions
 import io.sentry.core.transport.ITransport
 import io.sentry.core.transport.TransportResult
 import java.time.Instant
@@ -37,7 +37,7 @@ class SentryAppenderTest {
             whenever(transport.send(any<SentryEvent>())).thenReturn(TransportResult.success())
 
             val appender = SentryAppender()
-            val options = SentryCommonOptions()
+            val options = SentryOptions()
             options.dsn = "http://key@localhost/proj"
             appender.setOptions(options)
             appender.context = loggerContext

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java

@@ -30,7 +30,7 @@ public class SentryAutoConfiguration {
   /** Registers general purpose Sentry related beans. */
   @Configuration
   @ConditionalOnProperty("sentry.dsn")
-  @EnableConfigurationProperties(SentryProperties.class)
+  @EnableConfigurationProperties(SentrySpringProperties.class)
   @Open
   static class HubConfiguration {
 
@@ -57,7 +57,7 @@ static class HubConfiguration {
     @Bean
     public @NotNull SentryOptions sentryOptions(
         final @NotNull Sentry.OptionsConfiguration<SentryOptions> optionsConfiguration,
-        final @NotNull SentryProperties properties,
+        final @NotNull SentrySpringProperties properties,
         final @NotNull ObjectProvider<GitProperties> gitProperties) {
       final SentryOptions options = new SentryOptions();
       optionsConfiguration.configure(options);

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryProperties.java → sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentrySpringProperties.java

@@ -7,7 +7,7 @@
 /** Configuration for Sentry integration. */
 @ConfigurationProperties(prefix = "sentry")
 @Open
-public class SentryProperties extends SentryCommonOptions {
+public class SentrySpringProperties extends SentryCommonOptions {
   /** Whether Sentry integration should be enabled. */
   private boolean enabled = true;