Merge branch 'main' into markushi/canvas-approach

Author: markushi

.craft.yml

@@ -34,6 +34,7 @@ targets:
       maven:io.sentry:sentry-apache-http-client-5:
       maven:io.sentry:sentry-android:
       maven:io.sentry:sentry-android-core:
+      maven:io.sentry:sentry-android-distribution:
       maven:io.sentry:sentry-android-ndk:
       maven:io.sentry:sentry-android-timber:
       maven:io.sentry:sentry-kotlin-extensions:

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # pin@v2
+        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # pin@v2
+        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # pin@v2

.github/workflows/danger.yml

@@ -6,4 +6,6 @@ on:
 
 jobs:
   danger:
-    uses: getsentry/github-workflows/.github/workflows/danger.yml@v2
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/github-workflows/danger@v3

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Add experimental Sentry Android Distribution module for integrating with Sentry Build Distribution to check for and install updates ([#4804](https://github.com/getsentry/sentry-java/pull/4804))
 - Session Replay: Add new experimental Canvas Capture Strategy ([#4777](https://github.com/getsentry/sentry-java/pull/4777))
   - A new screenshot capture strategy that uses Android's Canvas API for more accurate text masking
   - Any `.drawText()` calls are replaced with rectangles to ensure no text is not captured
@@ -15,6 +16,7 @@
 
 ### Fixes
 
+- Avoid StrictMode warnings ([#4724](https://github.com/getsentry/sentry-java/pull/4724))
 - Use logger from options for JVM profiler ([#4771](https://github.com/getsentry/sentry-java/pull/4771))
 - Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788))
 

README.md

@@ -20,6 +20,7 @@ Sentry SDK for Java and Android
 |-----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ------- |
 | sentry-android                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android)                                                   | 21 |
 | sentry-android-core                     | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core)                                         | 21 |
+| sentry-android-distribution             | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-distribution/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-distribution)                         | 21 |
 | sentry-android-ndk                      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk)                                           | 21 |
 | sentry-android-timber                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber)                                     | 21 |
 | 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)                                 | 21 |

build.gradle.kts

@@ -161,7 +161,7 @@ subprojects {
         }
     }
 
-    if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support" && this.name != "sentry-android-distribution") {
+    if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support") {
         apply<DistributionPlugin>()
         apply<com.vanniktech.maven.publish.MavenPublishPlugin>()
 

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

@@ -30,6 +30,7 @@
 import io.sentry.android.core.internal.modules.AssetsModulesLoader;
 import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
 import io.sentry.android.core.internal.util.AndroidCurrentDateProvider;
+import io.sentry.android.core.internal.util.AndroidRuntimeManager;
 import io.sentry.android.core.internal.util.AndroidThreadChecker;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.core.performance.AppStartMetrics;
@@ -108,7 +109,7 @@ static void loadDefaultAndMetadataOptions(
       final @NotNull BuildInfoProvider buildInfoProvider) {
     Objects.requireNonNull(context, "The context is required.");
 
-    context = ContextUtils.getApplicationContext(context);
+    @NotNull final Context finalContext = ContextUtils.getApplicationContext(context);
 
     Objects.requireNonNull(options, "The options object is required.");
     Objects.requireNonNull(logger, "The ILogger object is required.");
@@ -120,17 +121,22 @@ static void loadDefaultAndMetadataOptions(
     options.setDefaultScopeType(ScopeType.CURRENT);
     options.setOpenTelemetryMode(SentryOpenTelemetryMode.OFF);
     options.setDateProvider(new SentryAndroidDateProvider());
+    options.setRuntimeManager(new AndroidRuntimeManager());
 
     // set a lower flush timeout on Android to avoid ANRs
     options.setFlushTimeoutMillis(DEFAULT_FLUSH_TIMEOUT_MS);
 
     options.setFrameMetricsCollector(
-        new SentryFrameMetricsCollector(context, logger, buildInfoProvider));
+        new SentryFrameMetricsCollector(finalContext, logger, buildInfoProvider));
 
-    ManifestMetadataReader.applyMetadata(context, options, buildInfoProvider);
-    options.setCacheDirPath(getCacheDir(context).getAbsolutePath());
+    ManifestMetadataReader.applyMetadata(finalContext, options, buildInfoProvider);
 
-    readDefaultOptionValues(options, context, buildInfoProvider);
+    options.setCacheDirPath(
+        options
+            .getRuntimeManager()
+            .runWithRelaxedPolicy(() -> getCacheDir(finalContext).getAbsolutePath()));
+
+    readDefaultOptionValues(options, finalContext, buildInfoProvider);
     AppState.getInstance().registerLifecycleObserver(options);
   }
 

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

