Merge branch 'main' into feat/ignore-exceptions

.github/CODEOWNERS

@@ -1 +1 @@
-*       @adinauer @romtsn @stefanosiano @markushi
+*       @adinauer @romtsn @stefanosiano @markushi @lcian

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
         run: make preMerge
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # pin@v4
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # pin@v4
         with:
           name: sentry-java
           fail_ci_if_error: false

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -9,6 +9,13 @@
   - Can be set in environment variables, e.g. `SENTRY_IGNORED_ERRORS=Some error,Another .*`
   - For Spring Boot, it can be set in `application.properties`, e.g. `sentry.ignored-errors=Some error,Another .*`
 
+### 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
 
 ### Summary

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2024 Sentry
+Copyright (c) 2019-2025 Sentry
 Copyright (c) 2015 Salomon BRYS for Android ANRWatchDog
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

@@ -475,7 +475,10 @@ private static boolean readBool(
   private static @NotNull Double readDouble(
       final @NotNull Bundle metadata, final @NotNull ILogger logger, final @NotNull String key) {
     // manifest meta-data only reads float
-    final Double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
+    double value = ((Float) metadata.getFloat(key, -1)).doubleValue();
+    if (value == -1) {
+      value = ((Integer) metadata.getInt(key, -1)).doubleValue();
+    }
     logger.log(SentryLevel.DEBUG, key + " read: " + value);
     return value;
   }

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