chore: bump Spring Boot Jakarta from 3.2.0 to 3.3.0

.github/workflows/agp-matrix.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -82,7 +82,7 @@ jobs:
             **/build/outputs/mapping/release/*
 
       - name: Test Report
-        uses: phoenix-actions/test-reporting@f957cd93fc2d848d556fa0d03c57bc79127b6b5e # pin@v15
+        uses: phoenix-actions/test-reporting@41efe7ebebe7ef156ef46f6b0acf50ec0f10315b # pin@v12
         if: always()
         with:
           name: JUnit AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -50,7 +50,7 @@ jobs:
             **/build/reports/*
 
       - name: Test Report
-        uses: phoenix-actions/test-reporting@f957cd93fc2d848d556fa0d03c57bc79127b6b5e # pin@v15
+        uses: phoenix-actions/test-reporting@41efe7ebebe7ef156ef46f6b0acf50ec0f10315b # pin@v12
         if: always()
         with:
           name: JUnit Build

.github/workflows/codeql-analysis.yml

@@ -36,12 +36,12 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # pin@v2
+        uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # pin@v2
         with:
           languages: ${{ matrix.language }}
 
@@ -55,4 +55,4 @@ jobs:
           ./gradlew buildForCodeQL
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # pin@v2
+        uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # pin@v2

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # 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@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 

.github/workflows/gradle-wrapper-validation.yml

@@ -13,4 +13,4 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
-      - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # pin@v1
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # pin@v1

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

@@ -37,7 +37,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -47,7 +47,7 @@ jobs:
         run: make assembleBenchmarks
 
       - name: Run All Tests in SauceLab
-        uses: saucelabs/saucectl-run-action@39e4f0666ca8ecb4b60847213c6e0fbd6a0c2bd8 # pin@v3
+        uses: saucelabs/saucectl-run-action@7fe025ef1fdc6f211add3751a6c7d8bba27ba9b1 # pin@v3
         if: github.event_name != 'pull_request' && env.SAUCE_USERNAME != null
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -57,7 +57,7 @@ jobs:
           config-file: .sauce/sentry-uitest-android-benchmark.yml
 
       - name: Run one test in SauceLab
-        uses: saucelabs/saucectl-run-action@39e4f0666ca8ecb4b60847213c6e0fbd6a0c2bd8 # pin@v3
+        uses: saucelabs/saucectl-run-action@7fe025ef1fdc6f211add3751a6c7d8bba27ba9b1 # pin@v3
         if: github.event_name == 'pull_request' && env.SAUCE_USERNAME != null
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -86,7 +86,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # 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@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -42,7 +42,7 @@ jobs:
         run: make assembleUiTests
 
       - name: Install SauceLabs CLI
-        uses: saucelabs/saucectl-run-action@39e4f0666ca8ecb4b60847213c6e0fbd6a0c2bd8 # pin@v3
+        uses: saucelabs/saucectl-run-action@7fe025ef1fdc6f211add3751a6c7d8bba27ba9b1 # pin@v3
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:

.github/workflows/release-build.yml

@@ -26,7 +26,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # 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@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
         with:
           gradle-home-cache-cleanup: true
 
@@ -71,7 +71,7 @@ jobs:
             spring-server.txt
 
       - name: Test Report
-        uses: phoenix-actions/test-reporting@f957cd93fc2d848d556fa0d03c57bc79127b6b5e # pin@v15
+        uses: phoenix-actions/test-reporting@41efe7ebebe7ef156ef46f6b0acf50ec0f10315b # pin@v12
         if: always()
         with:
           name: JUnit System Tests ${{ matrix.sample }}

CHANGELOG.md

@@ -1,30 +1,18 @@
 # Changelog
 
-## 7.11.0
-
-### Features
-
-- Report dropped spans ([#3528](https://github.com/getsentry/sentry-java/pull/3528))
+## Unreleased
 
 ### Fixes
 
-- Fix duplicate session start for React Native ([#3504](https://github.com/getsentry/sentry-java/pull/3504))
 - Move onFinishCallback before span or transaction is finished ([#3459](https://github.com/getsentry/sentry-java/pull/3459))
 - Add timestamp when a profile starts ([#3442](https://github.com/getsentry/sentry-java/pull/3442))
 - Move fragment auto span finish to onFragmentStarted ([#3424](https://github.com/getsentry/sentry-java/pull/3424))
 - Remove profiling timeout logic and disable profiling on API 21 ([#3478](https://github.com/getsentry/sentry-java/pull/3478))
 - Properly reset metric flush flag on metric emission ([#3493](https://github.com/getsentry/sentry-java/pull/3493))
-- Use SecureRandom in favor of Random for Metrics ([#3495](https://github.com/getsentry/sentry-java/pull/3495))
-- Fix UncaughtExceptionHandlerIntegration Memory Leak ([#3398](https://github.com/getsentry/sentry-java/pull/3398))
-- Deprecated `User.segment`. Use a custom tag or context instead. ([#3511](https://github.com/getsentry/sentry-java/pull/3511))
-- Fix duplicated http spans ([#3526](https://github.com/getsentry/sentry-java/pull/3526))
-- When capturing unhandled hybrid exception session should be ended and new start if need ([#3480](https://github.com/getsentry/sentry-java/pull/3480))
 
 ### Dependencies
 
-- Bump Native SDK from v0.7.0 to v0.7.2 ([#3314](https://github.com/getsentry/sentry-java/pull/3314))
-  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#072)
-  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.0...0.7.2)
+- Bump Spring Boot Jakarta from 3.2.0 to 3.3.0
 
 ## 7.10.0
 

buildSrc/src/main/java/Config.kt

@@ -7,7 +7,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.5"
-    val springBoot3Version = "3.2.0"
+    val springBoot3Version = "3.3.0"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.5.3"

gradle.properties

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

sentry-android-core/api/sentry-android-core.api

@@ -204,7 +204,7 @@ public abstract interface class io/sentry/android/core/IDebugImagesLoader {
 
 public final class io/sentry/android/core/InternalSentrySdk {
 	public fun <init> ()V
-	public static fun captureEnvelope ([BZ)Lio/sentry/protocol/SentryId;
+	public static fun captureEnvelope ([B)Lio/sentry/protocol/SentryId;
 	public static fun getAppStartMeasurement ()Ljava/util/Map;
 	public static fun getCurrentScope ()Lio/sentry/IScope;
 	public static fun serializeScope (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/IScope;)Ljava/util/Map;

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

@@ -1,9 +1,5 @@
 package io.sentry.android.core;
 
-import static io.sentry.SentryLevel.DEBUG;
-import static io.sentry.SentryLevel.INFO;
-import static io.sentry.SentryLevel.WARNING;
-
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -23,14 +19,12 @@
 import io.sentry.android.core.performance.ActivityLifecycleTimeSpan;
 import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.android.core.performance.TimeSpan;
-import io.sentry.cache.EnvelopeCache;
 import io.sentry.protocol.App;
 import io.sentry.protocol.Device;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
 import io.sentry.util.MapObjectWriter;
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -154,8 +148,7 @@ public static Map<String, Object> serializeScope(
    *     captured
    */
   @Nullable
