Avoid forking rootScopes for Reactor if current thread has NoOpScopes

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 8.23.1-alpha.1
 
 ### Fixes
 

gradle.properties

@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.23.0
+versionName=8.23.1-alpha.1
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

sentry-reactor/src/main/java/io/sentry/reactor/SentryReactorThreadLocalAccessor.java

@@ -16,7 +16,11 @@ public Object key() {
 
   @Override
   public IScopes getValue() {
-    return Sentry.getCurrentScopes();
+    if (Sentry.hasScopes()) {
+      return Sentry.getCurrentScopes();
+    } else {
+      return NoOpScopes.getInstance();
+    }
   }
 
   @Override

sentry/api/sentry.api

@@ -2599,6 +2599,7 @@ public final class io/sentry/Sentry {
 	public static fun getLastEventId ()Lio/sentry/protocol/SentryId;
 	public static fun getSpan ()Lio/sentry/ISpan;
 	public static fun getTraceparent ()Lio/sentry/SentryTraceHeader;
+	public static fun hasScopes ()Z
 	public static fun init ()V
 	public static fun init (Lio/sentry/OptionsContainer;Lio/sentry/Sentry$OptionsConfiguration;)V
 	public static fun init (Lio/sentry/OptionsContainer;Lio/sentry/Sentry$OptionsConfiguration;Z)V

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

@@ -112,6 +112,12 @@ private Sentry() {}
     return scopes;
   }
 
+  @ApiStatus.Internal
+  public static boolean hasScopes() {
+    final @Nullable IScopes scopes = getScopesStorage().get();
+    return scopes != null && !scopes.isNoOp();
+  }
+
   private static @NotNull IScopesStorage getScopesStorage() {
     return scopesStorage;
   }