Merge branch 'main' into rz/fix/tests-cleanup

Author: romtsn

CHANGELOG.md

@@ -25,10 +25,9 @@
         debugImplementation("io.sentry:sentry-spotlight:<version>")
     }
     ```
-
-### Fixes
-
 - Fix scroll target detection for Jetpack Compose ([#5017](https://github.com/getsentry/sentry-java/pull/5017))
+- No longer fork Sentry `Scopes` for `reactor-kafka` consumer poll `Runnable` ([#5080](https://github.com/getsentry/sentry-java/pull/5080))
+  - This was causing a memory leak because `reactor-kafka`'s poll event reschedules itself infinitely, and each invocation of `SentryScheduleHook` created forked scopes with a parent reference, building an unbounded chain that couldn't be garbage collected.
 
 ### Internal
 

sentry-spring-7/src/main/java/io/sentry/spring7/webflux/SentryScheduleHook.java

@@ -13,8 +13,27 @@
  */
 @ApiStatus.Experimental
 public final class SentryScheduleHook implements Function<Runnable, Runnable> {
+
+  /**
+   * Runnable class names that should be excluded from scope forking. These are typically internal
+   * scheduler loops that reschedule themselves indefinitely, which would cause memory issues due to
+   * scope parent chain buildup.
+   *
+   * @see <a href="https://github.com/getsentry/sentry-java/issues/5051">GitHub Issue #5051</a>
+   */
+  private static final String[] EXCLUDED_RUNNABLE_PREFIXES = {
+    "reactor.kafka.receiver.internals.ConsumerEventLoop"
+  };
+
   @Override
   public Runnable apply(final @NotNull Runnable runnable) {
+    final String runnableClassName = runnable.getClass().getName();
+    for (final String excludedPrefix : EXCLUDED_RUNNABLE_PREFIXES) {
+      if (runnableClassName.startsWith(excludedPrefix)) {
+        return runnable;
+      }
+    }
+
     final IScopes newScopes = Sentry.getCurrentScopes().forkedCurrentScope("spring.scheduleHook");
 
     return () -> {

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryScheduleHook.java

@@ -13,8 +13,27 @@
  */
 @ApiStatus.Experimental
 public final class SentryScheduleHook implements Function<Runnable, Runnable> {
+
+  /**
+   * Runnable class names that should be excluded from scope forking. These are typically internal
+   * scheduler loops that reschedule themselves indefinitely, which would cause memory issues due to
+   * scope parent chain buildup.
+   *
+   * @see <a href="https://github.com/getsentry/sentry-java/issues/5051">GitHub Issue #5051</a>
+   */
+  private static final String[] EXCLUDED_RUNNABLE_PREFIXES = {
+    "reactor.kafka.receiver.internals.ConsumerEventLoop"
+  };
+
   @Override
   public Runnable apply(final @NotNull Runnable runnable) {
+    final String runnableClassName = runnable.getClass().getName();
+    for (final String excludedPrefix : EXCLUDED_RUNNABLE_PREFIXES) {
+      if (runnableClassName.startsWith(excludedPrefix)) {
+        return runnable;
+      }
+    }
+
     final IScopes newScopes = Sentry.getCurrentScopes().forkedCurrentScope("spring.scheduleHook");
 
     return () -> {

sentry-spring/src/main/java/io/sentry/spring/webflux/SentryScheduleHook.java

@@ -13,8 +13,27 @@
  */
 @ApiStatus.Experimental
 public final class SentryScheduleHook implements Function<Runnable, Runnable> {
+
+  /**
+   * Runnable class names that should be excluded from scope forking. These are typically internal
+   * scheduler loops that reschedule themselves indefinitely, which would cause memory issues due to
+   * scope parent chain buildup.
+   *
+   * @see <a href="https://github.com/getsentry/sentry-java/issues/5051">GitHub Issue #5051</a>
+   */
+  private static final String[] EXCLUDED_RUNNABLE_PREFIXES = {
+    "reactor.kafka.receiver.internals.ConsumerEventLoop"
+  };
+
   @Override
   public Runnable apply(final @NotNull Runnable runnable) {
+    final String runnableClassName = runnable.getClass().getName();
+    for (final String excludedPrefix : EXCLUDED_RUNNABLE_PREFIXES) {
+      if (runnableClassName.startsWith(excludedPrefix)) {
+        return runnable;
+      }
+    }
+
     final IScopes newScopes = Sentry.getCurrentScopes().forkedCurrentScope("spring.scheduleHook");
 
     return () -> {