Remove org id in crash report payload when sending with GDT (#5189)

Author: jasonhu-g

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -395,9 +395,15 @@ - (FBLPromise *)deleteUnsentReports {
                  FIRCLSDebugLog(@"Sending unsent reports.");
                  FIRCLSDataCollectionToken *dataCollectionToken =
                      [FIRCLSDataCollectionToken validToken];
+
+                 // For the new report endpoint, the orgID is not needed.
+                 // For the legacy report endpoint, wait on settings if orgID is not available.
+                 BOOL waitForSetting =
+                     !self.settings.shouldUseNewReportEndpoint && !self.settings.orgID;
+
                  [self startNetworkRequestsWithToken:dataCollectionToken
                               preexistingReportPaths:preexistingReportPaths
-                              waitForSettingsRequest:YES
+                              waitForSettingsRequest:waitForSetting
                                         blockingSend:NO
                                               report:report];
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m

@@ -79,10 +79,11 @@ - (BOOL)prepareAndSubmitReport:(FIRCLSInternalReport *)report
     return NO;
   }
 
-  if (!self.dataSource.settings.orgID) {
-    FIRCLSDebugLog(@"Skipping report with id '%@' this run of the app because Organization ID was "
-                   @"nil. Report will upload once settings are download successfully",
-                   report.identifier);
+  if (!self.dataSource.settings.orgID && !self.dataSource.settings.shouldUseNewReportEndpoint) {
+    FIRCLSDebugLog(
+        @"Skipping report with id '%@' this run of the app because Organization ID was "
+        @"nil. Report via the legacy endpoint will upload once settings are download successfully",
+        report.identifier);
     return YES;
   }
 
@@ -214,9 +215,7 @@ - (BOOL)uploadPackagedReportAtPath:(NSString *)path
     }
 
     FIRCLSReportAdapter *adapter =
-        [[FIRCLSReportAdapter alloc] initWithPath:path
-                                      googleAppId:self.dataSource.googleAppID
-                                            orgId:self.dataSource.settings.orgID];
+        [[FIRCLSReportAdapter alloc] initWithPath:path googleAppId:self.dataSource.googleAppID];
 
     GDTCOREvent *event = [self.dataSource.googleTransport eventForTransport];
     event.dataObject = adapter;

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h

@@ -28,8 +28,6 @@
 
 /// Initializer
 /// @param folderPath Path where the persisted crash files reside
-- (instancetype)initWithPath:(NSString *)folderPath
-                 googleAppId:(NSString *)googleAppID
-                       orgId:(NSString *)orgID;
+- (instancetype)initWithPath:(NSString *)folderPath googleAppId:(NSString *)googleAppID;
 
 @end

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.m

@@ -28,14 +28,11 @@
 
 @implementation FIRCLSReportAdapter
 
-- (instancetype)initWithPath:(NSString *)folderPath
-                 googleAppId:(NSString *)googleAppID
-                       orgId:(NSString *)orgID {
+- (instancetype)initWithPath:(NSString *)folderPath googleAppId:(NSString *)googleAppID {
   self = [super init];
   if (self) {
     _folderPath = folderPath;
     _googleAppID = googleAppID;
-    _orgID = orgID;
 
     [self loadMetaDataFile];
 
@@ -175,7 +172,6 @@ - (google_crashlytics_FilesPayload)protoFilesPayload {
 
   apple_payload.files = files;
   apple_payload.files_count = (pb_size_t)clsRecords.count;
-  apple_payload.org_id = FIRCLSEncodeString(self.orgID);
 
   return apple_payload;
 }

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter_Private.h

@@ -29,7 +29,6 @@ pb_bytes_array_t *FIRCLSEncodeData(NSData *data);
 
 @property(nonatomic, strong) NSString *folderPath;
 @property(nonatomic, strong) NSString *googleAppID;
-@property(nonatomic, strong) NSString *orgID;
 
 // From metadata.clsrecord
 @property(nonatomic, strong) FIRCLSRecordIdentity *identity;

Crashlytics/ProtoSupport/Protos/crashlytics.options

@@ -23,4 +23,3 @@ google_crashlytics.Report.display_version type:FT_POINTER
 google_crashlytics.FilesPayload.File.filename type:FT_POINTER
 google_crashlytics.FilesPayload.File.contents type:FT_POINTER
 google_crashlytics.FilesPayload.files type:FT_POINTER
-google_crashlytics.FilesPayload.org_id type:FT_POINTER

Crashlytics/ProtoSupport/Protos/crashlytics.proto

@@ -53,5 +53,4 @@ message FilesPayload {
   }
 
   repeated File files = 1;
-  string org_id = 2;
 }

Crashlytics/Protogen/nanopb/crashlytics.nanopb.c

@@ -37,9 +37,8 @@ const pb_field_t google_crashlytics_Report_fields[8] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t google_crashlytics_FilesPayload_fields[3] = {
+const pb_field_t google_crashlytics_FilesPayload_fields[2] = {
     PB_FIELD(  1, MESSAGE , REPEATED, POINTER , FIRST, google_crashlytics_FilesPayload, files, files, &google_crashlytics_FilesPayload_File_fields),
-    PB_FIELD(  2, BYTES   , SINGULAR, POINTER , OTHER, google_crashlytics_FilesPayload, org_id, files, 0),
     PB_LAST_FIELD
 };
 

Crashlytics/Protogen/nanopb/crashlytics.nanopb.h

@@ -42,7 +42,6 @@ typedef enum _google_crashlytics_Platforms {
 typedef struct _google_crashlytics_FilesPayload {
     pb_size_t files_count;
     struct _google_crashlytics_FilesPayload_File *files;
-    pb_bytes_array_t *org_id;
 /* @@protoc_insertion_point(struct:google_crashlytics_FilesPayload) */
 } google_crashlytics_FilesPayload;
 
@@ -67,15 +66,14 @@ typedef struct _google_crashlytics_Report {
 
 /* Initializer values for message structs */
 #define google_crashlytics_Report_init_default   {NULL, NULL, _google_crashlytics_Platforms_MIN, NULL, NULL, NULL, google_crashlytics_FilesPayload_init_default}
-#define google_crashlytics_FilesPayload_init_default {0, NULL, NULL}
+#define google_crashlytics_FilesPayload_init_default {0, NULL}
 #define google_crashlytics_FilesPayload_File_init_default {NULL, NULL}
 #define google_crashlytics_Report_init_zero      {NULL, NULL, _google_crashlytics_Platforms_MIN, NULL, NULL, NULL, google_crashlytics_FilesPayload_init_zero}
-#define google_crashlytics_FilesPayload_init_zero {0, NULL, NULL}
+#define google_crashlytics_FilesPayload_init_zero {0, NULL}
 #define google_crashlytics_FilesPayload_File_init_zero {NULL, NULL}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define google_crashlytics_FilesPayload_files_tag 1
-#define google_crashlytics_FilesPayload_org_id_tag 2
 #define google_crashlytics_FilesPayload_File_filename_tag 1
 #define google_crashlytics_FilesPayload_File_contents_tag 2
 #define google_crashlytics_Report_sdk_version_tag 1
@@ -88,7 +86,7 @@ typedef struct _google_crashlytics_Report {
 
 /* Struct field encoding specification for nanopb */
 extern const pb_field_t google_crashlytics_Report_fields[8];
-extern const pb_field_t google_crashlytics_FilesPayload_fields[3];
+extern const pb_field_t google_crashlytics_FilesPayload_fields[2];
 extern const pb_field_t google_crashlytics_FilesPayload_File_fields[3];
 
 /* Maximum encoded size of messages (where known) */

Crashlytics/UnitTests/FIRCLSReportAdapterTests.m

@@ -40,8 +40,7 @@ - (void)testSendProtoReport {
 
   FIRCLSReportAdapter *adapter =
       [[FIRCLSReportAdapter alloc] initWithPath:minCrash
-                                    googleAppId:@"1:17586535263:ios:83778f4dc7e8a26ef794ea"
-                                          orgId:@"5bec84f69ea6961d03000dc5"];
+                                    googleAppId:@"1:17586535263:ios:83778f4dc7e8a26ef794ea"];
 
   GDTCORTransport *transport = [[GDTCORTransport alloc] initWithMappingID:@"1206"
                                                              transformers:nil
@@ -59,8 +58,7 @@ - (void)testProtoOutput {
 
   FIRCLSReportAdapter *adapter =
       [[FIRCLSReportAdapter alloc] initWithPath:minCrash
-                                    googleAppId:@"1:17586535263:ios:83778f4dc7e8a26ef794ea"
-                                          orgId:@"5bec84f69ea6961d03000dc5"];
+                                    googleAppId:@"1:17586535263:ios:83778f4dc7e8a26ef794ea"];
 
   NSData *data = adapter.transportBytes;
 
@@ -81,8 +79,7 @@ - (void)testProtoOutput {
 /// Verify various invalid input cases.
 - (void)testInvalidRecordCases {
   id adapter __unused = [[FIRCLSReportAdapter alloc] initWithPath:@"nonExistentPath"
-                                                      googleAppId:@"appID"
-                                                            orgId:@"orgID"];
+                                                      googleAppId:@"appID"];
 
   id application __unused = [[FIRCLSRecordApplication alloc] initWithDict:nil];
   id host __unused = [[FIRCLSRecordHost alloc] initWithDict:nil];
@@ -125,7 +122,6 @@ - (void)testReportProto {
                  equalToString:adapter.application.display_version]);
 
   // Files payload
-  XCTAssertTrue([self isPBData:report.apple_payload.org_id equalToString:@"orgID"]);
   XCTAssertEqual(report.apple_payload.files_count, 10);
 
   NSArray<NSString *> *clsRecords = adapter.clsRecordFilePaths;
@@ -144,24 +140,21 @@ + (FIRCLSReportAdapter *)adapterForAllCrashes {
   return [[FIRCLSReportAdapter alloc]
       initWithPath:[[FIRCLSReportAdapterTests resourcePath]
                        stringByAppendingPathComponent:@"ios_all_files_crash"]
-       googleAppId:@"appID"
-             orgId:@"orgID"];
+       googleAppId:@"appID"];
 }
 
 + (FIRCLSReportAdapter *)adapterForCorruptMetadata {
   return [[FIRCLSReportAdapter alloc]
       initWithPath:[[FIRCLSReportAdapterTests resourcePath]
                        stringByAppendingPathComponent:@"corrupt_metadata"]
-       googleAppId:@"appID"
-             orgId:@"orgID"];
+       googleAppId:@"appID"];
 }
 
 + (FIRCLSReportAdapter *)adapterForValidMetadata {
   return [[FIRCLSReportAdapter alloc]
       initWithPath:[[FIRCLSReportAdapterTests resourcePath]
                        stringByAppendingPathComponent:@"valid_metadata"]
-       googleAppId:@"appID"
-             orgId:@"orgID"];
+       googleAppId:@"appID"];
 }
 
 + (NSString *)resourcePath {