fix changelog; replace hasScopes with bool param on getCurrentScopes

Author: adinauer

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 8.23.1-alpha.1
+## Unreleased
 
 ### Features
 
@@ -29,6 +29,8 @@
 - Fix profilerId propagation ([#4833](https://github.com/getsentry/sentry-java/pull/4833))
 - Fix profiling init for Spring and Spring Boot w Agent auto-init ([#4815](https://github.com/getsentry/sentry-java/pull/4815))
 - Copy active span on scope clone ([#4878](https://github.com/getsentry/sentry-java/pull/4878))
+- Avoid forking `rootScopes` for Reactor if current thread has NoOpScopes ([#4793](https://github.com/getsentry/sentry-java/pull/4793))
+  - This reduces the SDKs overhead by avoiding unnecessary scope forks
 
 ### Improvements
 

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

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

sentry/api/sentry.api

@@ -2631,11 +2631,11 @@ public final class io/sentry/Sentry {
 	public static fun getBaggage ()Lio/sentry/BaggageHeader;
 	public static fun getCurrentHub ()Lio/sentry/IHub;
 	public static fun getCurrentScopes ()Lio/sentry/IScopes;
+	public static fun getCurrentScopes (Z)Lio/sentry/IScopes;
 	public static fun getGlobalScope ()Lio/sentry/IScope;
 	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

@@ -97,26 +97,37 @@ private Sentry() {}
     return new HubScopesWrapper(getCurrentScopes());
   }
 
-  @ApiStatus.Internal // exposed for the coroutines integration in SentryContext
+  @ApiStatus.Internal
   @SuppressWarnings("deprecation")
   public static @NotNull IScopes getCurrentScopes() {
+    return getCurrentScopes(true);
+  }
+
+  /**
+   * Returns the current contexts scopes.
+   *
+   * @param ensureForked if true, forks root scopes in case there are no scopes for this context if
+   *     false, returns NoOpScopes if there are no scopes for this context
+   * @return current scopes, a root scopes fork or NoopScopes
+   */
+  @ApiStatus.Internal
+  @SuppressWarnings("deprecation")
+  public static @NotNull IScopes getCurrentScopes(final boolean ensureForked) {
     if (globalHubMode) {
       return rootScopes;
     }
     @Nullable IScopes scopes = getScopesStorage().get();
     if (scopes == null || scopes.isNoOp()) {
-      scopes = rootScopes.forkedScopes("getCurrentScopes");
-      getScopesStorage().set(scopes);
+      if (!ensureForked) {
+        return NoOpScopes.getInstance();
+      } else {
+        scopes = rootScopes.forkedScopes("getCurrentScopes");
+        getScopesStorage().set(scopes);
+      }
     }
     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;
   }