Revert "Add a CrashlyticsWorkers container to manage the workers (#6178)"

This reverts commit 9535f94.

Author: mrober

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

@@ -40,7 +40,7 @@
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
-import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -63,8 +63,8 @@ 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 CrashlyticsWorkers crashlyticsWorkers =
-      new CrashlyticsWorkers(TestOnlyExecutors.background(), TestOnlyExecutors.blocking());
+  private final CrashlyticsWorker commonWorker =
+      new CrashlyticsWorker(TestOnlyExecutors.background());
 
   private Context testContext;
   private IdManager idManager;
@@ -74,6 +74,8 @@ public class CrashlyticsControllerTest extends CrashlyticsTestCase {
   private DataCollectionArbiter mockDataCollectionArbiter;
   private CrashlyticsNativeComponent mockNativeComponent = mock(CrashlyticsNativeComponent.class);
 
+  private CrashlyticsWorker diskWriteWorker = new CrashlyticsWorker(TestOnlyExecutors.background());
+
   @Override
   protected void setUp() throws Exception {
     super.setUp();
@@ -106,7 +108,7 @@ protected void setUp() throws Exception {
   @Override
   protected void tearDown() throws Exception {
     super.tearDown();
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
   }
 
   /** A convenience class for building CrashlyticsController instances for testing. */
@@ -175,6 +177,7 @@ public CrashlyticsController build() {
       final CrashlyticsController controller =
           new CrashlyticsController(
               testContext.getApplicationContext(),
+              commonWorker,
               idManager,
               dataCollectionArbiter,
               testFileStore,
@@ -186,7 +189,7 @@ public CrashlyticsController build() {
               nativeComponent,
               analyticsEventLogger,
               mock(CrashlyticsAppQualitySessionsSubscriber.class),
-              crashlyticsWorkers);
+              diskWriteWorker);
       return controller;
     }
   }
@@ -215,7 +218,7 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal()
     controller.writeNonFatalException(thread, nonFatal);
     controller.doCloseSessions(testSettingsProvider);
 
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     verify(mockSessionReportingCoordinator)
         .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong());
@@ -254,7 +257,7 @@ public void testOnDemandFatal_callLogFatalException() throws Exception {
     controller.enableExceptionHandling(SESSION_ID, exceptionHandler, testSettingsProvider);
     controller.logFatalException(thread, fatal);
 
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     verify(mockUserMetadata).setNewSession(not(eq(SESSION_ID)));
   }
@@ -333,8 +336,8 @@ public File getOsFile() {
     final CrashlyticsController controller =
         builder().setNativeComponent(mockNativeComponent).setLogFileManager(logFileManager).build();
 
-    crashlyticsWorkers.common.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    crashlyticsWorkers.common.await();
+    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
+    commonWorker.await();
 
     verify(mockSessionReportingCoordinator)
         .finalizeSessionWithNativeEvent(eq(previousSessionId), any(), any());
@@ -345,8 +348,8 @@ public File getOsFile() {
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
   public void testMissingNativeComponentCausesNoReports() throws Exception {
     final CrashlyticsController controller = createController();
-    crashlyticsWorkers.common.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    crashlyticsWorkers.common.await();
+    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
+    commonWorker.await();
 
     List<String> sessions = testFileStore.getAllOpenSessionIds();
     for (String sessionId : sessions) {
@@ -382,9 +385,8 @@ public void testLogStringAfterCrashOk() throws Exception {
         testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    crashlyticsWorkers.diskWrite.submit(
-        () -> controller.writeToLog(System.currentTimeMillis(), "Hi"));
-    crashlyticsWorkers.diskWrite.await();
+    diskWriteWorker.submit(() -> controller.writeToLog(System.currentTimeMillis(), "Hi"));
+    diskWriteWorker.await();
   }
 
   /**
@@ -399,8 +401,8 @@ public void testFinalizeSessionAfterCrashOk() throws Exception {
         testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    crashlyticsWorkers.common.submit(() -> controller.finalizeSessions(testSettingsProvider));
-    crashlyticsWorkers.common.await();
+    commonWorker.submit(() -> controller.finalizeSessions(testSettingsProvider));
+    commonWorker.await();
   }
 
   @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
@@ -443,7 +445,7 @@ public void testUploadDisabledThenOptIn() throws Exception {
 
     final DataCollectionArbiter arbiter = mock(DataCollectionArbiter.class);
     when(arbiter.isAutomaticDataCollectionEnabled()).thenReturn(false);
-    when(arbiter.waitForDataCollectionPermission())
+    when(arbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(new TaskCompletionSource<Void>().getTask());
     when(arbiter.waitForAutomaticDataCollectionEnabled())
         .thenReturn(new TaskCompletionSource<Void>().getTask());
@@ -564,14 +566,14 @@ public void testFatalEvent_sendsAppExceptionEvent() throws Exception {
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singleton(sessionId)));
 
-    crashlyticsWorkers.common.submit(
+    commonWorker.submit(
         () -> {
           controller.openSession(SESSION_ID);
           controller.handleUncaughtException(
               testSettingsProvider, Thread.currentThread(), new RuntimeException("Fatal"));
           controller.finalizeSessions(testSettingsProvider);
         });
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     assertFirebaseAnalyticsCrashEvent(mockFirebaseAnalyticsLogger);
   }

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

@@ -35,7 +35,7 @@
 import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
-import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
@@ -91,7 +91,8 @@ private static final class CoreBuilder {
     private CrashlyticsNativeComponent nativeComponent;
     private DataCollectionArbiter arbiter;
     private FileStore fileStore;
-    private CrashlyticsWorkers crashlyticsWorkers;
+    private CrashlyticsWorker commonWorker;
+    private CrashlyticsWorker diskWriteWorker;
 
     public CoreBuilder(Context context, FirebaseOptions firebaseOptions) {
       app = mock(FirebaseApp.class);
@@ -120,8 +121,8 @@ public void whenAvailable(
       arbiter = mock(DataCollectionArbiter.class);
       when(arbiter.isAutomaticDataCollectionEnabled()).thenReturn(true);
 
-      crashlyticsWorkers =
-          new CrashlyticsWorkers(TestOnlyExecutors.background(), TestOnlyExecutors.blocking());
+      commonWorker = new CrashlyticsWorker(TestOnlyExecutors.background());
+      diskWriteWorker = new CrashlyticsWorker(TestOnlyExecutors.background());
       fileStore = new FileStore(context);
     }
 
@@ -146,7 +147,8 @@ public CrashlyticsCore build() {
           fileStore,
           mock(CrashlyticsAppQualitySessionsSubscriber.class),
           mock(RemoteConfigDeferredProxy.class),
-          crashlyticsWorkers);
+          commonWorker,
+          diskWriteWorker);
     }
   }
 

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

@@ -39,7 +39,7 @@
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbHandler;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbSource;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
-import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.settings.Settings;
@@ -70,8 +70,10 @@ public void whenAvailable(
 
   private CrashlyticsCore crashlyticsCore;
   private BreadcrumbSource mockBreadcrumbSource;
-  private static final CrashlyticsWorkers crashlyticsWorkers =
-      new CrashlyticsWorkers(TestOnlyExecutors.background(), TestOnlyExecutors.blocking());
+  private static final CrashlyticsWorker commonWorker =
+      new CrashlyticsWorker(TestOnlyExecutors.background());
+  private static final CrashlyticsWorker diskWriteWorker =
+      new CrashlyticsWorker(TestOnlyExecutors.background());
 
   @Override
   protected void setUp() throws Exception {
@@ -95,7 +97,7 @@ public void testCustomAttributes() throws Exception {
 
     final String id = "id012345";
     crashlyticsCore.setUserId(id);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertEquals(id, metadata.getUserId());
 
     final StringBuffer idBuffer = new StringBuffer(id);
@@ -106,13 +108,13 @@ public void testCustomAttributes() throws Exception {
     final String superLongId = longId + "more chars";
 
     crashlyticsCore.setUserId(superLongId);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertEquals(longId, metadata.getUserId());
 
     final String key1 = "key1";
     final String value1 = "value1";
     crashlyticsCore.setCustomKey(key1, value1);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertEquals(value1, metadata.getCustomKeys().get(key1));
 
     // Adding an existing key with the same value should return false
@@ -126,7 +128,7 @@ public void testCustomAttributes() throws Exception {
 
     // test truncation of custom keys and attributes
     crashlyticsCore.setCustomKey(superLongId, superLongValue);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertNull(metadata.getCustomKeys().get(superLongId));
     assertEquals(longValue, metadata.getCustomKeys().get(longId));
 
@@ -135,28 +137,28 @@ public void testCustomAttributes() throws Exception {
       final String key = "key" + i;
       final String value = "value" + i;
       crashlyticsCore.setCustomKey(key, value);
-      crashlyticsWorkers.common.await();
+      commonWorker.await();
       assertEquals(value, metadata.getCustomKeys().get(key));
     }
     // should be full now, extra key, value pairs will be dropped.
     final String key = "new key";
     crashlyticsCore.setCustomKey(key, "some value");
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertFalse(metadata.getCustomKeys().containsKey(key));
 
     // should be able to update existing keys
     crashlyticsCore.setCustomKey(key1, longValue);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertEquals(longValue, metadata.getCustomKeys().get(key1));
 
     // when we set a key to null, it should still exist with an empty value
     crashlyticsCore.setCustomKey(key1, null);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertEquals("", metadata.getCustomKeys().get(key1));
 
     // keys and values are trimmed.
     crashlyticsCore.setCustomKey(" " + key1 + " ", " " + longValue + " ");
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
     assertTrue(metadata.getCustomKeys().containsKey(key1));
     assertEquals(longValue, metadata.getCustomKeys().get(key1));
   }
@@ -207,7 +209,7 @@ public void testBulkCustomKeys() throws Exception {
     keysAndValues.put(intKey, String.valueOf(intValue));
 
     crashlyticsCore.setCustomKeys(keysAndValues);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     assertEquals(stringValue, metadata.getCustomKeys().get(stringKey));
     assertEquals(trimmedValue, metadata.getCustomKeys().get(trimmedKey));
@@ -228,7 +230,7 @@ public void testBulkCustomKeys() throws Exception {
       addlKeysAndValues.put(key, value);
     }
     crashlyticsCore.setCustomKeys(addlKeysAndValues);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     // Ensure all keys have been set
     assertEquals(UserMetadata.MAX_ATTRIBUTES, metadata.getCustomKeys().size(), DELTA);
@@ -246,7 +248,7 @@ public void testBulkCustomKeys() throws Exception {
       extraKeysAndValues.put(key, value);
     }
     crashlyticsCore.setCustomKeys(extraKeysAndValues);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     // Make sure the extra keys were not added
     for (int i = UserMetadata.MAX_ATTRIBUTES; i < UserMetadata.MAX_ATTRIBUTES + 10; ++i) {
@@ -272,7 +274,7 @@ public void testBulkCustomKeys() throws Exception {
     updatedKeysAndValues.put(intKey, String.valueOf(updatedIntValue));
 
     crashlyticsCore.setCustomKeys(updatedKeysAndValues);
-    crashlyticsWorkers.common.await();
+    commonWorker.await();
 
     assertEquals(updatedStringValue, metadata.getCustomKeys().get(stringKey));
     assertFalse(Boolean.parseBoolean(metadata.getCustomKeys().get(booleanKey)));
@@ -445,7 +447,8 @@ CrashlyticsCore build(Context context) {
               new FileStore(context),
               mock(CrashlyticsAppQualitySessionsSubscriber.class),
               mock(RemoteConfigDeferredProxy.class),
-              crashlyticsWorkers);
+              commonWorker,
+              diskWriteWorker);
       return crashlyticsCore;
     }
   }