Merge branch '8.x.x' into feat/hsm-27-discussions

getsentry · Apr 22, 2024 · 2b05019 · 2b05019
2 parents 2f02001 + e0cb935
commit 2b05019
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/ReactorUtils.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/ReactorUtils.java
@@ -8,6 +8,7 @@
 import reactor.core.publisher.Mono;
 import reactor.util.context.Context;
 
+// TODO deprecate and replace with "withSentryScopes" etc.
 @ApiStatus.Experimental
 // TODO do we keep old methods around and deprecate them?
 // TODO do we need to offer isolated variants?

diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryScheduleHook.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryScheduleHook.java
@@ -14,6 +14,7 @@
 @ApiStatus.Experimental
 public final class SentryScheduleHook implements Function<Runnable, Runnable> {
   @Override
+  @SuppressWarnings("deprecation")
   public Runnable apply(final @NotNull Runnable runnable) {
     final IScopes newScopes = Sentry.getCurrentScopes().forkedCurrentScope("spring.scheduleHook");
 

diff --git a/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryScheduleHook.java b/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryScheduleHook.java
@@ -14,6 +14,7 @@
 @ApiStatus.Experimental
 public final class SentryScheduleHook implements Function<Runnable, Runnable> {
   @Override
+  @SuppressWarnings("deprecation")
   public Runnable apply(final @NotNull Runnable runnable) {
     final IScopes newScopes = Sentry.getCurrentScopes().forkedCurrentScope("spring.scheduleHook");
 

diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -794,6 +794,7 @@ public abstract interface class io/sentry/IScope {
 	public abstract fun removeContexts (Ljava/lang/String;)V
 	public abstract fun removeExtra (Ljava/lang/String;)V
 	public abstract fun removeTag (Ljava/lang/String;)V
+	public abstract fun setClient (Lio/sentry/ISentryClient;)V
 	public abstract fun setContexts (Ljava/lang/String;Ljava/lang/Boolean;)V
 	public abstract fun setContexts (Ljava/lang/String;Ljava/lang/Character;)V
 	public abstract fun setContexts (Ljava/lang/String;Ljava/lang/Number;)V
@@ -1449,6 +1450,7 @@ public final class io/sentry/NoOpScope : io/sentry/IScope {
 	public fun removeContexts (Ljava/lang/String;)V
 	public fun removeExtra (Ljava/lang/String;)V
 	public fun removeTag (Ljava/lang/String;)V
+	public fun setClient (Lio/sentry/ISentryClient;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Boolean;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Character;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Number;)V
@@ -1889,6 +1891,7 @@ public final class io/sentry/Scope : io/sentry/IScope {
 	public fun removeContexts (Ljava/lang/String;)V
 	public fun removeExtra (Ljava/lang/String;)V
 	public fun removeTag (Ljava/lang/String;)V
+	public fun setClient (Lio/sentry/ISentryClient;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Boolean;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Character;)V
 	public fun setContexts (Ljava/lang/String;Ljava/lang/Number;)V

diff --git a/sentry/src/main/java/io/sentry/SentryWrapper.java b/sentry/src/main/java/io/sentry/SentryWrapper.java
@@ -58,6 +58,7 @@ public static <U> Callable<U> wrapCallableIsolated(final @NotNull Callable<U> ca
    * @return the wrapped {@link Supplier}
    * @param <U> - the result type of the {@link Supplier}
    */
+  @SuppressWarnings("deprecation")
   public static <U> Supplier<U> wrapSupplier(final @NotNull Supplier<U> supplier) {
     final IScopes newScopes = Sentry.forkedCurrentScope("wrapSupplier");