Merge branch 'main' into feat/experimental-otel-global-hub-mode

Author: adinauer

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### Fixes
+
+- Update profile chunk rate limit and client report ([#4353](https://github.com/getsentry/sentry-java/pull/4353))
+
+## 8.9.0
+
 ### Features
 
 - Add `SentryWrapper.wrapRunnable` to wrap `Runnable` for use with Sentry ([#4332](https://github.com/getsentry/sentry-java/pull/4332))
@@ -24,6 +30,7 @@
 ### Improvements
 
 - Make user interaction tracing faster and do fewer allocations ([#4347](https://github.com/getsentry/sentry-java/pull/4347))
+- Pre-load modules on a background thread upon SDK init ([#4348](https://github.com/getsentry/sentry-java/pull/4348))
 
 ## 8.8.0
 

gradle.properties

@@ -14,7 +14,7 @@ org.gradle.workers.max=2
 android.useAndroidX=true
 
 # Release information
-versionName=8.8.0
+versionName=8.9.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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

@@ -178,7 +178,7 @@ private void start() {
       final @Nullable RateLimiter rateLimiter = scopes.getRateLimiter();
       if (rateLimiter != null
           && (rateLimiter.isActiveForCategory(All)
-              || rateLimiter.isActiveForCategory(DataCategory.ProfileChunk))) {
+              || rateLimiter.isActiveForCategory(DataCategory.ProfileChunkUi))) {
         logger.log(SentryLevel.WARNING, "SDK is rate limited. Stopping profiler.");
         // Let's stop and reset profiler id, as the profile is now broken anyway
         stop(false);
@@ -385,7 +385,7 @@ public int getRootSpanCounter() {
   public void onRateLimitChanged(@NotNull RateLimiter rateLimiter) {
     // We stop the profiler as soon as we are rate limited, to avoid the performance overhead
     if (rateLimiter.isActiveForCategory(All)
-        || rateLimiter.isActiveForCategory(DataCategory.ProfileChunk)) {
+        || rateLimiter.isActiveForCategory(DataCategory.ProfileChunkUi)) {
       logger.log(SentryLevel.WARNING, "SDK is rate limited. Stopping profiler.");
       stop(false);
     }

sentry-android-core/src/main/java/io/sentry/android/core/internal/modules/AssetsModulesLoader.java

@@ -21,6 +21,10 @@ public final class AssetsModulesLoader extends ModulesLoader {
   public AssetsModulesLoader(final @NotNull Context context, final @NotNull ILogger logger) {
     super(logger);
     this.context = ContextUtils.getApplicationContext(context);
+
+    // pre-load modules on a bg thread to avoid doing so on the main thread in case of a crash/error
+    //noinspection Convert2MethodRef
+    new Thread(() -> getOrLoadModules()).start();
   }
 
   @Override

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

@@ -505,7 +505,7 @@ class AndroidContinuousProfilerTest {
     fun `profiler stops when rate limited`() {
         val profiler = fixture.getSut()
         val rateLimiter = mock<RateLimiter>()
-        whenever(rateLimiter.isActiveForCategory(DataCategory.ProfileChunk)).thenReturn(true)
+        whenever(rateLimiter.isActiveForCategory(DataCategory.ProfileChunkUi)).thenReturn(true)
 
         profiler.startProfiler(ProfileLifecycle.MANUAL, fixture.mockTracesSampler)
         assertTrue(profiler.isRunning)
@@ -521,7 +521,7 @@ class AndroidContinuousProfilerTest {
     fun `profiler does not start when rate limited`() {
         val profiler = fixture.getSut()
         val rateLimiter = mock<RateLimiter>()
-        whenever(rateLimiter.isActiveForCategory(DataCategory.ProfileChunk)).thenReturn(true)
+        whenever(rateLimiter.isActiveForCategory(DataCategory.ProfileChunkUi)).thenReturn(true)
         whenever(fixture.scopes.rateLimiter).thenReturn(rateLimiter)
 
         // If the SDK is rate limited, the profiler should never start

sentry/api/sentry.api

@@ -354,7 +354,7 @@ public final class io/sentry/DataCategory : java/lang/Enum {
 	public static final field Error Lio/sentry/DataCategory;
 	public static final field Monitor Lio/sentry/DataCategory;
 	public static final field Profile Lio/sentry/DataCategory;
-	public static final field ProfileChunk Lio/sentry/DataCategory;
+	public static final field ProfileChunkUi Lio/sentry/DataCategory;
 	public static final field Replay Lio/sentry/DataCategory;
 	public static final field Security Lio/sentry/DataCategory;
 	public static final field Session Lio/sentry/DataCategory;

sentry/src/main/java/io/sentry/DataCategory.java

@@ -12,7 +12,7 @@ public enum DataCategory {
   Attachment("attachment"),
   Monitor("monitor"),
   Profile("profile"),
-  ProfileChunk("profile_chunk"),
+  ProfileChunkUi("profile_chunk_ui"),
   Transaction("transaction"),
   Replay("replay"),
   Span("span"),

sentry/src/main/java/io/sentry/SentryItemType.java

@@ -15,7 +15,7 @@ public enum SentryItemType implements JsonSerializable {
   Attachment("attachment"),
   Transaction("transaction"),
   Profile("profile"),
-  ProfileChunk("profile_chunk"),
+  ProfileChunk("profile_chunk_ui"),
   ClientReport("client_report"),
   ReplayEvent("replay_event"),
   ReplayRecording("replay_recording"),

sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java

@@ -166,7 +166,7 @@ private DataCategory categoryFromItemType(SentryItemType itemType) {
       return DataCategory.Profile;
     }
     if (SentryItemType.ProfileChunk.equals(itemType)) {
-      return DataCategory.ProfileChunk;
+      return DataCategory.ProfileChunkUi;
     }
     if (SentryItemType.Attachment.equals(itemType)) {
       return DataCategory.Attachment;

sentry/src/main/java/io/sentry/internal/modules/ModulesLoader.java

@@ -1,7 +1,9 @@
 package io.sentry.internal.modules;
 
 import io.sentry.ILogger;
+import io.sentry.ISentryLifecycleToken;
 import io.sentry.SentryLevel;
+import io.sentry.util.AutoClosableReentrantLock;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,18 +23,23 @@ public abstract class ModulesLoader implements IModulesLoader {
 
   public static final String EXTERNAL_MODULES_FILENAME = "sentry-external-modules.txt";
   protected final @NotNull ILogger logger;
-  private @Nullable Map<String, String> cachedModules = null;
+
+  private final @NotNull AutoClosableReentrantLock modulesLock = new AutoClosableReentrantLock();
+  private volatile @Nullable Map<String, String> cachedModules = null;
 
   public ModulesLoader(final @NotNull ILogger logger) {
     this.logger = logger;
   }
 
   @Override
   public @Nullable Map<String, String> getOrLoadModules() {
-    if (cachedModules != null) {
-      return cachedModules;
+    if (cachedModules == null) {
+      try (final @NotNull ISentryLifecycleToken ignored = modulesLock.acquire()) {
+        if (cachedModules == null) {
+          cachedModules = loadModules();
+        }
+      }
     }
-    cachedModules = loadModules();
     return cachedModules;
   }