Switch new thread to executorService in AssetsModulesLoader

Author: romtsn

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

@@ -200,7 +200,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()));

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

@@ -1,8 +1,8 @@
 package io.sentry.android.core.internal.modules;
 
 import android.content.Context;
-import io.sentry.ILogger;
 import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
 import io.sentry.android.core.ContextUtils;
 import io.sentry.internal.modules.ModulesLoader;
 import java.io.FileNotFoundException;
@@ -18,13 +18,21 @@ public final class AssetsModulesLoader extends ModulesLoader {
 
   private final @NotNull Context context;
 
-  public AssetsModulesLoader(final @NotNull Context context, final @NotNull ILogger logger) {
-    super(logger);
+  public AssetsModulesLoader(final @NotNull Context context, final @NotNull SentryOptions options) {
+    super(options.getLogger());
     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();
+    try {
+      options
+          .getExecutorService()
+          .submit(
+              () -> {
+                getOrLoadModules();
+              });
+    } catch (Throwable e) {
+      options.getLogger().log(SentryLevel.ERROR, "AssetsModulesLoader submit failed", e);
+    }
   }
 
   @Override

sentry-android-core/src/test/java/io/sentry/android/core/internal/modules/AssetsModulesLoaderTest.kt

@@ -2,7 +2,8 @@ package io.sentry.android.core.internal.modules
 
 import android.content.Context
 import android.content.res.AssetManager
-import io.sentry.ILogger
+import io.sentry.SentryOptions
+import io.sentry.test.ImmediateExecutorService
 import java.io.FileNotFoundException
 import java.nio.charset.Charset
 import kotlin.test.Test
@@ -16,7 +17,7 @@ class AssetsModulesLoaderTest {
   class Fixture {
     val context = mock<Context>()
     val assets = mock<AssetManager>()
-    val logger = mock<ILogger>()
+    val options = SentryOptions().apply { executorService = ImmediateExecutorService() }
 
     fun getSut(
       fileName: String = "sentry-external-modules.txt",
@@ -31,7 +32,7 @@ class AssetsModulesLoaderTest {
         whenever(assets.open(fileName)).thenThrow(FileNotFoundException())
       }
       whenever(context.assets).thenReturn(assets)
-      return AssetsModulesLoader(context, logger)
+      return AssetsModulesLoader(context, options)
     }
   }