Merge branch 'main' into feat/better-logging-if-properties-file-not-loaded

Author: adinauer

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Removed SentryExecutorService limit for delayed scheduled tasks ([#4846](https://github.com/getsentry/sentry-java/pull/4846))
 - Fix visual artifacts for the Canvas strategy on some devices ([#4861](https://github.com/getsentry/sentry-java/pull/4861))
+- Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
 
 ### Improvements
 
@@ -18,6 +19,7 @@
 - Bump Native SDK from v0.11.3 to v0.12.1 ([#4859](https://github.com/getsentry/sentry-java/pull/4859))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0121)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.11.3...0.12.1)
+- Bump Spring Boot 4 to RC2 ([#4886](https://github.com/getsentry/sentry-java/pull/4886))
 
 ## 8.25.0
 

gradle/libs.versions.toml

@@ -31,7 +31,7 @@ retrofit = "2.9.0"
 slf4j = "1.7.30"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
-springboot4 = "4.0.0-RC1"
+springboot4 = "4.0.0-RC2"
 # Android
 targetSdk = "34"
 compileSdk = "34"

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

@@ -16,6 +16,7 @@
 import io.sentry.NoOpCompositePerformanceCollector;
 import io.sentry.NoOpConnectionStatusProvider;
 import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpReplayBreadcrumbConverter;
 import io.sentry.NoOpSocketTagger;
 import io.sentry.NoOpTransactionProfiler;
 import io.sentry.NoopVersionDetector;
@@ -145,21 +146,24 @@ static void initializeIntegrationsAndProcessors(
       final @NotNull SentryAndroidOptions options,
       final @NotNull Context context,
       final @NotNull io.sentry.util.LoadClass loadClass,
-      final @NotNull ActivityFramesTracker activityFramesTracker) {
+      final @NotNull ActivityFramesTracker activityFramesTracker,
+      final boolean isReplayAvailable) {
     initializeIntegrationsAndProcessors(
         options,
         context,
         new BuildInfoProvider(new AndroidLogger()),
         loadClass,
-        activityFramesTracker);
+        activityFramesTracker,
+        isReplayAvailable);
   }
 
   static void initializeIntegrationsAndProcessors(
       final @NotNull SentryAndroidOptions options,
       final @NotNull Context context,
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @NotNull io.sentry.util.LoadClass loadClass,
-      final @NotNull ActivityFramesTracker activityFramesTracker) {
+      final @NotNull ActivityFramesTracker activityFramesTracker,
+      final boolean isReplayAvailable) {
 
     if (options.getCacheDirPath() != null
         && options.getEnvelopeDiskCache() instanceof NoOpEnvelopeCache) {
@@ -253,6 +257,14 @@ static void initializeIntegrationsAndProcessors(
       options.setCompositePerformanceCollector(new DefaultCompositePerformanceCollector(options));
     }
 
+    if (isReplayAvailable
+        && options.getReplayController().getBreadcrumbConverter()
+            instanceof NoOpReplayBreadcrumbConverter) {
+      options
+          .getReplayController()
+          .setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter(options));
+    }
+
     // Check if the profiler was already instantiated in the app start.
     // We use the Android profiler, that uses a global start/stop api, so we need to preserve the
     // state of the profiler, and it's only possible retaining the instance.
@@ -406,7 +418,6 @@ static void installDefaultIntegrations(
     if (isReplayAvailable) {
       final ReplayIntegration replay =
           new ReplayIntegration(context, CurrentDateProvider.getInstance());
-      replay.setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter());
       options.addIntegration(replay);
       options.setReplayController(replay);
     }

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

@@ -171,7 +171,12 @@ public static void init(
             }
 
             AndroidOptionsInitializer.initializeIntegrationsAndProcessors(
-                options, context, buildInfoProvider, loadClass, activityFramesTracker);
+                options,
+                context,
+                buildInfoProvider,
+                loadClass,
+                activityFramesTracker,
+                isReplayAvailable);
 
             deduplicateIntegrations(options, isFragmentAvailable, isTimberAvailable);
           },

sentry-android-core/src/test/java/io/sentry/android/core/AndroidContinuousProfilerTest.kt

@@ -134,6 +134,7 @@ class AndroidContinuousProfilerTest {
       buildInfoProvider,
       loadClass,
       activityFramesTracker,
+      false,
     )
     // Profiler doesn't start if the folder doesn't exists.
     // Usually it's generated when calling Sentry.init, but for tests we can create it manually.

sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt

@@ -117,6 +117,7 @@ class AndroidOptionsInitializerTest {
         if (useRealContext) context else mockContext,
         loadClass,
         activityFramesTracker,
+        false,
       )
     }
 
@@ -162,6 +163,7 @@ class AndroidOptionsInitializerTest {
         buildInfo,
         loadClass,
         activityFramesTracker,
+        isReplayAvailable,
       )
     }
 

sentry-android-core/src/test/java/io/sentry/android/core/AndroidProfilerTest.kt

@@ -136,6 +136,7 @@ class AndroidProfilerTest {
       buildInfoProvider,
       loadClass,
       activityFramesTracker,
+      false,
     )
     // Profiler doesn't start if the folder doesn't exists.
     // Usually it's generated when calling Sentry.init, but for tests we can create it manually.

sentry-android-core/src/test/java/io/sentry/android/core/AndroidTransactionProfilerTest.kt

@@ -152,6 +152,7 @@ class AndroidTransactionProfilerTest {
       buildInfoProvider,
       loadClass,
       activityFramesTracker,
+      false,
     )
     // Profiler doesn't start if the folder doesn't exists.
     // Usually it's generated when calling Sentry.init, but for tests we can create it manually.

sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt

@@ -168,6 +168,7 @@ class SentryInitProviderTest {
       mockContext,
       loadClass,
       activityFramesTracker,
+      false,
     )
 
     assertFalse(sentryOptions.isEnableNdk)

sentry-android-replay/api/sentry-android-replay.api

@@ -9,6 +9,7 @@ public final class io/sentry/android/replay/BuildConfig {
 public class io/sentry/android/replay/DefaultReplayBreadcrumbConverter : io/sentry/ReplayBreadcrumbConverter {
 	public static final field $stable I
 	public fun <init> ()V
+	public fun <init> (Lio/sentry/SentryOptions;)V
 	public fun convert (Lio/sentry/Breadcrumb;)Lio/sentry/rrweb/RRWebEvent;
 }