Merge branch 'main' into feat/bump-spring-boot-3

# Conflicts:
#	CHANGELOG.md

.craft.yml

@@ -56,3 +56,4 @@ targets:
  maven:io.sentry:sentry-compose-desktop:
  maven:io.sentry:sentry-apollo-3:
  maven:io.sentry:sentry-android-sqlite:
+ maven:io.sentry:sentry-android-replay:

.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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 
@@ -59,7 +59,7 @@ jobs:
 
  # We tried to use the cache action to cache gradle stuff, but it made tests slower and timeout
  - name: Run instrumentation tests
- uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # pin@v2
+ uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 # pin@v2
  with:
  api-level: 30
  force-avd-creation: false

.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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 

.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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 
  - name: Initialize CodeQL
- uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # pin@v2
+ uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # 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@2d790406f505036ef40ecba973cc774a50395aac # 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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 

.github/workflows/generate-javadocs.yml

@@ -20,15 +20,15 @@ jobs:
  java-version: '17'
 
  - name: Setup Gradle
- uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+ uses: gradle/actions/setup-gradle@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 
  - name: Generate Aggregate Javadocs
  run: |
  ./gradlew aggregateJavadocs
  - name: Deploy
- uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e # pin@4.5.0
+ uses: JamesIves/github-pages-deploy-action@94f3c658273cf92fb48ef99e5fbc02bd2dc642b2 # pin@4.6.3
  with:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  BRANCH: gh-pages

.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@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # 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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 
@@ -86,7 +86,7 @@ jobs:
  java-version: '17'
 
  - name: Setup Gradle
- uses: gradle/actions/setup-gradle@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+ uses: gradle/actions/setup-gradle@fd87365911aa12c016c307ea21313f351dc53551 # 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@fd87365911aa12c016c307ea21313f351dc53551 # 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@2cd2a6e951bd0b53f55a08e4e4c6f2586f3a36b9 # pin@v3
+ uses: gradle/actions/setup-gradle@fd87365911aa12c016c307ea21313f351dc53551 # 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@fd87365911aa12c016c307ea21313f351dc53551 # pin@v3
  with:
  gradle-home-cache-cleanup: true
 

CHANGELOG.md

@@ -4,7 +4,43 @@
 
 ### Dependencies
 
