Merge branch 'feat/cache-tracing-wrappers' into feat/cache-tracing-option

Author: adinauer

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
-## Unreleased
+## 8.34.0
 
 ### Features
 
+- Add scope-level attributes API ([#5118](https://github.com/getsentry/sentry-java/pull/5118)) via ([#5148](https://github.com/getsentry/sentry-java/pull/5148))
+  - Automatically include scope attributes in logs and metrics ([#5120](https://github.com/getsentry/sentry-java/pull/5120))
+  - New APIs are `Sentry.setAttribute`, `Sentry.setAttributes`, `Sentry.removeAttribute`
+- Support collections and arrays in attribute type inference ([#5124](https://github.com/getsentry/sentry-java/pull/5124))
+- Add support for `SENTRY_SAMPLE_RATE` environment variable / `sample-rate` property ([#5112](https://github.com/getsentry/sentry-java/pull/5112))
 - Create `sentry-opentelemetry-otlp` and `sentry-opentelemetry-otlp-spring` modules for combining OpenTelemetry SDK OTLP export with Sentry SDK ([#5100](https://github.com/getsentry/sentry-java/pull/5100))
   - OpenTelemetry is configured to send spans to Sentry directly using an OTLP endpoint.
   - Sentry only uses trace and span ID from OpenTelemetry (via `OpenTelemetryOtlpEventProcessor`) but will not send spans through OpenTelemetry nor use OpenTelemetry `Context` for `Scopes` propagation.
@@ -27,10 +32,19 @@
     <meta-data android:name="io.sentry.screenshot.mask-all-text" android:value="true" />
     <meta-data android:name="io.sentry.screenshot.mask-all-images" android:value="true" />
     ```
+- The `ManifestMetaDataReader` now read the `DIST` ([#5107](https://github.com/getsentry/sentry-java/pull/5107))
 
 ### Fixes
 
+- Fix attribute type detection for `Long`, `Short`, `Byte`, `BigInteger`, `AtomicInteger`, and `AtomicLong` being incorrectly inferred as `double` instead of `integer` ([#5122](https://github.com/getsentry/sentry-java/pull/5122))
+- Remove `AndroidRuntimeManager` StrictMode relaxation to prevent ANRs during SDK init ([#5127](https://github.com/getsentry/sentry-java/pull/5127))
+  - **IMPORTANT:** StrictMode violations may appear again in debug builds. This is intentional to prevent ANRs in production releases.
 - Fix crash when unregistering `SystemEventsBroadcastReceiver` with try-catch block. ([#5106](https://github.com/getsentry/sentry-java/pull/5106))
+- Use `peekDecorView` instead of `getDecorView` in `SentryGestureListener` to avoid forcing view hierarchy construction ([#5134](https://github.com/getsentry/sentry-java/pull/5134))
+- Log an actionable error message when Relay returns HTTP 413 (Content Too Large) ([#5115](https://github.com/getsentry/sentry-java/pull/5115))
+  - Also switch the client report discard reason for all HTTP 4xx/5xx errors (except 429) from `network_error` to `send_error`
+- Trim DSN string before parsing to avoid `URISyntaxException` caused by trailing whitespace ([#5113](https://github.com/getsentry/sentry-java/pull/5113))
+- Reduce allocations and bytecode instructions during `Sentry.init` ([#5135](https://github.com/getsentry/sentry-java/pull/5135))
 
 ### Dependencies
 

gradle.properties

@@ -12,7 +12,7 @@ android.useAndroidX=true
 android.experimental.lint.version=8.9.0
 
 # Release information
-versionName=8.33.0
+versionName=8.34.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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

@@ -32,7 +32,6 @@
 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;
@@ -123,7 +122,6 @@ static void loadDefaultAndMetadataOptions(
     options.setDefaultScopeType(ScopeType.CURRENT);
     options.setOpenTelemetryMode(SentryOpenTelemetryMode.OFF);
     options.setDateProvider(new SentryAndroidDateProvider());
-    options.setRuntimeManager(new AndroidRuntimeManager());
     options.getLogs().setLoggerBatchProcessorFactory(new AndroidLoggerBatchProcessorFactory());
     options.getMetrics().setMetricsBatchProcessorFactory(new AndroidMetricsBatchProcessorFactory());
 
@@ -135,13 +133,11 @@ static void loadDefaultAndMetadataOptions(
 
     ManifestMetadataReader.applyMetadata(finalContext, options, buildInfoProvider);
 
-    options.setCacheDirPath(
-        options
-            .getRuntimeManager()
-            .runWithRelaxedPolicy(() -> getCacheDir(finalContext).getAbsolutePath()));
+    options.setCacheDirPath(getCacheDir(finalContext).getAbsolutePath());
 
     readDefaultOptionValues(options, finalContext, buildInfoProvider);
     AppState.getInstance().registerLifecycleObserver(options);
+    options.activate();
   }
 
   @TestOnly
@@ -200,7 +196,7 @@ static void initializeIntegrationsAndProcessors(
     final @NotNull AppStartMetrics appStartMetrics = AppStartMetrics.getInstance();
 
     if (options.getModulesLoader() instanceof NoOpModulesLoader) {
-      options.setModulesLoader(new AssetsModulesLoader(context, options.getLogger()));
+      options.setModulesLoader(new AssetsModulesLoader(context, options));
     }
     if (options.getDebugMetaLoader() instanceof NoOpDebugMetaLoader) {
       options.setDebugMetaLoader(new AssetsDebugMetaLoader(context, options.getLogger()));
@@ -470,8 +466,7 @@ private static void readDefaultOptionValues(
 
     if (options.getDistinctId() == null) {
       try {
-        options.setDistinctId(
-            options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context)));
+        options.setDistinctId(Installation.id(context));
       } catch (RuntimeException e) {
         options.getLogger().log(SentryLevel.ERROR, "Could not generate distinct Id.", e);
       }

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

@@ -564,7 +564,7 @@ private void mergeUser(final @NotNull SentryBaseEvent event) {
 
   private @Nullable String getDeviceId() {
     try {
-      return options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context));
+      return Installation.id(context);
     } catch (Throwable e) {
       options.getLogger().log(SentryLevel.ERROR, "Error getting installationId.", e);
     }

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

@@ -174,7 +174,7 @@ private void mergeUser(final @NotNull SentryBaseEvent event) {
 
     // userId should be set even if event is Cached as the userId is static and won't change anyway.
     if (user.getId() == null) {
-      user.setId(options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context)));
+      user.setId(Installation.id(context));
     }
     if (user.getIpAddress() == null && options.isSendDefaultPii()) {
       user.setIpAddress(IpAddressUtils.DEFAULT_IP_ADDRESS);
@@ -372,7 +372,7 @@ private void setAppExtras(final @NotNull App app, final @NotNull Hint hint) {
    */
   public @NotNull User getDefaultUser(final @NotNull Context context) {
     final @NotNull User user = new User();
-    user.setId(options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context)));
+    user.setId(Installation.id(context));
     return user;
   }
 

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

@@ -232,27 +232,21 @@ private void setDeviceIO(
     // this way of getting the size of storage might be problematic for storages bigger than 2GB
     // check the use of
     // https://developer.android.com/reference/java/io/File.html#getFreeSpace%28%29
-    options
-        .getRuntimeManager()
-        .runWithRelaxedPolicy(
-            () -> {
-              final @Nullable File dataDir = Environment.getDataDirectory();
-              if (dataDir != null) {
-                StatFs internalStorageStat = new StatFs(dataDir.getPath());
-                device.setStorageSize(getTotalInternalStorage(internalStorageStat));
-                device.setFreeStorage(getUnusedInternalStorage(internalStorageStat));
-              }
-
-              if (includeExternalStorage) {
-                final @Nullable File internalStorageFile = context.getExternalFilesDir(null);
-                final @Nullable StatFs externalStorageStat =
-                    getExternalStorageStat(internalStorageFile);
-                if (externalStorageStat != null) {
-                  device.setExternalStorageSize(getTotalExternalStorage(externalStorageStat));
-                  device.setExternalFreeStorage(getUnusedExternalStorage(externalStorageStat));
-                }
-              }
-            });
+    final @Nullable File dataDir = Environment.getDataDirectory();
+    if (dataDir != null) {
+      StatFs internalStorageStat = new StatFs(dataDir.getPath());
+      device.setStorageSize(getTotalInternalStorage(internalStorageStat));
+      device.setFreeStorage(getUnusedInternalStorage(internalStorageStat));
+    }
+
+    if (includeExternalStorage) {
+      final @Nullable File internalStorageFile = context.getExternalFilesDir(null);
+      final @Nullable StatFs externalStorageStat = getExternalStorageStat(internalStorageFile);
+      if (externalStorageStat != null) {
+        device.setExternalStorageSize(getTotalExternalStorage(externalStorageStat));
+        device.setExternalFreeStorage(getUnusedExternalStorage(externalStorageStat));
+      }
+    }
 
     if (device.getConnectionType() == null) {
       // wifi, ethernet or cellular, null if none
@@ -493,7 +487,7 @@ private Long getUnusedExternalStorage(final @NotNull StatFs stat) {
   @Nullable
   private String getDeviceId() {
     try {
-      return options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context));
+      return Installation.id(context);
     } catch (Throwable e) {
       options.getLogger().log(SentryLevel.ERROR, "Error getting installationId.", e);
     }

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

@@ -102,8 +102,7 @@ public static Map<String, Object> serializeScope(
       }
       if (user.getId() == null) {
         try {
-          user.setId(
-              options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context)));
+          user.setId(Installation.id(context));
         } catch (RuntimeException e) {
           logger.log(SentryLevel.ERROR, "Could not retrieve installation ID", e);
         }

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

@@ -41,6 +41,7 @@ final class ManifestMetadataReader {
   static final String NDK_SCOPE_SYNC_ENABLE = "io.sentry.ndk.scope-sync.enable";
   static final String NDK_SDK_NAME = "io.sentry.ndk.sdk-name";
   static final String RELEASE = "io.sentry.release";
+  static final String DIST = "io.sentry.dist";
   static final String ENVIRONMENT = "io.sentry.environment";
   static final String SDK_NAME = "io.sentry.sdk.name";
   static final String SDK_VERSION = "io.sentry.sdk.version";
@@ -273,6 +274,8 @@ static void applyMetadata(
 
         options.setRelease(readString(metadata, logger, RELEASE, options.getRelease()));
 
+        options.setDist(readString(metadata, logger, DIST, options.getDist()));
+
         options.setEnvironment(readString(metadata, logger, ENVIRONMENT, options.getEnvironment()));
 
         options.setSessionTrackingIntervalMillis(

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

@@ -20,12 +20,10 @@
 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;
@@ -110,9 +108,7 @@ private void launchAppStartProfiler(final @NotNull AppStartMetrics appStartMetri
       return;
     }
 
-    final @NotNull IRuntimeManager runtimeManager = new AndroidRuntimeManager();
-    final @NotNull File cacheDir =
-        runtimeManager.runWithRelaxedPolicy(() -> AndroidOptionsInitializer.getCacheDir(context));
+    final @NotNull File cacheDir = 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

@@ -125,10 +125,9 @@ public static boolean hasStartupCrashMarker(final @NotNull SentryOptions options
 
     final File crashMarkerFile = new File(outboxPath, STARTUP_CRASH_MARKER_FILE);
     try {
-      final boolean exists =
-          options.getRuntimeManager().runWithRelaxedPolicy(() -> crashMarkerFile.exists());
+      final boolean exists = crashMarkerFile.exists();
       if (exists) {
-        if (!options.getRuntimeManager().runWithRelaxedPolicy(() -> crashMarkerFile.delete())) {
+        if (!crashMarkerFile.delete()) {
           options
               .getLogger()
               .log(