Merge branch 'main' into kw/test/check-crash-envelope

.github/workflows/agp-matrix.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -69,6 +69,7 @@ jobs:
           target: 'aosp_atd'
           arch: x86
           channel: canary # Necessary for ATDs
+          disk-size: 4096M
           script: ./gradlew sentry-android-integration-tests:sentry-uitest-android:connectedReleaseAndroidTest -DtestBuildType=release --daemon
 
       - name: Upload test results

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/enforce-license-compliance.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/generate-javadocs.yml

@@ -20,7 +20,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/integration-tests-benchmarks.yml

@@ -37,7 +37,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -86,7 +86,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/integration-tests-ui-critical.yml

@@ -35,7 +35,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/integration-tests-ui.yml

@@ -32,7 +32,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/release-build.yml

@@ -26,7 +26,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/system-tests-backend.yml

@@ -40,7 +40,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        uses: gradle/actions/setup-gradle@707359876a764dbcdb9da0b0ed08291818310c3d # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

CHANGELOG.md

@@ -1,10 +1,42 @@
 # Changelog
 
-## Unreleased
+## 7.18.0
+
+### Features
+
+- Android 15: Add support for 16KB page sizes ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
+  - See https://developer.android.com/guide/practices/page-sizes for more details
+- Session Replay: Add `beforeSendReplay` callback ([#3855](https://github.com/getsentry/sentry-java/pull/3855))
+- Session Replay: Add support for masking/unmasking view containers ([#3881](https://github.com/getsentry/sentry-java/pull/3881))
+
+### Fixes
+
+- Avoid collecting normal frames ([#3782](https://github.com/getsentry/sentry-java/pull/3782))
+- Ensure android initialization process continues even if options configuration block throws an exception ([#3887](https://github.com/getsentry/sentry-java/pull/3887))
+- Do not report parsing ANR error when there are no threads ([#3888](https://github.com/getsentry/sentry-java/pull/3888))
+  - This should significantly reduce the number of events with message "Sentry Android SDK failed to parse system thread dump..." reported
+- Session Replay: Disable replay in session mode when rate limit is active ([#3854](https://github.com/getsentry/sentry-java/pull/3854))
+
+### Dependencies
+
+- Bump Native SDK from v0.7.2 to v0.7.8 ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#078)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.2...0.7.8)
+
+## 7.17.0
+
+### Features
+
+- Add meta option to set the maximum amount of breadcrumbs to be logged. ([#3836](https://github.com/getsentry/sentry-java/pull/3836))
+- Use a separate `Random` instance per thread to improve SDK performance ([#3835](https://github.com/getsentry/sentry-java/pull/3835))
 
 ### Fixes
 
+- Using MaxBreadcrumb with value 0 no longer crashes. ([#3836](https://github.com/getsentry/sentry-java/pull/3836))
 - Accept manifest integer values when requiring floating values ([#3823](https://github.com/getsentry/sentry-java/pull/3823))
+- Fix standalone tomcat jndi issue ([#3873](https://github.com/getsentry/sentry-java/pull/3873))
+  - Using Sentry Spring Boot on a standalone tomcat caused the following error:
+    - Failed to bind properties under 'sentry.parsed-dsn' to io.sentry.Dsn
 
 ## 7.16.0
 

build.gradle.kts

@@ -227,7 +227,7 @@ spotless {
         target("**/*.java")
         removeUnusedImports()
         googleJavaFormat()
-        targetExclude("**/generated/**", "**/vendor/**")
+        targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
     }
     kotlin {
         target("**/*.kt")

gradle.properties

@@ -13,7 +13,7 @@ android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true
 
 # Release information
-versionName=7.16.0
+versionName=7.18.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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

@@ -54,7 +54,7 @@
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.User;
 import io.sentry.util.HintUtils;
-import io.sentry.util.Random;
+import io.sentry.util.SentryRandom;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -83,24 +83,13 @@ public final class AnrV2EventProcessor implements BackfillingEventProcessor {
 
   private final @NotNull SentryExceptionFactory sentryExceptionFactory;
 
-  private final @Nullable Random random;
-
   public AnrV2EventProcessor(
       final @NotNull Context context,
       final @NotNull SentryAndroidOptions options,
       final @NotNull BuildInfoProvider buildInfoProvider) {
-    this(context, options, buildInfoProvider, null);
-  }
-
-  AnrV2EventProcessor(
-      final @NotNull Context context,
-      final @NotNull SentryAndroidOptions options,
-      final @NotNull BuildInfoProvider buildInfoProvider,
-      final @Nullable Random random) {
     this.context = ContextUtils.getApplicationContext(context);
     this.options = options;
     this.buildInfoProvider = buildInfoProvider;
-    this.random = random;
 
     final SentryStackTraceFactory sentryStackTraceFactory =
         new SentryStackTraceFactory(this.options);
@@ -180,9 +169,8 @@ private boolean sampleReplay(final @NotNull SentryEvent event) {
 
     try {
       // we have to sample here with the old sample rate, because it may change between app launches
-      final @NotNull Random random = this.random != null ? this.random : new Random();
       final double replayErrorSampleRateDouble = Double.parseDouble(replayErrorSampleRate);
-      if (replayErrorSampleRateDouble < random.nextDouble()) {
+      if (replayErrorSampleRateDouble < SentryRandom.current().nextDouble()) {
         options
             .getLogger()
             .log(

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

@@ -313,8 +313,11 @@ private void reportAsSentryEvent(
         final ThreadDumpParser threadDumpParser = new ThreadDumpParser(options, isBackground);
         final List<SentryThread> threads = threadDumpParser.parse(lines);
         if (threads.isEmpty()) {
-          // if the list is empty this means our regex matching is garbage and this is still error
-          return new ParseResult(ParseResult.Type.ERROR, dump);
+          // if the list is empty this means the system failed to capture a proper thread dump of
+          // the android threads, and only contains kernel-level threads and statuses, those ANRs
+          // are not actionable and neither they are reported by Google Play Console, so we just
+          // fall back to not reporting them
+          return new ParseResult(ParseResult.Type.NO_DUMP);
         }
         return new ParseResult(ParseResult.Type.DUMP, dump, threads);
       } catch (Throwable e) {

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

@@ -104,6 +104,8 @@ final class ManifestMetadataReader {
 
   static final String ENABLE_METRICS = "io.sentry.enable-metrics";
 
+  static final String MAX_BREADCRUMBS = "io.sentry.max-breadcrumbs";
+
   static final String REPLAYS_SESSION_SAMPLE_RATE = "io.sentry.session-replay.session-sample-rate";
 
   static final String REPLAYS_ERROR_SAMPLE_RATE = "io.sentry.session-replay.on-error-sample-rate";
@@ -213,6 +215,9 @@ static void applyMetadata(
                 SESSION_TRACKING_TIMEOUT_INTERVAL_MILLIS,
                 options.getSessionTrackingIntervalMillis()));
 
+        options.setMaxBreadcrumbs(
+            (int) readLong(metadata, logger, MAX_BREADCRUMBS, options.getMaxBreadcrumbs()));
+
         options.setEnableActivityLifecycleBreadcrumbs(
             readBool(
                 metadata,

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

@@ -129,7 +129,17 @@ public static synchronized void init(
                 isTimberAvailable,
                 isReplayAvailable);
 
-            configuration.configure(options);
+            try {
+              configuration.configure(options);
+            } catch (Throwable t) {
+              // let it slip, but log it
+              options
+                  .getLogger()
+                  .log(
+                      SentryLevel.ERROR,
+                      "Error in the 'OptionsConfiguration.configure' callback.",
+                      t);
+            }
 
             // if SentryPerformanceProvider was disabled or removed,
             // we set the app start / sdk init time here instead

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

@@ -6,7 +6,6 @@
 @ApiStatus.Internal
 final class SentryFrameMetrics {
 
-  private int normalFrameCount;
   private int slowFrameCount;
   private int frozenFrameCount;
 
@@ -18,15 +17,11 @@ final class SentryFrameMetrics {
   public SentryFrameMetrics() {}
 
   public SentryFrameMetrics(
-      final int normalFrameCount,
       final int slowFrameCount,
       final long slowFrameDelayNanos,
       final int frozenFrameCount,
       final long frozenFrameDelayNanos,
       final long totalDurationNanos) {
-
-    this.normalFrameCount = normalFrameCount;
-
     this.slowFrameCount = slowFrameCount;
     this.slowFrameDelayNanos = slowFrameDelayNanos;
 
@@ -47,15 +42,9 @@ public void addFrame(
     } else if (isSlow) {
       slowFrameDelayNanos += delayNanos;
       slowFrameCount += 1;
-    } else {
-      normalFrameCount += 1;
     }
   }
 
-  public int getNormalFrameCount() {
-    return normalFrameCount;
-  }
-
   public int getSlowFrameCount() {
     return slowFrameCount;
   }
@@ -72,17 +61,16 @@ public long getFrozenFrameDelayNanos() {
     return frozenFrameDelayNanos;
   }
 
-  public int getTotalFrameCount() {
-    return normalFrameCount + slowFrameCount + frozenFrameCount;
+  /** Returns the sum of the slow and frozen frames. */
+  public int getSlowFrozenFrameCount() {
+    return slowFrameCount + frozenFrameCount;
   }
 
   public long getTotalDurationNanos() {
     return totalDurationNanos;
   }
 
   public void clear() {
-    normalFrameCount = 0;
-
     slowFrameCount = 0;
     slowFrameDelayNanos = 0;
 
@@ -95,7 +83,6 @@ public void clear() {
   @NotNull
   public SentryFrameMetrics duplicate() {
     return new SentryFrameMetrics(
-        normalFrameCount,
         slowFrameCount,
         slowFrameDelayNanos,
         frozenFrameCount,
@@ -110,7 +97,6 @@ public SentryFrameMetrics duplicate() {
   @NotNull
   public SentryFrameMetrics diffTo(final @NotNull SentryFrameMetrics other) {
     return new SentryFrameMetrics(
-        normalFrameCount - other.normalFrameCount,
         slowFrameCount - other.slowFrameCount,
         slowFrameDelayNanos - other.slowFrameDelayNanos,
         frozenFrameCount - other.frozenFrameCount,
@@ -123,8 +109,7 @@ public SentryFrameMetrics diffTo(final @NotNull SentryFrameMetrics other) {
    *     to 0
    */
   public boolean containsValidData() {
-    return normalFrameCount >= 0
-        && slowFrameCount >= 0
+    return slowFrameCount >= 0
         && slowFrameDelayNanos >= 0
         && frozenFrameCount >= 0
         && frozenFrameDelayNanos >= 0

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

@@ -192,7 +192,7 @@ private void captureFrameMetrics(@NotNull final ISpan span) {
         }
       }
 
-      int totalFrameCount = frameMetrics.getTotalFrameCount();
+      int totalFrameCount = frameMetrics.getSlowFrozenFrameCount();
 
       final long nextScheduledFrameNanos = frameMetricsCollector.getLastKnownFrameStartTimeNanos();
       // nextScheduledFrameNanos might be -1 if no frames have been scheduled for drawing yet
@@ -254,15 +254,17 @@ public void onFrameMetricCollected(
         (long) ((double) ONE_SECOND_NANOS / (double) refreshRate);
     lastKnownFrameDurationNanos = expectedFrameDurationNanos;
 
-    frames.add(
-        new Frame(
-            frameStartNanos,
-            frameEndNanos,
-            durationNanos,
-            delayNanos,
-            isSlow,
-            isFrozen,
-            expectedFrameDurationNanos));
+    if (isSlow || isFrozen) {
+      frames.add(
+          new Frame(
+              frameStartNanos,
+              frameEndNanos,
+              durationNanos,
+              delayNanos,
+              isSlow,
+              isFrozen,
+              expectedFrameDurationNanos));
+    }
   }
 
   private static int interpolateFrameCount(
@@ -277,7 +279,7 @@ private static int interpolateFrameCount(
     final long frameMetricsDurationNanos = frameMetrics.getTotalDurationNanos();
     final long nonRenderedDuration = spanDurationNanos - frameMetricsDurationNanos;
     if (nonRenderedDuration > 0) {
-      return (int) (nonRenderedDuration / frameDurationNanos);
+      return (int) Math.ceil((double) nonRenderedDuration / frameDurationNanos);
     }
     return 0;
   }