fix(init): Perform less allocation/bytecode instructions in Sentry.init

Author: romtsn

sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java

@@ -1,6 +1,5 @@
 package io.sentry;
 
-import io.sentry.util.Objects;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -16,7 +15,7 @@ public final class DuplicateEventDetectionEventProcessor implements EventProcess
   private final @NotNull SentryOptions options;
 
   public DuplicateEventDetectionEventProcessor(final @NotNull SentryOptions options) {
-    this.options = Objects.requireNonNull(options, "options are required");
+    this.options = options;
   }
 
   @Override

sentry/src/main/java/io/sentry/MainEventProcessor.java

@@ -8,7 +8,6 @@
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.User;
 import io.sentry.util.HintUtils;
-import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,7 +28,7 @@ public final class MainEventProcessor implements EventProcessor, Closeable {
   private volatile @Nullable HostnameCache hostnameCache = null;
 
   public MainEventProcessor(final @NotNull SentryOptions options) {
-    this.options = Objects.requireNonNull(options, "The SentryOptions is required.");
+    this.options = options;
 
     final SentryStackTraceFactory sentryStackTraceFactory =
         new SentryStackTraceFactory(this.options);
@@ -38,17 +37,6 @@ public MainEventProcessor(final @NotNull SentryOptions options) {
     sentryThreadFactory = new SentryThreadFactory(sentryStackTraceFactory);
   }
 
-  MainEventProcessor(
-      final @NotNull SentryOptions options,
-      final @NotNull SentryThreadFactory sentryThreadFactory,
-      final @NotNull SentryExceptionFactory sentryExceptionFactory) {
-    this.options = Objects.requireNonNull(options, "The SentryOptions is required.");
-    this.sentryThreadFactory =
-        Objects.requireNonNull(sentryThreadFactory, "The SentryThreadFactory is required.");
-    this.sentryExceptionFactory =
-        Objects.requireNonNull(sentryExceptionFactory, "The SentryExceptionFactory is required.");
-  }
-
   @Override
   public @NotNull SentryEvent process(final @NotNull SentryEvent event, final @NotNull Hint hint) {
     setCommons(event);

sentry/src/main/java/io/sentry/SentryExceptionFactory.java

@@ -6,7 +6,6 @@
 import io.sentry.protocol.SentryStackFrame;
 import io.sentry.protocol.SentryStackTrace;
 import io.sentry.protocol.SentryThread;
-import io.sentry.util.Objects;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
@@ -31,8 +30,7 @@ public final class SentryExceptionFactory {
    * @param sentryStackTraceFactory the sentryStackTraceFactory
    */
   public SentryExceptionFactory(final @NotNull SentryStackTraceFactory sentryStackTraceFactory) {
-    this.sentryStackTraceFactory =
-        Objects.requireNonNull(sentryStackTraceFactory, "The SentryStackTraceFactory is required.");
+    this.sentryStackTraceFactory = sentryStackTraceFactory;
   }
 
   @NotNull

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

@@ -655,6 +655,24 @@ public void activate() {
       executorService = new SentryExecutorService(this);
       executorService.prewarm();
     }
+
+    // SpotlightIntegration is loaded via reflection to allow the sentry-spotlight module
+    // to be excluded from release builds, preventing insecure HTTP URLs from appearing in APKs
+    try {
+      final Class<?> clazz = Class.forName("io.sentry.spotlight.SpotlightIntegration");
+      boolean alreadyRegistered = false;
+      for (final Integration integration : integrations) {
+        if (clazz.isInstance(integration)) {
+          alreadyRegistered = true;
+          break;
+        }
+      }
+      if (!alreadyRegistered) {
+        integrations.add((Integration) clazz.getConstructor().newInstance());
+      }
+    } catch (Throwable ignored) {
+      // SpotlightIntegration not available
+    }
   }
 
   /**
@@ -3340,16 +3358,6 @@ private SentryOptions(final boolean empty) {
 
       integrations.add(new ShutdownHookIntegration());
 
-      // SpotlightIntegration is loaded via reflection to allow the sentry-spotlight module
-      // to be excluded from release builds, preventing insecure HTTP URLs from appearing in APKs
-      try {
-        final Class<?> clazz = Class.forName("io.sentry.spotlight.SpotlightIntegration");
-        final Integration spotlight = (Integration) clazz.getConstructor().newInstance();
-        integrations.add(spotlight);
-      } catch (Throwable ignored) {
-        // SpotlightIntegration not available
-      }
-
       eventProcessors.add(new MainEventProcessor(this));
       eventProcessors.add(new DuplicateEventDetectionEventProcessor(this));
 

sentry/src/main/java/io/sentry/SentryThreadFactory.java

@@ -3,7 +3,6 @@
 import io.sentry.protocol.SentryStackFrame;
 import io.sentry.protocol.SentryStackTrace;
 import io.sentry.protocol.SentryThread;
-import io.sentry.util.Objects;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -26,8 +25,7 @@ public final class SentryThreadFactory {
    * @param sentryStackTraceFactory the SentryStackTraceFactory
    */
   public SentryThreadFactory(final @NotNull SentryStackTraceFactory sentryStackTraceFactory) {
-    this.sentryStackTraceFactory =
-        Objects.requireNonNull(sentryStackTraceFactory, "The SentryStackTraceFactory is required.");
+    this.sentryStackTraceFactory = sentryStackTraceFactory;
   }
 
   /**

sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java

@@ -44,7 +44,7 @@ public UncaughtExceptionHandlerIntegration() {
   }
 
   UncaughtExceptionHandlerIntegration(final @NotNull UncaughtExceptionHandler threadAdapter) {
-    this.threadAdapter = Objects.requireNonNull(threadAdapter, "threadAdapter is required.");
+    this.threadAdapter = threadAdapter;
   }
 
   @Override