Do not always write startup crash marker (#3409)

getsentry · May 8, 2024 · d83be50 · d83be50
1 parent ef1c11b
commit d83be50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
 - (Internal) Metrics code cleanup ([#3403](https://github.com/getsentry/sentry-java/pull/3403))
 - Fix Frame measurements in app start transactions ([#3382](https://github.com/getsentry/sentry-java/pull/3382))
 - Fix timing metric value different from span duration ([#3368](https://github.com/getsentry/sentry-java/pull/3368))
+- Do not always write startup crash marker ([#3409](https://github.com/getsentry/sentry-java/pull/3409))
+  - This may have been causing the SDK init logic to block the main thread
 
 ## 7.8.0
 

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java b/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java
@@ -57,7 +57,7 @@ public void store(@NotNull SentryEnvelope envelope, @NotNull Hint hint) {
     if (HintUtils.hasType(hint, UncaughtExceptionHandlerIntegration.UncaughtExceptionHint.class)
         && sdkInitTimeSpan.hasStarted()) {
       long timeSinceSdkInit =
-          currentDateProvider.getCurrentTimeMillis() - sdkInitTimeSpan.getStartTimestampMs();
+          currentDateProvider.getCurrentTimeMillis() - sdkInitTimeSpan.getStartUptimeMs();
       if (timeSinceSdkInit <= options.getStartupCrashDurationThresholdMillis()) {
         options
             .getLogger()

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/cache/AndroidEnvelopeCacheTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/cache/AndroidEnvelopeCacheTest.kt
@@ -51,10 +51,8 @@ class AndroidEnvelopeCacheTest {
                 AppStartMetrics.getInstance().apply {
                     if (options.isEnablePerformanceV2) {
                         appStartTimeSpan.setStartedAt(appStartMillis)
-                        appStartTimeSpan.setStartUnixTimeMs(appStartMillis)
                     } else {
                         sdkInitTimeSpan.setStartedAt(appStartMillis)
-                        sdkInitTimeSpan.setStartUnixTimeMs(appStartMillis)
                     }
                 }
             }