Merge branch 'main' into dependabot/github_actions/gradle/actions-879…

…0d96bb8fdd8ae7edfb2eada090c650b257f27
getsentry · Jan 23, 2025 · 55d9581 · 55d9581
2 parents a2c3b8a + b4e611a
commit 55d9581
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
+        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # pin@v2
         with:
           languages: 'java'
 
@@ -48,4 +48,4 @@ jobs:
           ./gradlew buildForCodeQL
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
+        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # pin@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Fixes
 
 - Avoid logging an error when a float is passed in the manifest ([#4031](https://github.com/getsentry/sentry-java/pull/4031))
+- Remove `java.lang.ClassNotFoundException` debug logs when searching for OpenTelemetry marker classes ([#4091](https://github.com/getsentry/sentry-java/pull/4091))
+  - There was up to three of these, one for `io.sentry.opentelemetry.agent.AgentMarker`, `io.sentry.opentelemetry.agent.AgentlessMarker` and `io.sentry.opentelemetry.agent.AgentlessSpringMarker`.
+  - These were not indicators of something being wrong but rather the SDK looking at what is available at runtime to configure itself accordingly.
 
 ## 8.0.0
 

diff --git a/sentry/src/main/java/io/sentry/opentelemetry/OpenTelemetryUtil.java b/sentry/src/main/java/io/sentry/opentelemetry/OpenTelemetryUtil.java
@@ -1,5 +1,6 @@
 package io.sentry.opentelemetry;
 
+import io.sentry.NoOpLogger;
 import io.sentry.SentryOpenTelemetryMode;
 import io.sentry.SentryOptions;
 import io.sentry.util.LoadClass;
@@ -29,15 +30,15 @@ public static void applyIgnoredSpanOrigins(
     final @NotNull SentryOpenTelemetryMode openTelemetryMode = options.getOpenTelemetryMode();
     if (SentryOpenTelemetryMode.AUTO.equals(openTelemetryMode)) {
       if (loadClass.isClassAvailable(
-          "io.sentry.opentelemetry.agent.AgentMarker", options.getLogger())) {
+          "io.sentry.opentelemetry.agent.AgentMarker", NoOpLogger.getInstance())) {
         return SpanUtils.ignoredSpanOriginsForOpenTelemetry(SentryOpenTelemetryMode.AGENT);
       }
       if (loadClass.isClassAvailable(
-          "io.sentry.opentelemetry.agent.AgentlessMarker", options.getLogger())) {
+          "io.sentry.opentelemetry.agent.AgentlessMarker", NoOpLogger.getInstance())) {
         return SpanUtils.ignoredSpanOriginsForOpenTelemetry(SentryOpenTelemetryMode.AGENTLESS);
       }
       if (loadClass.isClassAvailable(
-          "io.sentry.opentelemetry.agent.AgentlessSpringMarker", options.getLogger())) {
+          "io.sentry.opentelemetry.agent.AgentlessSpringMarker", NoOpLogger.getInstance())) {
         return SpanUtils.ignoredSpanOriginsForOpenTelemetry(
             SentryOpenTelemetryMode.AGENTLESS_SPRING);
       }

diff --git a/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt b/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt
@@ -28,6 +28,8 @@ import io.sentry.hints.DiskFlushNotification
 import io.sentry.protocol.SentryId
 import io.sentry.protocol.SentryTransaction
 import io.sentry.protocol.User
+import io.sentry.test.getProperty
+import io.sentry.test.injectForField
 import io.sentry.util.HintUtils
 import org.awaitility.kotlin.await
 import org.mockito.kotlin.eq
@@ -38,9 +40,8 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
 import org.mockito.kotlin.whenever
 import java.io.File
+import java.util.Timer
 import java.util.UUID
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -363,19 +364,16 @@ class RateLimiterTest {
     @Test
     fun `close cancels the timer`() {
         val rateLimiter = fixture.getSUT()
-        whenever(fixture.currentDateProvider.currentTimeMillis).thenReturn(0, 1, 2001)
-
-        val applied = CountDownLatch(1)
-        var activeForReplay = false
-        rateLimiter.addRateLimitObserver {
-            applied.countDown()
-            activeForReplay = rateLimiter.isActiveForCategory(Replay)
-        }
+        val timer = mock<Timer>()
+        rateLimiter.injectForField("timer", timer)
 
-        rateLimiter.updateRetryAfterLimits("1:replay:key", null, 1)
+        // When the rate limiter is closed
         rateLimiter.close()
 
-        applied.await(2, TimeUnit.SECONDS)
-        assertTrue(activeForReplay)
+        // Then the timer is cancelled
+        verify(timer).cancel()
+
+        // And is removed by the rateLimiter
+        assertNull(rateLimiter.getProperty("timer"))
     }
 }