-- Bump Spring Boot to 3.3.1 ([#3541](https://github.com/getsentry/sentry-java/pull/3541))
+- Bump Spring Boot to 3.3.2 ([#3541](https://github.com/getsentry/sentry-java/pull/3541))
+
+## 7.12.1
+
+### Fixes
+
+- Check app start spans time and ignore background app starts ([#3550](https://github.com/getsentry/sentry-java/pull/3550))
+ - This should eliminate long-lasting App Start transactions
+
+## 7.12.0
+
+### Features
+
+- Session Replay Public Beta ([#3339](https://github.com/getsentry/sentry-java/pull/3339))
+
+ To enable Replay use the `sessionReplay.sessionSampleRate` or `sessionReplay.errorSampleRate` experimental options.
+
+ ```kotlin
+ import io.sentry.SentryReplayOptions
+ import io.sentry.android.core.SentryAndroid
+
+ SentryAndroid.init(context) { options ->
+
+ // Currently under experimental options:
+ options.experimental.sessionReplay.sessionSampleRate = 1.0
+ options.experimental.sessionReplay.errorSampleRate = 1.0
+
+ // To change default redaction behavior (defaults to true)
+ options.experimental.sessionReplay.redactAllImages = true
+ options.experimental.sessionReplay.redactAllText = true
+
+ // To change quality of the recording (defaults to MEDIUM)
+ options.experimental.sessionReplay.quality = SentryReplayOptions.SentryReplayQuality.MEDIUM // (LOW|MEDIUM|HIGH)
+ }
+ ```
+
+ To learn more visit [Sentry's Mobile Session Replay](https://docs.sentry.io/product/explore/session-replay/mobile/) documentation page.
 
 ## 7.11.0
 

README.md

@@ -26,6 +26,7 @@ Sentry SDK for Java and Android
 | sentry-android-fragment | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment) | 19 |
 | sentry-android-navigation | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation) | 19 |
 | sentry-android-sqlite | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite) | 19 |
+| sentry-android-replay | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-replay/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-replay) | 26 |
 | sentry-compose-android | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-android) | 21 |
 | sentry-compose-desktop | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-desktop/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-desktop) | 
 | sentry-compose | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose) | 

build.gradle.kts

@@ -113,6 +113,7 @@ subprojects {
  "sentry-android-ndk",
  "sentry-android-okhttp",
  "sentry-android-sqlite",
+ "sentry-android-replay",
  "sentry-android-timber"
  )
  if (jacocoAndroidModules.contains(name)) {
@@ -297,7 +298,9 @@ private val androidLibs = setOf(
  "sentry-android-navigation",
  "sentry-android-okhttp",
  "sentry-android-timber",
- "sentry-compose-android"
+ "sentry-compose-android",
+ "sentry-android-sqlite",
+ "sentry-android-replay"
 )
 
 private val androidXLibs = listOf(

buildSrc/src/main/java/Config.kt

@@ -35,6 +35,7 @@ object Config {
 
  val minSdkVersion = 19
  val minSdkVersionOkHttp = 21
+ val minSdkVersionReplay = 19
  val minSdkVersionNdk = 19
  val minSdkVersionCompose = 21
  val targetSdkVersion = sdkVersion
@@ -195,6 +196,7 @@ object Config {
  val jsonUnit = "net.javacrumbs.json-unit:json-unit:2.32.0"
  val hsqldb = "org.hsqldb:hsqldb:2.6.1"
  val javaFaker = "com.github.javafaker:javafaker:1.0.2"
+ val msgpack = "org.msgpack:msgpack-core:0.9.8"
  }
 
  object QualityPlugins {

gradle.properties

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

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

@@ -184,9 +184,11 @@ public final class io/sentry/android/core/CurrentActivityIntegration : android/a
 public final class io/sentry/android/core/DeviceInfoUtil {
  public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;)V
  public fun collectDeviceInformation (ZZ)Lio/sentry/protocol/Device;
+ public static fun getBatteryLevel (Landroid/content/Intent;Lio/sentry/SentryOptions;)Ljava/lang/Float;
  public static fun getInstance (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;)Lio/sentry/android/core/DeviceInfoUtil;
  public fun getOperatingSystem ()Lio/sentry/protocol/OperatingSystem;
  public fun getSideLoadedInfo ()Lio/sentry/android/core/ContextUtils$SideLoadedInfo;
+ public static fun isCharging (Landroid/content/Intent;Lio/sentry/SentryOptions;)Ljava/lang/Boolean;
  public static fun resetInstance ()V
 }
 
@@ -425,7 +427,7 @@ public class io/sentry/android/core/performance/ActivityLifecycleTimeSpan : java
  public final fun getOnStart ()Lio/sentry/android/core/performance/TimeSpan;
 }
 
-public class io/sentry/android/core/performance/AppStartMetrics {
+public class io/sentry/android/core/performance/AppStartMetrics : io/sentry/android/core/performance/ActivityLifecycleCallbacksAdapter {
  public fun <init> ()V
  public fun addActivityLifecycleTimeSpans (Lio/sentry/android/core/performance/ActivityLifecycleTimeSpan;)V
  public fun clear ()V
@@ -441,10 +443,13 @@ public class io/sentry/android/core/performance/AppStartMetrics {
  public static fun getInstance ()Lio/sentry/android/core/performance/AppStartMetrics;
  public fun getSdkInitTimeSpan ()Lio/sentry/android/core/performance/TimeSpan;
  public fun isAppLaunchedInForeground ()Z
+ public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
  public static fun onApplicationCreate (Landroid/app/Application;)V
  public static fun onApplicationPostCreate (Landroid/app/Application;)V
  public static fun onContentProviderCreate (Landroid/content/ContentProvider;)V
  public static fun onContentProviderPostCreate (Landroid/content/ContentProvider;)V
+ public fun registerApplicationForegroundCheck (Landroid/app/Application;)V
+ public fun setAppLaunchedInForeground (Z)V
  public fun setAppStartProfiler (Lio/sentry/ITransactionProfiler;)V
  public fun setAppStartSamplingDecision (Lio/sentry/TracesSamplingDecision;)V
  public fun setAppStartType (Lio/sentry/android/core/performance/AppStartMetrics$AppStartType;)V

sentry-android-core/build.gradle.kts

@@ -76,6 +76,7 @@ dependencies {
  api(projects.sentry)
  compileOnly(projects.sentryAndroidFragment)
  compileOnly(projects.sentryAndroidTimber)
+ compileOnly(projects.sentryAndroidReplay)
  compileOnly(projects.sentryCompose)
  compileOnly(projects.sentryComposeHelper)
 
@@ -104,6 +105,7 @@ dependencies {
  testImplementation(projects.sentryTestSupport)
  testImplementation(projects.sentryAndroidFragment)
  testImplementation(projects.sentryAndroidTimber)
+ testImplementation(projects.sentryAndroidReplay)
  testImplementation(projects.sentryComposeHelper)
  testImplementation(projects.sentryAndroidNdk)
  testRuntimeOnly(Config.Libs.composeUi)

sentry-android-core/proguard-rules.pro

@@ -72,3 +72,9 @@
 -keepnames class io.sentry.exception.SentryHttpClientException
 
 ##---------------End: proguard configuration for sentry-okhttp ----------
+
+##---------------Begin: proguard configuration for sentry-android-replay ----------
+-dontwarn io.sentry.android.replay.ReplayIntegration
+-dontwarn io.sentry.android.replay.DefaultReplayBreadcrumbConverter
+-keepnames class io.sentry.android.replay.ReplayIntegration
+##---------------End: proguard configuration for sentry-android-replay ----------

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

@@ -21,6 +21,7 @@
 import io.sentry.NoOpTransaction;
 import io.sentry.SentryDate;
 import io.sentry.SentryLevel;
+import io.sentry.SentryNanotimeDate;
 import io.sentry.SentryOptions;
 import io.sentry.SpanStatus;
 import io.sentry.TracesSamplingDecision;
@@ -37,6 +38,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
+import java.util.Date;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.Future;
@@ -75,7 +77,7 @@ public final class ActivityLifecycleIntegration
  private @Nullable ISpan appStartSpan;
  private final @NotNull WeakHashMap<Activity, ISpan> ttidSpanMap = new WeakHashMap<>();
  private final @NotNull WeakHashMap<Activity, ISpan> ttfdSpanMap = new WeakHashMap<>();
- private @NotNull SentryDate lastPausedTime = AndroidDateUtils.getCurrentSentryDateTime();
+ private @NotNull SentryDate lastPausedTime = new SentryNanotimeDate(new Date(0), 0);
  private final @NotNull Handler mainHandler = new Handler(Looper.getMainLooper());
  private @Nullable Future<?> ttfdAutoCloseFuture = null;
 
@@ -371,7 +373,7 @@ private void finishTransaction(
  public synchronized void onActivityCreated(
  final @NotNull Activity activity, final @Nullable Bundle savedInstanceState) {
  setColdStart(savedInstanceState);
- if (hub != null) {
+ if (hub != null && options != null && options.isEnableScreenTracking()) {
  final @Nullable String activityClassName = ClassUtil.getClassName(activity);
  hub.configureScope(scope -> scope.setScreen(activityClassName));
  }
@@ -627,6 +629,14 @@ WeakHashMap<Activity, ISpan> getTtfdSpanMap() {
  }
 
  private void setColdStart(final @Nullable Bundle savedInstanceState) {
+ // The very first activity start timestamp cannot be set to the class instantiation time, as it
+ // may happen before an activity is started (service, broadcast receiver, etc). So we set it
+ // here.
+ if (hub != null && lastPausedTime.nanoTimestamp() == 0) {
+ lastPausedTime = hub.getOptions().getDateProvider().now();
+ } else if (lastPausedTime.nanoTimestamp() == 0) {
+ lastPausedTime = AndroidDateUtils.getCurrentSentryDateTime();
+ }
  if (!firstActivityCreated) {
  // if Activity has savedInstanceState then its a warm start
  // https://developer.android.com/topic/performance/vitals/launch-time#warm

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

@@ -22,13 +22,16 @@
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.android.fragment.FragmentLifecycleIntegration;
+import io.sentry.android.replay.DefaultReplayBreadcrumbConverter;
+import io.sentry.android.replay.ReplayIntegration;
 import io.sentry.android.timber.SentryTimberIntegration;
 import io.sentry.cache.PersistingOptionsObserver;
 import io.sentry.cache.PersistingScopeObserver;
 import io.sentry.compose.gestures.ComposeGestureTargetLocator;
 import io.sentry.compose.viewhierarchy.ComposeViewHierarchyExporter;
 import io.sentry.internal.gestures.GestureTargetLocator;
 import io.sentry.internal.viewhierarchy.ViewHierarchyExporter;
+import io.sentry.transport.CurrentDateProvider;
 import io.sentry.transport.NoOpEnvelopeCache;
 import io.sentry.util.LazyEvaluator;
 import io.sentry.util.Objects;
@@ -237,7 +240,8 @@ static void installDefaultIntegrations(
  final @NotNull LoadClass loadClass,
  final @NotNull ActivityFramesTracker activityFramesTracker,
  final boolean isFragmentAvailable,
- final boolean isTimberAvailable) {
+ final boolean isTimberAvailable,
+ final boolean isReplayAvailable) {
 
  // Integration MUST NOT cache option values in ctor, as they will be configured later by the
  // user
@@ -302,6 +306,13 @@ static void installDefaultIntegrations(
  new NetworkBreadcrumbsIntegration(context, buildInfoProvider, options.getLogger()));
  options.addIntegration(new TempSensorBreadcrumbsIntegration(context));
  options.addIntegration(new PhoneStateBreadcrumbsIntegration(context));
+ if (isReplayAvailable) {
+ final ReplayIntegration replay =
+ new ReplayIntegration(context, CurrentDateProvider.getInstance());
+ replay.setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter());
+ options.addIntegration(replay);
+ options.setReplayController(replay);
+ }
  }
 
  /**