changelog

Author: runningcode

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Performance
 
 - Reduce the number of SDK threads: `LifecycleWatcher` now schedules the session-end task on the shared timer executor instead of creating a dedicated `java.util.Timer` thread ([#5819](https://github.com/getsentry/sentry-java/pull/5819))
+- Reduce the number of SDK threads: `RateLimiter` now schedules its rate-limit-lifted notifications on the shared timer executor instead of creating a dedicated `java.util.Timer` thread ([#5814](https://github.com/getsentry/sentry-java/pull/5814))
 
 ## 8.50.0
 

sentry/src/main/java/io/sentry/transport/RateLimiter.java

@@ -328,7 +328,7 @@ private void applyRetryAfterOnlyIfLonger(
           notifyObserversFutures.add(
               options
                   .getTimerExecutorService()
-                  .schedule(() -> notifyRateLimitObservers(), delayMillis));
+                  .schedule(this::notifyRateLimitObservers, delayMillis));
         } catch (RejectedExecutionException e) {
           options
               .getLogger()

sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt

@@ -43,6 +43,7 @@ import java.io.File
 import java.util.UUID
 import java.util.concurrent.Future
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -63,11 +64,14 @@ class RateLimiterTest {
     val currentDateProvider = mock<ICurrentDateProvider>()
     val clientReportRecorder = mock<IClientReportRecorder>()
     val serializer = mock<ISerializer>()
+    var executorService: SentryExecutorService? = null
 
     fun getSUT(): RateLimiter {
       val options = SentryOptions().apply { setLogger(NoOpLogger.getInstance()) }
       // a real executor so scheduled rate-limit-lifted notifications actually run
-      options.setTimerExecutorService(SentryExecutorService(options))
+      val timerExecutorService = SentryExecutorService(options)
+      executorService = timerExecutorService
+      options.setTimerExecutorService(timerExecutorService)
 
       SentryOptionsManipulator.setClientReportRecorder(options, clientReportRecorder)
 
@@ -77,6 +81,12 @@ class RateLimiterTest {
 
   private val fixture = Fixture()
 
+  @AfterTest
+  fun `tear down`() {
+    // the executor's core thread never times out, so it would stay parked for the whole test JVM
+    fixture.executorService?.close(0)
+  }
+
   @Test
   fun `uses X-Sentry-Rate-Limit and allows sending if time has passed`() {
     val rateLimiter = fixture.getSUT()