-  public static SentryId captureEnvelope(
-      final @NotNull byte[] envelopeData, final boolean maybeStartNewSession) {
+  public static SentryId captureEnvelope(final @NotNull byte[] envelopeData) {
     final @NotNull IHub hub = HubAdapter.getInstance();
     final @NotNull SentryOptions options = hub.getOptions();
 
@@ -191,13 +184,6 @@ public static SentryId captureEnvelope(
       if (session != null) {
         final SentryEnvelopeItem sessionItem = SentryEnvelopeItem.fromSession(serializer, session);
         envelopeItems.add(sessionItem);
-        deleteCurrentSessionFile(
-            options,
-            // should be sync if going to crash or already not a main thread
-            !maybeStartNewSession || !hub.getOptions().getMainThreadChecker().isMainThread());
-        if (maybeStartNewSession) {
-          hub.startSession();
-        }
       }
 
       final SentryEnvelope repackagedEnvelope =
@@ -247,15 +233,15 @@ private static void addTimeSpanToSerializedSpans(TimeSpan span, List<Map<String,
       HubAdapter.getInstance()
           .getOptions()
           .getLogger()
-          .log(WARNING, "Can not convert not-started TimeSpan to Map for Hybrid SDKs.");
+          .log(SentryLevel.WARNING, "Can not convert not-started TimeSpan to Map for Hybrid SDKs.");
       return;
     }
 
     if (span.hasNotStopped()) {
       HubAdapter.getInstance()
           .getOptions()
           .getLogger()
-          .log(WARNING, "Can not convert not-stopped TimeSpan to Map for Hybrid SDKs.");
+          .log(SentryLevel.WARNING, "Can not convert not-stopped TimeSpan to Map for Hybrid SDKs.");
       return;
     }
 
@@ -266,46 +252,6 @@ private static void addTimeSpanToSerializedSpans(TimeSpan span, List<Map<String,
     spans.add(spanMap);
   }
 
-  private static void deleteCurrentSessionFile(
-      final @NotNull SentryOptions options, boolean isSync) {
-    if (!isSync) {
-      try {
-        options
-            .getExecutorService()
-            .submit(
-                () -> {
-                  deleteCurrentSessionFile(options);
-                });
-      } catch (Throwable e) {
-        options
-            .getLogger()
-            .log(WARNING, "Submission of deletion of the current session file rejected.", e);
-      }
-    } else {
-      deleteCurrentSessionFile(options);
-    }
-  }
-
-  private static void deleteCurrentSessionFile(final @NotNull SentryOptions options) {
-    final String cacheDirPath = options.getCacheDirPath();
-    if (cacheDirPath == null) {
-      options.getLogger().log(INFO, "Cache dir is not set, not deleting the current session.");
-      return;
-    }
-
-    if (!options.isEnableAutoSessionTracking()) {
-      options
-          .getLogger()
-          .log(DEBUG, "Session tracking is disabled, bailing from deleting current session file.");
-      return;
-    }
-
-    final File sessionFile = EnvelopeCache.getCurrentSessionFile(cacheDirPath);
-    if (!sessionFile.delete()) {
-      options.getLogger().log(WARNING, "Failed to delete the current session file.");
-    }
-  }
-
   @Nullable
   private static Session updateSession(
       final @NotNull IHub hub,
@@ -322,14 +268,11 @@ private static Session updateSession(
             if (updated) {
               if (session.getStatus() == Session.State.Crashed) {
                 session.end();
-                // Session needs to be removed from the scope, otherwise it will be send twice
-                // standalone and with the crash event
-                scope.clearSession();
               }
               sessionRef.set(session);
             }
           } else {
-            options.getLogger().log(INFO, "Session is null on updateSession");
+            options.getLogger().log(SentryLevel.INFO, "Session is null on updateSession");
           }
         });
     return sessionRef.get();

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

@@ -11,7 +11,6 @@
 import io.sentry.Sentry;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
-import io.sentry.Session;
 import io.sentry.android.core.internal.util.BreadcrumbFactory;
 import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.android.core.performance.TimeSpan;
@@ -20,9 +19,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /** Sentry initialization class */
 public final class SentryAndroid {
@@ -149,21 +146,8 @@ public static synchronized void init(
 
       final @NotNull IHub hub = Sentry.getCurrentHub();
       if (hub.getOptions().isEnableAutoSessionTracking() && ContextUtils.isForegroundImportance()) {
-        // The LifecycleWatcher of AppLifecycleIntegration may already started a session
-        // so only start a session if it's not already started
-        // This e.g. happens on React Native, or e.g. on deferred SDK init
-        final AtomicBoolean sessionStarted = new AtomicBoolean(false);
-        hub.configureScope(
-            scope -> {
-              final @Nullable Session currentSession = scope.getSession();
-              if (currentSession != null && currentSession.getStarted() != null) {
-                sessionStarted.set(true);
-              }
-            });
-        if (!sessionStarted.get()) {
-          hub.addBreadcrumb(BreadcrumbFactory.forSession("session.start"));
-          hub.startSession();
-        }
+        hub.addBreadcrumb(BreadcrumbFactory.forSession("session.start"));
+        hub.startSession();
       }
     } catch (IllegalAccessException e) {
       logger.log(SentryLevel.FATAL, "Fatal error during SentryAndroid.init(...)", e);