perf(modules): Pre-load modules on a background thread

Author: romtsn

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

@@ -10,6 +10,8 @@
 import java.io.InputStream;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -21,6 +23,12 @@ 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
+    final @NotNull ExecutorService executorService = Executors.newSingleThreadExecutor();
+    //noinspection Convert2MethodRef
+    executorService.submit(() -> getOrLoadModules());
+    executorService.shutdown();
   }
 
   @Override

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;
   }