Remove organization ID from DataTransport payloads (#1411)

No longer necessary due to backend upgrades

Author: mrwillis21

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

@@ -360,13 +360,12 @@ public void onSessionsFinalize_finalizesReports() {
   @Test
   @SuppressWarnings("unchecked")
   public void onReportSend_successfulReportsAreDeleted() {
-    final String orgId = "testOrgId";
     final String sessionId1 = "sessionId1";
     final String sessionId2 = "sessionId2";
 
     final List<CrashlyticsReportWithSessionId> finalizedReports = new ArrayList<>();
-    final CrashlyticsReportWithSessionId mockReport1 = mockReportWithSessionId(sessionId1, orgId);
-    final CrashlyticsReportWithSessionId mockReport2 = mockReportWithSessionId(sessionId2, orgId);
+    final CrashlyticsReportWithSessionId mockReport1 = mockReportWithSessionId(sessionId1);
+    final CrashlyticsReportWithSessionId mockReport2 = mockReportWithSessionId(sessionId2);
     finalizedReports.add(mockReport1);
     finalizedReports.add(mockReport2);
 
@@ -379,7 +378,7 @@ public void onReportSend_successfulReportsAreDeleted() {
     when(reportSender.sendReport(mockReport1)).thenReturn(successfulTask);
     when(reportSender.sendReport(mockReport2)).thenReturn(failedTask);
 
-    reportManager.sendReports(orgId, Runnable::run, DataTransportState.ALL);
+    reportManager.sendReports(Runnable::run, DataTransportState.ALL);
 
     verify(reportSender).sendReport(mockReport1);
     verify(reportSender).sendReport(mockReport2);
@@ -390,7 +389,7 @@ public void onReportSend_successfulReportsAreDeleted() {
 
   @Test
   public void onReportSend_reportsAreDeletedWithoutBeingSent_whenDataTransportStateNone() {
-    reportManager.sendReports("testOrgId", Runnable::run, DataTransportState.NONE);
+    reportManager.sendReports(Runnable::run, DataTransportState.NONE);
 
     verify(reportPersistence).deleteAllReports();
     verify(reportPersistence, never()).loadFinalizedReports();
@@ -401,15 +400,13 @@ public void onReportSend_reportsAreDeletedWithoutBeingSent_whenDataTransportStat
   @Test
   public void
       onReportSend_javaReportsAreSentNativeReportsDeletedWithoutBeingSent_whenDataTransportStateJavaOnly() {
-    final String orgId = "testOrgId";
     final String sessionIdJava = "sessionIdJava";
     final String sessionIdNative = "sessionIdNative";
 
     final List<CrashlyticsReportWithSessionId> finalizedReports = new ArrayList<>();
-    final CrashlyticsReportWithSessionId mockReportJava =
-        mockReportWithSessionId(sessionIdJava, orgId);
+    final CrashlyticsReportWithSessionId mockReportJava = mockReportWithSessionId(sessionIdJava);
     final CrashlyticsReportWithSessionId mockReportNative =
-        mockReportWithSessionId(sessionIdNative, orgId);
+        mockReportWithSessionId(sessionIdNative);
     finalizedReports.add(mockReportJava);
     finalizedReports.add(mockReportNative);
 
@@ -420,7 +417,7 @@ public void onReportSend_reportsAreDeletedWithoutBeingSent_whenDataTransportStat
 
     when(reportSender.sendReport(mockReportJava)).thenReturn(Tasks.forResult(mockReportJava));
 
-    reportManager.sendReports(orgId, Runnable::run, DataTransportState.JAVA_ONLY);
+    reportManager.sendReports(Runnable::run, DataTransportState.JAVA_ONLY);
 
     verify(reportSender).sendReport(mockReportJava);
     verify(reportSender, never()).sendReport(mockReportNative);
@@ -450,17 +447,6 @@ public void testRemoveAllReports_deletesPersistedReports() {
     verify(reportPersistence).deleteAllReports();
   }
 
-  private static CrashlyticsReport makeIncompleteReport() {
-    return CrashlyticsReport.builder()
-        .setSdkVersion("sdkVersion")
-        .setGmpAppId("gmpAppId")
-        .setPlatform(1)
-        .setInstallationUuid("installationId")
-        .setBuildVersion("1")
-        .setDisplayVersion("1.0.0")
-        .build();
-  }
-
   private void mockEventInteractions() {
     when(mockEvent.toBuilder()).thenReturn(mockEventBuilder);
     when(mockEventBuilder.build()).thenReturn(mockEvent);
@@ -479,17 +465,15 @@ private void mockEventInteractions() {
         .thenReturn(mockEvent);
   }
 
-  private static CrashlyticsReport mockReport(String sessionId, String orgId) {
+  private static CrashlyticsReport mockReport(String sessionId) {
     final CrashlyticsReport mockReport = mock(CrashlyticsReport.class);
     final CrashlyticsReport.Session mockSession = mock(CrashlyticsReport.Session.class);
     when(mockSession.getIdentifier()).thenReturn(sessionId);
     when(mockReport.getSession()).thenReturn(mockSession);
-    when(mockReport.withOrganizationId(orgId)).thenReturn(mockReport);
     return mockReport;
   }
 
-  private static CrashlyticsReportWithSessionId mockReportWithSessionId(
-      String sessionId, String orgId) {
-    return CrashlyticsReportWithSessionId.create(mockReport(sessionId, orgId), sessionId);
+  private static CrashlyticsReportWithSessionId mockReportWithSessionId(String sessionId) {
+    return CrashlyticsReportWithSessionId.create(mockReport(sessionId), sessionId);
   }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -436,9 +436,7 @@ public Task<Void> then(@Nullable AppSettingsData appSettingsData)
                             boolean dataCollectionToken = true;
                             sendSessionReports(appSettingsData, dataCollectionToken);
                             reportingCoordinator.sendReports(
-                                appSettingsData.organizationId,
-                                executor,
-                                DataTransportState.getState(appSettingsData));
+                                executor, DataTransportState.getState(appSettingsData));
                             return recordFatalFirebaseEventTask;
                           }
                         });
@@ -596,9 +594,7 @@ public Task<Void> then(@Nullable AppSettingsData appSettingsData)
                                     reportUploaderProvider.createReportUploader(appSettingsData);
                                 uploader.uploadReportsAsync(reports, dataCollectionToken, delay);
                                 reportingCoordinator.sendReports(
-                                    appSettingsData.organizationId,
-                                    executor,
-                                    DataTransportState.getState(appSettingsData));
+                                    executor, DataTransportState.getState(appSettingsData));
                                 unsentReportsHandled.trySetResult(null);
 
                                 return Tasks.forResult(null);

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java

@@ -166,13 +166,11 @@ public void removeAllReports() {
   /**
    * Send all finalized reports.
    *
-   * @param organizationId The organization ID this crash report should be associated with
    * @param reportSendCompleteExecutor executor on which to run report cleanup after each report is
    *     sent.
    * @param dataTransportState used to determine whether to send the report before cleaning it up.
    */
   public void sendReports(
-      @Nullable String organizationId,
       @NonNull Executor reportSendCompleteExecutor,
       @NonNull DataTransportState dataTransportState) {
     if (dataTransportState == DataTransportState.NONE) {
@@ -182,24 +180,15 @@ public void sendReports(
     }
     final List<CrashlyticsReportWithSessionId> reportsToSend =
         reportPersistence.loadFinalizedReports();
-    for (CrashlyticsReportWithSessionId reportWithSessionId : reportsToSend) {
-      if (reportWithSessionId.getReport().getType() == CrashlyticsReport.Type.NATIVE
+    for (CrashlyticsReportWithSessionId reportToSend : reportsToSend) {
+      if (reportToSend.getReport().getType() == CrashlyticsReport.Type.NATIVE
           && dataTransportState != DataTransportState.ALL) {
         Logger.getLogger()
             .d("Send native reports via DataTransport disabled. Removing DataTransport reports.");
-        reportPersistence.deleteFinalizedReport(reportWithSessionId.getSessionId());
+        reportPersistence.deleteFinalizedReport(reportToSend.getSessionId());
         continue;
       }
 
-      // When an organization ID is available, hydrate the underlying report with it, otherwise pass
-      // through.
-      final CrashlyticsReportWithSessionId reportToSend =
-          (organizationId == null)
-              ? reportWithSessionId
-              : CrashlyticsReportWithSessionId.create(
-                  reportWithSessionId.getReport().withOrganizationId(organizationId),
-                  reportWithSessionId.getSessionId());
-
       reportsSender
           .sendReport(reportToSend)
           .continueWith(reportSendCompleteExecutor, this::onReportSendComplete);