Merge branch 'main' into feat/allow-turning-off-auto-init-in-otel-agent

Author: adinauer

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Updated ProfileMeasurementValue types ([#2412](https://github.com/getsentry/sentry-java/pull/2412))
 - Clear window reference only on activity stop in profileMeasurements collector ([#2407](https://github.com/getsentry/sentry-java/pull/2407))
 - No longer disable OpenTelemetry exporters in default Java Agent config ([#2408](https://github.com/getsentry/sentry-java/pull/2408))
 - Fix `ClassNotFoundException` for `io.sentry.spring.SentrySpringServletContainerInitializer` in `sentry-spring-jakarta` ([#2411](https://github.com/getsentry/sentry-java/issues/2411))

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

@@ -198,6 +198,12 @@ public void onFrameMetricCollected(
                   @NotNull FrameMetrics frameMetrics, float refreshRate) {
                 long frameTimestampRelativeNanos =
                     SystemClock.elapsedRealtimeNanos() - transactionStartNanos;
+
+                // We don't allow negative relative timestamps.
+                // So we add a check, even if this should never happen.
+                if (frameTimestampRelativeNanos < 0) {
+                  return;
+                }
                 long durationNanos = frameMetrics.getMetric(FrameMetrics.TOTAL_DURATION);
                 // Most frames take just a few nanoseconds longer than the optimal calculated
                 // duration.