Merge branch 'main' into feat/profiling-remove-vendored-code

Author: lbloder

CHANGELOG.md

@@ -11,12 +11,15 @@
 
 - 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))
+- [Config] Trim whitespace on properties path ([#4880](https://github.com/getsentry/sentry-java/pull/4880))
+- Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
 
 ### Improvements
 
 - Fallback to distinct-id as user.id logging attribute when user is not set ([#4847](https://github.com/getsentry/sentry-java/pull/4847))
 - Report Timber.tag() as `timber.tag` log attribute ([#4845](https://github.com/getsentry/sentry-java/pull/4845))
 - Session Replay: Add screenshot strategy serialization to RRWeb events ([#4851](https://github.com/getsentry/sentry-java/pull/4851))
+- Log why a properties file was not loaded ([#4879](https://github.com/getsentry/sentry-java/pull/4879))
 
 ### Dependencies
 

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

@@ -146,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) {
@@ -254,8 +257,9 @@ static void initializeIntegrationsAndProcessors(
       options.setCompositePerformanceCollector(new DefaultCompositePerformanceCollector(options));
     }
 
-    if (options.getReplayController().getBreadcrumbConverter()
-        instanceof NoOpReplayBreadcrumbConverter) {
+    if (isReplayAvailable
+        && options.getReplayController().getBreadcrumbConverter()
+            instanceof NoOpReplayBreadcrumbConverter) {
       options
           .getReplayController()
           .setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter(options));

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/src/main/java/io/sentry/config/FilesystemPropertiesLoader.java

@@ -5,7 +5,6 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
@@ -24,15 +23,25 @@ public FilesystemPropertiesLoader(@NotNull String filePath, @NotNull ILogger log
   @Override
   public @Nullable Properties load() {
     try {
-      final File f = new File(filePath);
+      final File f = new File(filePath.trim());
       if (f.isFile() && f.canRead()) {
         try (InputStream is = new BufferedInputStream(new FileInputStream(f))) {
           final Properties properties = new Properties();
           properties.load(is);
           return properties;
         }
+      } else if (!f.isFile()) {
+        logger.log(
+            SentryLevel.ERROR,
+            "Failed to load Sentry configuration since it is not a file or does not exist: %s",
+            filePath);
+      } else if (!f.canRead()) {
+        logger.log(
+            SentryLevel.ERROR,
+            "Failed to load Sentry configuration since it is not readable: %s",
+            filePath);
       }
-    } catch (IOException e) {
+    } catch (Throwable e) {
       logger.log(
           SentryLevel.ERROR, e, "Failed to load Sentry configuration from file: %s", filePath);
       return null;

sentry/src/test/java/io/sentry/config/FilesystemPropertiesLoaderTest.kt

@@ -22,6 +22,17 @@ class FilesystemPropertiesLoaderTest {
     assertEquals("some-dsn", properties["dsn"])
   }
 
+  @Test
+  fun `returns properties when file has whitespace`() {
+    val file = folder.newFile("sentry.properties")
+    file.writeText("dsn=some-dsn", Charset.defaultCharset())
+    val loader =
+      FilesystemPropertiesLoader("   " + file.absolutePath + "  ", NoOpLogger.getInstance())
+    val properties = loader.load()
+    assertNotNull(properties)
+    assertEquals("some-dsn", properties["dsn"])
+  }
+
   @Test
   fun `returns null when property file not found`() {
     val loader =