Merge 400b60e into cb8746c

Author: adinauer

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -15,6 +15,7 @@
 import io.sentry.SendFireAndForgetEnvelopeSender;
 import io.sentry.SendFireAndForgetOutboxSender;
 import io.sentry.SentryLevel;
+import io.sentry.SentryOpenTelemetryMode;
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
 import io.sentry.android.core.internal.gestures.AndroidViewGestureTargetLocator;
@@ -101,7 +102,7 @@ static void loadDefaultAndMetadataOptions(
     options.setLogger(logger);
 
     options.setDefaultScopeType(ScopeType.CURRENT);
-
+    options.setOpenTelemetryMode(SentryOpenTelemetryMode.OFF);
     options.setDateProvider(new SentryAndroidDateProvider());
 
     // set a lower flush timeout on Android to avoid ANRs

sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt

@@ -250,7 +250,7 @@ open class App {
     open fun optionsCallback() = Sentry.OptionsConfiguration<SentryOptions> { options ->
         // due to OTel being on the classpath we need to set the default again
         options.spanFactory = DefaultSpanFactory()
-        options.openTelemetryMode = SentryOpenTelemetryMode.ALL_ORIGINS
+        options.openTelemetryMode = SentryOpenTelemetryMode.OFF
     }
 }
 

sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/it/SentrySpringIntegrationTest.kt

@@ -251,7 +251,7 @@ open class App {
         // due to OTel being on the classpath we need to set the default again
         options.spanFactory = DefaultSpanFactory()
         // to test the actual spring implementation
-        options.openTelemetryMode = SentryOpenTelemetryMode.ALL_ORIGINS
+        options.openTelemetryMode = SentryOpenTelemetryMode.OFF
     }
 }
 

sentry/api/sentry.api

@@ -2785,8 +2785,8 @@ public final class io/sentry/SentryOpenTelemetryMode : java/lang/Enum {
 	public static final field AGENT Lio/sentry/SentryOpenTelemetryMode;
 	public static final field AGENTLESS Lio/sentry/SentryOpenTelemetryMode;
 	public static final field AGENTLESS_SPRING Lio/sentry/SentryOpenTelemetryMode;
-	public static final field ALL_ORIGINS Lio/sentry/SentryOpenTelemetryMode;
 	public static final field AUTO Lio/sentry/SentryOpenTelemetryMode;
+	public static final field OFF Lio/sentry/SentryOpenTelemetryMode;
 	public static fun valueOf (Ljava/lang/String;)Lio/sentry/SentryOpenTelemetryMode;
 	public static fun values ()[Lio/sentry/SentryOpenTelemetryMode;
 }

sentry/src/main/java/io/sentry/Sentry.java

@@ -47,8 +47,7 @@ public final class Sentry {
   private Sentry() {}
 
   // TODO logger?
-  private static volatile @NotNull IScopesStorage scopesStorage =
-      ScopesStorageFactory.create(new LoadClass(), NoOpLogger.getInstance());
+  private static volatile @NotNull IScopesStorage scopesStorage = NoOpScopesStorage.getInstance();
 
   /** The root Scopes or NoOp if Sentry is disabled. */
   private static volatile @NotNull IScopes rootScopes = NoOpScopes.getInstance();
@@ -301,6 +300,8 @@ private static void init(final @NotNull SentryOptions options, final boolean glo
                   "Sentry has been already initialized. Previous configuration will be overwritten.");
         }
 
+        initForOpenTelemetryMaybe(options);
+
         // load lazy fields of the options in a separate thread
         try {
           options.getExecutorService().submit(() -> options.loadLazyFields());
@@ -357,6 +358,27 @@ private static void init(final @NotNull SentryOptions options, final boolean glo
     }
   }
 
+  private static void initForOpenTelemetryMaybe(SentryOptions options) {
+    if (SentryOpenTelemetryMode.OFF == options.getOpenTelemetryMode()) {
+      options.setSpanFactory(new DefaultSpanFactory());
+//    } else {
+      // enabling this causes issues with agentless where OTel spans seem to be randomly ended
+//      options.setSpanFactory(SpanFactoryFactory.create(new LoadClass(), NoOpLogger.getInstance()));
+    }
+    initScopesStorage(options);
+    OpenTelemetryUtil.applyIgnoredSpanOrigins(options, new LoadClass());
+  }
+
+  @SuppressWarnings("UnusedMethod")
+  private static void initScopesStorage(SentryOptions options) {
+    getScopesStorage().close();
+    if (SentryOpenTelemetryMode.OFF == options.getOpenTelemetryMode()) {
+      scopesStorage = new DefaultScopesStorage();
+    } else {
+      scopesStorage = ScopesStorageFactory.create(new LoadClass(), options.getLogger());
+    }
+  }
+
   @SuppressWarnings("FutureReturnValueIgnored")
   private static void handleAppStartProfilingConfig(
       final @NotNull SentryOptions options,
@@ -491,8 +513,6 @@ private static void initConfigurations(final @NotNull SentryOptions options) {
     }
     logger.log(SentryLevel.INFO, "Initializing SDK with DSN: '%s'", options.getDsn());
 
-    OpenTelemetryUtil.applyIgnoredSpanOrigins(options, new LoadClass());
-
     // TODO: read values from conf file, Build conf or system envs
     // eg release, distinctId, sentryClientName
 

sentry/src/main/java/io/sentry/SentryOpenTelemetryMode.java

@@ -5,16 +5,13 @@
  * use it and what way to use it in.
  */
 public enum SentryOpenTelemetryMode {
-  /** Let the SDK figure out what mode OpenTelemetry is in and whether to even use OpenTelemetry */
-  AUTO,
   /**
-   * For now this only means no span origins will be ignored. This does however not mean, the SDK
-   * won't try tro use OpenTelemetry if available.
-   *
-   * <p>Due to some parts of the SDK being initialized before any config mechanism is available, we
-   * cannot completely disable the OpenTelemetry parts with this setting.
+   * Let the SDK figure out what mode OpenTelemetry is in and whether to even use OpenTelemetry This
+   * is the default for non Android.
    */
-  ALL_ORIGINS,
+  AUTO,
+  /** Do not try to use OpenTelemetry, even if it is available. This is the default for Android. */
+  OFF,
   /** The `sentry-opentelemetry-agent` is used */
   AGENT,
   /**

sentry/src/test/java/io/sentry/HubAdapterTest.kt

@@ -19,6 +19,11 @@ class HubAdapterTest {
 
     @BeforeTest
     fun `set up`() {
+        Sentry.init(
+            SentryOptions().apply {
+                dsn = "https://key@localhost/proj"
+            }
+        )
         Sentry.setCurrentScopes(scopes)
     }
 

sentry/src/test/java/io/sentry/ScopesAdapterTest.kt

@@ -19,6 +19,11 @@ class ScopesAdapterTest {
 
     @BeforeTest
     fun `set up`() {
+        Sentry.init(
+            SentryOptions().apply {
+                dsn = "https://key@localhost/proj"
+            }
+        )
         Sentry.setCurrentScopes(scopes)
     }