Merge branch 'main' into feat/request-for-otel

Author: adinauer

CHANGELOG.md

@@ -7,6 +7,9 @@
 - Avoid logging an error when a float is passed in the manifest ([#4031](https://github.com/getsentry/sentry-java/pull/4031))
 - Add `request` details to transactions created through OpenTelemetry ([#4098](https://github.com/getsentry/sentry-java/pull/4098))
   - We now add HTTP request method and URL where Sentry expects it to display it in Sentry UI
+- 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
 

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);
       }