Hubs/Scopes Merge 19 - Add pushIsolationScope and fork methods

sentry/api/sentry.api

@@ -580,59 +580,6 @@ public final class io/sentry/HubScopesWrapper : io/sentry/IHub {
 	public fun withScope (Lio/sentry/ScopeCallback;)V
 }
 
-public final class io/sentry/HubScopesWrapper : io/sentry/IHub {
-	public fun <init> (Lio/sentry/IScopes;)V
-	public fun addBreadcrumb (Lio/sentry/Breadcrumb;)V
-	public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V
-	public fun bindClient (Lio/sentry/ISentryClient;)V
-	public fun captureCheckIn (Lio/sentry/CheckIn;)Lio/sentry/protocol/SentryId;
-	public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId;
-	public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId;
-	public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;Lio/sentry/ScopeCallback;)Lio/sentry/protocol/SentryId;
-	public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId;
-	public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;Lio/sentry/ScopeCallback;)Lio/sentry/protocol/SentryId;
-	public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId;
-	public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;Lio/sentry/ScopeCallback;)Lio/sentry/protocol/SentryId;
-	public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceContext;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId;
-	public fun captureUserFeedback (Lio/sentry/UserFeedback;)V
-	public fun clearBreadcrumbs ()V
-	public fun clone ()Lio/sentry/IHub;
-	public synthetic fun clone ()Ljava/lang/Object;
-	public fun close ()V
-	public fun close (Z)V
-	public fun configureScope (Lio/sentry/ScopeCallback;)V
-	public fun continueTrace (Ljava/lang/String;Ljava/util/List;)Lio/sentry/TransactionContext;
-	public fun endSession ()V
-	public fun flush (J)V
-	public fun getBaggage ()Lio/sentry/BaggageHeader;
-	public fun getLastEventId ()Lio/sentry/protocol/SentryId;
-	public fun getOptions ()Lio/sentry/SentryOptions;
-	public fun getRateLimiter ()Lio/sentry/transport/RateLimiter;
-	public fun getSpan ()Lio/sentry/ISpan;
-	public fun getTraceparent ()Lio/sentry/SentryTraceHeader;
-	public fun getTransaction ()Lio/sentry/ITransaction;
-	public fun isCrashedLastRun ()Ljava/lang/Boolean;
-	public fun isEnabled ()Z
-	public fun isHealthy ()Z
-	public fun metrics ()Lio/sentry/metrics/MetricsApi;
-	public fun popScope ()V
-	public fun pushScope ()V
-	public fun removeExtra (Ljava/lang/String;)V
-	public fun removeTag (Ljava/lang/String;)V
-	public fun reportFullyDisplayed ()V
-	public fun setExtra (Ljava/lang/String;Ljava/lang/String;)V
-	public fun setFingerprint (Ljava/util/List;)V
-	public fun setLevel (Lio/sentry/SentryLevel;)V
-	public fun setSpanContext (Ljava/lang/Throwable;Lio/sentry/ISpan;Ljava/lang/String;)V
-	public fun setTag (Ljava/lang/String;Ljava/lang/String;)V
-	public fun setTransaction (Ljava/lang/String;)V
-	public fun setUser (Lio/sentry/protocol/User;)V
-	public fun startSession ()V
-	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/TransactionOptions;)Lio/sentry/ITransaction;
-	public fun traceHeaders ()Lio/sentry/SentryTraceHeader;
-	public fun withScope (Lio/sentry/ScopeCallback;)V
-}
-
 public abstract interface class io/sentry/IConnectionStatusProvider {
 	public abstract fun addConnectionStatusObserver (Lio/sentry/IConnectionStatusProvider$IConnectionStatusObserver;)Z
 	public abstract fun getConnectionStatus ()Lio/sentry/IConnectionStatusProvider$ConnectionStatus;

sentry/src/main/java/io/sentry/Hub.java

@@ -539,6 +539,11 @@ public void removeExtra(final @NotNull String key) {
     return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
   }
 
+  @Override
+  public @NotNull ISentryLifecycleToken pushIsolationScope() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
   @Override
   public @NotNull SentryOptions getOptions() {
     return this.stack.peek().getOptions();
@@ -652,6 +657,31 @@ public void flush(long timeoutMillis) {
     return new Hub(this.options, new Stack(this.stack));
   }
 
+  @Override
+  public @NotNull IScopes forkedScopes(@NotNull String creator) {
+    return Sentry.forkedScopes(creator);
+  }
+
+  @Override
+  public @NotNull IScopes forkedCurrentScope(@NotNull String creator) {
+    return Sentry.forkedCurrentScope(creator);
+  }
+
+  @Override
+  public @NotNull ISentryLifecycleToken makeCurrent() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getScope() {
+    return Sentry.getCurrentScopes().getScope();
+  }
+
+  @Override
+  public @NotNull IScope getIsolationScope() {
+    return Sentry.getCurrentScopes().getIsolationScope();
+  }
+
   @ApiStatus.Internal
   @Override
   public @NotNull SentryId captureTransaction(

sentry/src/main/java/io/sentry/HubAdapter.java

@@ -158,6 +158,11 @@ public void removeExtra(@NotNull String key) {
     return Sentry.pushScope();
   }
 
+  @Override
+  public @NotNull ISentryLifecycleToken pushIsolationScope() {
+    return Sentry.pushIsolationScope();
+  }
+
   @Override
   public void popScope() {
     Sentry.popScope();
@@ -193,6 +198,32 @@ public void flush(long timeoutMillis) {
     return Sentry.getCurrentScopes().clone();
   }
 
+  @Override
+  public @NotNull IScopes forkedScopes(@NotNull String creator) {
+    return Sentry.forkedScopes(creator);
+  }
+
+  @Override
+  public @NotNull IScopes forkedCurrentScope(@NotNull String creator) {
+    return Sentry.forkedCurrentScope(creator);
+  }
+
+  @Override
+  public @NotNull ISentryLifecycleToken makeCurrent() {
+    // TODO this wouldn't do anything since it replaced the current with the same Scopes
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getScope() {
+    return Sentry.getCurrentScopes().getScope();
+  }
+
+  @Override
+  public @NotNull IScope getIsolationScope() {
+    return Sentry.getCurrentScopes().getIsolationScope();
+  }
+
   @Override
   public @NotNull SentryId captureTransaction(
       @NotNull SentryTransaction transaction,

sentry/src/main/java/io/sentry/HubScopesWrapper.java

@@ -153,6 +153,11 @@ public void removeExtra(@NotNull String key) {
     return scopes.pushScope();
   }
 
+  @Override
+  public @NotNull ISentryLifecycleToken pushIsolationScope() {
+    return scopes.pushIsolationScope();
+  }
+
   @Override
   public void popScope() {
     scopes.popScope();
@@ -188,6 +193,31 @@ public void flush(long timeoutMillis) {
     return scopes.clone();
   }
 
+  @Override
+  public @NotNull IScopes forkedScopes(@NotNull String creator) {
+    return scopes.forkedScopes(creator);
+  }
+
+  @Override
+  public @NotNull IScopes forkedCurrentScope(@NotNull String creator) {
+    return scopes.forkedCurrentScope(creator);
+  }
+
+  @Override
+  public @NotNull ISentryLifecycleToken makeCurrent() {
+    return scopes.makeCurrent();
+  }
+
+  @Override
+  public @NotNull IScope getScope() {
+    return scopes.getScope();
+  }
+
+  @Override
+  public @NotNull IScope getIsolationScope() {
+    return scopes.getIsolationScope();
+  }
+
   @ApiStatus.Internal
   @Override
   public @NotNull SentryId captureTransaction(

sentry/src/main/java/io/sentry/IScopes.java

@@ -309,6 +309,9 @@ default void addBreadcrumb(@NotNull String message, @NotNull String category) {
   @NotNull
   ISentryLifecycleToken pushScope();
 
+  @NotNull
+  ISentryLifecycleToken pushIsolationScope();
+
   /** Removes the first scope */
   void popScope();
 
@@ -354,12 +357,54 @@ default void addBreadcrumb(@NotNull String message, @NotNull String category) {
   /**
    * Clones the Hub
    *
+   * @deprecated please use {@link IScopes#forkedScopes(String)} or {@link
+   *     IScopes#forkedCurrentScope(String)} instead.
    * @return the cloned Hub
    */
   @NotNull
   @Deprecated
   IHub clone();
 
+  /**
+   * Creates a fork of both current and isolation scope.
+   *
+   * @param creator debug information to see why scopes where forked
+   * @return forked Scopes
+   */
+  @NotNull
+  IScopes forkedScopes(final @NotNull String creator);
+
+  /**
+   * Creates a fork of current scope without forking isolation scope.
+   *
+   * @param creator debug information to see why scopes where forked
+   * @return forked Scopes
+   */
+  @NotNull
+  IScopes forkedCurrentScope(final @NotNull String creator);
+
+  /**
+   * Stores this Scopes in store, making it the current one that is used by static API.
+   *
+   * @return a token you should call .close() on when you're done.
+   */
+  @NotNull
+  ISentryLifecycleToken makeCurrent();
+
+  /**
+   * Returns the current scope of this Scopes.
+   *
+   * @return scope
+   */
+  public @NotNull IScope getScope();
+
+  /**
+   * Returns the isolation scope of this Scopes.
+   *
+   * @return isolation scope
+   */
+  public @NotNull IScope getIsolationScope();
+
   /**
    * Captures the transaction and enqueues it for sending to Sentry server.
    *

sentry/src/main/java/io/sentry/NoOpHub.java

@@ -128,6 +128,11 @@ public void removeExtra(@NotNull String key) {}
     return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
   }
 
+  @Override
+  public @NotNull ISentryLifecycleToken pushIsolationScope() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
   @Override
   public void popScope() {}
 
@@ -155,6 +160,31 @@ public void flush(long timeoutMillis) {}
     return instance;
   }
 
+  @Override
+  public @NotNull IScopes forkedScopes(@NotNull String creator) {
+    return NoOpScopes.getInstance();
+  }
+
+  @Override
+  public @NotNull IScopes forkedCurrentScope(@NotNull String creator) {
+    return NoOpScopes.getInstance();
+  }
+
+  @Override
+  public @NotNull ISentryLifecycleToken makeCurrent() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getScope() {
+    return NoOpScope.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getIsolationScope() {
+    return NoOpScope.getInstance();
+  }
+
   @Override
   public @NotNull SentryId captureTransaction(
       final @NotNull SentryTransaction transaction,

sentry/src/main/java/io/sentry/NoOpScopes.java

@@ -126,6 +126,11 @@ public void removeExtra(@NotNull String key) {}
     return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
   }
 
+  @Override
+  public @NotNull ISentryLifecycleToken pushIsolationScope() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
   @Override
   public void popScope() {}
 
@@ -154,6 +159,31 @@ public void flush(long timeoutMillis) {}
     return NoOpHub.getInstance();
   }
 
+  @Override
+  public @NotNull IScopes forkedScopes(@NotNull String creator) {
+    return NoOpScopes.getInstance();
+  }
+
+  @Override
+  public @NotNull IScopes forkedCurrentScope(@NotNull String creator) {
+    return NoOpScopes.getInstance();
+  }
+
+  @Override
+  public @NotNull ISentryLifecycleToken makeCurrent() {
+    return NoOpScopesStorage.NoOpScopesLifecycleToken.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getScope() {
+    return NoOpScope.getInstance();
+  }
+
+  @Override
+  public @NotNull IScope getIsolationScope() {
+    return NoOpScope.getInstance();
+  }
+
   @Override
   public @NotNull SentryId captureTransaction(
       final @NotNull SentryTransaction transaction,