Revert "Migrate to Firebase common executors (#6128)"

This reverts commit 96b702f.

Author: mrober

firebase-crashlytics/firebase-crashlytics.gradle

@@ -98,7 +98,6 @@ dependencies {
     testImplementation(libs.mockito.core)
     testImplementation(libs.robolectric)
     testImplementation(libs.truth)
-    testImplementation(project(":integ-testing"))
 
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.test.runner)

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -34,10 +34,8 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
@@ -57,15 +55,13 @@
 import java.util.TreeSet;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
 public class CrashlyticsControllerTest extends CrashlyticsTestCase {
   private static final String GOOGLE_APP_ID = "google:app:id";
   private static final String SESSION_ID = "session_id";
 
-  private final CrashlyticsWorker commonWorker =
-      new CrashlyticsWorker(TestOnlyExecutors.background());
-
   private Context testContext;
   private IdManager idManager;
   private SettingsProvider testSettingsProvider;
@@ -103,19 +99,14 @@ protected void setUp() throws Exception {
     when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
   }
 
-  @Override
-  protected void tearDown() throws Exception {
-    super.tearDown();
-    commonWorker.await();
-  }
-
   /** A convenience class for building CrashlyticsController instances for testing. */
   private class ControllerBuilder {
     private DataCollectionArbiter dataCollectionArbiter;
     private CrashlyticsNativeComponent nativeComponent = null;
     private AnalyticsEventLogger analyticsEventLogger;
     private SessionReportingCoordinator sessionReportingCoordinator;
 
+    private CrashlyticsBackgroundWorker backgroundWorker;
     private LogFileManager logFileManager = null;
 
     private UserMetadata userMetadata = null;
@@ -127,6 +118,8 @@ private class ControllerBuilder {
       analyticsEventLogger = mock(AnalyticsEventLogger.class);
 
       sessionReportingCoordinator = mockSessionReportingCoordinator;
+
+      backgroundWorker = new CrashlyticsBackgroundWorker(new SameThreadExecutorService());
     }
 
     ControllerBuilder setDataCollectionArbiter(DataCollectionArbiter arbiter) {
@@ -175,7 +168,7 @@ public CrashlyticsController build() {
       final CrashlyticsController controller =
           new CrashlyticsController(
               testContext.getApplicationContext(),
-              commonWorker,
+              backgroundWorker,
               idManager,
               dataCollectionArbiter,
               testFileStore,
@@ -215,8 +208,6 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal()
     controller.writeNonFatalException(thread, nonFatal);
     controller.doCloseSessions(testSettingsProvider);
 
-    commonWorker.await();
-
     verify(mockSessionReportingCoordinator)
         .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong());
   }
@@ -237,8 +228,9 @@ public void testFatalException_callsSessionReportingCoordinatorPersistFatal() th
         .persistFatalEvent(eq(fatal), eq(thread), eq(sessionId), anyLong());
   }
 
+  @Test
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
-  public void testOnDemandFatal_callLogFatalException() throws Exception {
+  public void testOnDemandFatal_callLogFatalException() {
     Thread thread = Thread.currentThread();
     Exception fatal = new RuntimeException("Fatal");
     Thread.UncaughtExceptionHandler exceptionHandler = mock(Thread.UncaughtExceptionHandler.class);
@@ -254,8 +246,6 @@ public void testOnDemandFatal_callLogFatalException() throws Exception {
     controller.enableExceptionHandling(SESSION_ID, exceptionHandler, testSettingsProvider);
     controller.logFatalException(thread, fatal);
 
-    commonWorker.await();
-
     verify(mockUserMetadata).setNewSession(not(eq(SESSION_ID)));
   }
 
@@ -333,20 +323,17 @@ public File getOsFile() {
     final CrashlyticsController controller =
         builder().setNativeComponent(mockNativeComponent).setLogFileManager(logFileManager).build();
 
-    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    commonWorker.await();
-
+    controller.finalizeSessions(testSettingsProvider);
     verify(mockSessionReportingCoordinator)
         .finalizeSessionWithNativeEvent(eq(previousSessionId), any(), any());
     verify(mockSessionReportingCoordinator, never())
         .finalizeSessionWithNativeEvent(eq(sessionId), any(), any());
   }
 
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
-  public void testMissingNativeComponentCausesNoReports() throws Exception {
+  public void testMissingNativeComponentCausesNoReports() {
     final CrashlyticsController controller = createController();
-    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    commonWorker.await();
+    controller.finalizeSessions(testSettingsProvider);
 
     List<String> sessions = testFileStore.getAllOpenSessionIds();
     for (String sessionId : sessions) {
@@ -397,8 +384,7 @@ public void testFinalizeSessionAfterCrashOk() throws Exception {
         testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    commonWorker.await();
+    controller.finalizeSessions(testSettingsProvider);
   }
 
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
@@ -549,7 +535,7 @@ public void testUploadDisabledThenEnabled() throws Exception {
   }
 
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
-  public void testFatalEvent_sendsAppExceptionEvent() throws Exception {
+  public void testFatalEvent_sendsAppExceptionEvent() {
     final String sessionId = "sessionId";
     final LogFileManager logFileManager = new LogFileManager(testFileStore);
     final AnalyticsEventLogger mockFirebaseAnalyticsLogger = mock(AnalyticsEventLogger.class);
@@ -562,14 +548,10 @@ public void testFatalEvent_sendsAppExceptionEvent() throws Exception {
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singleton(sessionId)));
 
-    commonWorker.submit(
-        () -> {
-          controller.openSession(SESSION_ID);
-          controller.handleUncaughtException(
-              testSettingsProvider, Thread.currentThread(), new RuntimeException("Fatal"));
-          controller.finalizeSessions(testSettingsProvider);
-        });
-    commonWorker.await();
+    controller.openSession(SESSION_ID);
+    controller.handleUncaughtException(
+        testSettingsProvider, Thread.currentThread(), new RuntimeException("Fatal"));
+    controller.finalizeSessions(testSettingsProvider);
 
     assertFirebaseAnalyticsCrashEvent(mockFirebaseAnalyticsLogger);
   }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java

@@ -27,11 +27,9 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
@@ -46,6 +44,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 public class CrashlyticsCoreInitializationTest extends CrashlyticsTestCase {
 
@@ -90,9 +89,8 @@ private static final class CoreBuilder {
     private IdManager idManager;
     private CrashlyticsNativeComponent nativeComponent;
     private DataCollectionArbiter arbiter;
+    private ExecutorService crashHandlerExecutor;
     private FileStore fileStore;
-    private CrashlyticsWorker commonWorker;
-    private CrashlyticsWorker diskWriteWorker;
 
     public CoreBuilder(Context context, FirebaseOptions firebaseOptions) {
       app = mock(FirebaseApp.class);
@@ -121,8 +119,7 @@ public void whenAvailable(
       arbiter = mock(DataCollectionArbiter.class);
       when(arbiter.isAutomaticDataCollectionEnabled()).thenReturn(true);
 
-      commonWorker = new CrashlyticsWorker(TestOnlyExecutors.background());
-      diskWriteWorker = new CrashlyticsWorker(TestOnlyExecutors.background());
+      crashHandlerExecutor = new SameThreadExecutorService();
       fileStore = new FileStore(context);
     }
 
@@ -145,10 +142,9 @@ public CrashlyticsCore build() {
           new DisabledBreadcrumbSource(),
           new UnavailableAnalyticsEventLogger(),
           fileStore,
+          crashHandlerExecutor,
           mock(CrashlyticsAppQualitySessionsSubscriber.class),
-          mock(RemoteConfigDeferredProxy.class),
-          commonWorker,
-          diskWriteWorker);
+          mock(RemoteConfigDeferredProxy.class));
     }
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -28,12 +28,10 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.crashlytics.BuildConfig;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
@@ -429,10 +427,9 @@ CrashlyticsCore build(Context context) {
               breadcrumbSource,
               new UnavailableAnalyticsEventLogger(),
               new FileStore(context),
+              new SameThreadExecutorService(),
               mock(CrashlyticsAppQualitySessionsSubscriber.class),
-              mock(RemoteConfigDeferredProxy.class),
-              new CrashlyticsWorker(TestOnlyExecutors.background()),
-              new CrashlyticsWorker(TestOnlyExecutors.background()));
+              mock(RemoteConfigDeferredProxy.class));
       return crashlyticsCore;
     }
   }