@@ -20,10 +20,12 @@
 import io.sentry.SentryOptions;
 import io.sentry.TracesSampler;
 import io.sentry.TracesSamplingDecision;
+import io.sentry.android.core.internal.util.AndroidRuntimeManager;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.android.core.performance.TimeSpan;
 import io.sentry.util.AutoClosableReentrantLock;
+import io.sentry.util.runtime.IRuntimeManager;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -108,7 +110,9 @@ private void launchAppStartProfiler(final @NotNull AppStartMetrics appStartMetri
       return;
     }
 
-    final @NotNull File cacheDir = AndroidOptionsInitializer.getCacheDir(context);
+    final @NotNull IRuntimeManager runtimeManager = new AndroidRuntimeManager();
+    final @NotNull File cacheDir =
+        runtimeManager.runWithRelaxedPolicy(() -> AndroidOptionsInitializer.getCacheDir(context));
     final @NotNull File configFile = new File(cacheDir, APP_START_PROFILING_CONFIG_FILE_NAME);
 
     // No config exists: app start profiling is not enabled

sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java

@@ -19,6 +19,7 @@
 import io.sentry.util.HintUtils;
 import io.sentry.util.Objects;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import org.jetbrains.annotations.ApiStatus;
@@ -157,18 +158,18 @@ public static boolean hasStartupCrashMarker(final @NotNull SentryOptions options
 
     final File lastAnrMarker = new File(cacheDirPath, LAST_ANR_REPORT);
     try {
-      if (lastAnrMarker.exists() && lastAnrMarker.canRead()) {
-        final String content = FileUtils.readText(lastAnrMarker);
-        // we wrapped into try-catch already
-        //noinspection ConstantConditions
-        return content.equals("null") ? null : Long.parseLong(content.trim());
-      } else {
+      final String content = FileUtils.readText(lastAnrMarker);
+      // we wrapped into try-catch already
+      //noinspection ConstantConditions
+      return content.equals("null") ? null : Long.parseLong(content.trim());
+    } catch (Throwable e) {
+      if (e instanceof FileNotFoundException) {
         options
             .getLogger()
             .log(DEBUG, "Last ANR marker does not exist. %s.", lastAnrMarker.getAbsolutePath());
+      } else {
+        options.getLogger().log(ERROR, "Error reading last ANR marker", e);
       }
-    } catch (Throwable e) {
-      options.getLogger().log(ERROR, "Error reading last ANR marker", e);
     }
     return null;
   }

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidRuntimeManager.java

@@ -0,0 +1,23 @@
+package io.sentry.android.core.internal.util;
+
+import android.os.StrictMode;
+import io.sentry.util.runtime.IRuntimeManager;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+@ApiStatus.Internal
+public final class AndroidRuntimeManager implements IRuntimeManager {
+  @Override
+  public <T> T runWithRelaxedPolicy(final @NotNull IRuntimeManagerCallback<T> toRun) {
+    final @NotNull StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+    final @NotNull StrictMode.VmPolicy oldVmPolicy = StrictMode.getVmPolicy();
+    StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.LAX);
+    StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX);
+    try {
+      return toRun.run();
+    } finally {
+      StrictMode.setThreadPolicy(oldPolicy);
+      StrictMode.setVmPolicy(oldVmPolicy);
+    }
+  }
+}