Libraries should save state if a completion block is requested (#5147)

* Libraries should save state if a completion block is requested

Currently, the onComplete block of sendXEvent:onComplete: is invoked when the event bytes are written to disk. However, if the app crashes before a lifecycle event occurs (trigger GDTCORStorage to serialize to disk), that event if effectively lost because the metadata has all been lost. This change triggers the saving of state of GDTCORStorage and prioritizers (if they implement it) if an onComplete block has been given.

* Remove flaky check

* Update GDTCORStorage.m

Author: mikehaney24

GoogleDataTransport/GDTCORLibrary/GDTCORStorage.m

@@ -59,14 +59,17 @@ - (instancetype)init {
 }
 
 - (void)storeEvent:(GDTCOREvent *)event
-        onComplete:(void (^)(BOOL wasWritten, NSError *error))completion {
+        onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *error))completion {
   GDTCORLogDebug("Saving event: %@", event);
   if (event == nil) {
     GDTCORLogDebug("%@", @"The event was nil, so it was not saved.");
     return;
   }
+  BOOL hadOriginalCompletion = completion != nil;
   if (!completion) {
     completion = ^(BOOL wasWritten, NSError *error) {
+      GDTCORLogDebug(@"event %@ stored. success:%@ error:%@", event, wasWritten ? @"YES" : @"NO",
+                     error);
     };
   }
 
@@ -102,17 +105,26 @@ - (void)storeEvent:(GDTCOREvent *)event
     // Add event to tracking collections.
     [self addEventToTrackingCollections:event];
 
-    // Have the prioritizer prioritize the event.
+    // Have the prioritizer prioritize the event and save state if there was an onComplete block.
     [prioritizer prioritizeEvent:event];
+    if (hadOriginalCompletion && [prioritizer respondsToSelector:@selector(saveState)]) {
+      [prioritizer saveState];
+      GDTCORLogDebug(@"Prioritizer %@ has saved state due to an event's onComplete block.",
+                     prioritizer);
+    }
 
     // Check the QoS, if it's high priority, notify the target that it has a high priority event.
     if (event.qosTier == GDTCOREventQoSFast) {
       [self.uploadCoordinator forceUploadForTarget:target];
     }
 
-    // Write state to disk if we're in the background.
-    if ([[GDTCORApplication sharedApplication] isRunningInBackground]) {
-      GDTCORLogDebug("%@", @"Saving storage state because the app is running in the background");
+    // Write state to disk if there was an onComplete block or if we're in the background.
+    if (hadOriginalCompletion || [[GDTCORApplication sharedApplication] isRunningInBackground]) {
+      if (hadOriginalCompletion) {
+        GDTCORLogDebug("%@", @"Saving storage state because a completion block was passed.");
+      } else {
+        GDTCORLogDebug("%@", @"Saving storage state because the app is running in the background");
+      }
       NSError *error;
       GDTCOREncodeArchive(self, [GDTCORStorage archivePath], &error);
       if (error) {

GoogleDataTransport/GDTCORLibrary/GDTCORTransformer.m

@@ -48,8 +48,9 @@ - (instancetype)init {
 
 - (void)transformEvent:(GDTCOREvent *)event
       withTransformers:(NSArray<id<GDTCOREventTransformer>> *)transformers
-            onComplete:(nonnull void (^)(BOOL wasWritten, NSError *error))completion {
+            onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *error))completion {
   GDTCORAssert(event, @"You can't write a nil event");
+  BOOL hadOriginalCompletion = completion != nil;
   if (!completion) {
     completion = ^(BOOL wasWritten, NSError *_Nullable error) {
     };
@@ -79,7 +80,8 @@ - (void)transformEvent:(GDTCOREvent *)event
         return;
       }
     }
-    [self.storageInstance storeEvent:transformedEvent onComplete:completion];
+    [self.storageInstance storeEvent:transformedEvent
+                          onComplete:hadOriginalCompletion ? completion : nil];
 
     // The work is done, cancel the background task if it's valid.
     [[GDTCORApplication sharedApplication] endBackgroundTask:bgID];

GoogleDataTransport/GDTCORLibrary/GDTCORTransport.m

@@ -49,37 +49,21 @@ - (nullable instancetype)initWithMappingID:(NSString *)mappingID
 - (void)sendTelemetryEvent:(GDTCOREvent *)event
                 onComplete:(void (^)(BOOL wasWritten, NSError *_Nullable error))completion {
   event.qosTier = GDTCOREventQoSTelemetry;
-  [self sendEvent:event
-       onComplete:^(BOOL wasWritten, NSError *error) {
-         GDTCORLogDebug("Telemetry event sent: %@", event);
-         if (completion) {
-           completion(wasWritten, nil);
-         }
-       }];
+  [self sendEvent:event onComplete:completion];
 }
 
 - (void)sendDataEvent:(GDTCOREvent *)event
            onComplete:(void (^)(BOOL wasWritten, NSError *_Nullable error))completion {
   GDTCORAssert(event.qosTier != GDTCOREventQoSTelemetry, @"Use -sendTelemetryEvent, please.");
-  [self sendEvent:event
-       onComplete:^(BOOL wasWritten, NSError *error) {
-         GDTCORLogDebug("Data event sent: %@", event);
-         if (completion) {
-           completion(wasWritten, nil);
-         }
-       }];
+  [self sendEvent:event onComplete:completion];
 }
 
 - (void)sendTelemetryEvent:(GDTCOREvent *)event {
-  [self sendTelemetryEvent:event
-                onComplete:^(BOOL wasWritten, NSError *_Nullable error){
-                }];
+  [self sendTelemetryEvent:event onComplete:nil];
 }
 
 - (void)sendDataEvent:(GDTCOREvent *)event {
-  [self sendDataEvent:event
-           onComplete:^(BOOL wasWritten, NSError *_Nullable error){
-           }];
+  [self sendDataEvent:event onComplete:nil];
 }
 
 - (GDTCOREvent *)eventForTransport {
@@ -94,7 +78,7 @@ - (GDTCOREvent *)eventForTransport {
  * @param completion A block that will be called when the event has been written or dropped.
  */
 - (void)sendEvent:(GDTCOREvent *)event
-       onComplete:(void (^)(BOOL wasWritten, NSError *error))completion {
+       onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *error))completion {
   // TODO: Determine if sending an event before registration is allowed.
   GDTCORAssert(event, @"You can't send a nil event");
   GDTCOREvent *copiedEvent = [event copy];

GoogleDataTransport/GDTCORLibrary/Private/GDTCORStorage.h

@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param completion A block to run when an event was written to disk or dropped.
  */
 - (void)storeEvent:(GDTCOREvent *)event
-        onComplete:(void (^)(BOOL wasWritten, NSError *error))completion;
+        onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *error))completion;
 
 /** Removes a set of events from storage specified by their hash.
  *

GoogleDataTransport/GDTCORLibrary/Private/GDTCORTransformer.h

@@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)transformEvent:(GDTCOREvent *)event
       withTransformers:(nullable NSArray<id<GDTCOREventTransformer>> *)transformers
-            onComplete:(void (^)(BOOL wasWritten, NSError *_Nullable error))completion;
+            onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *_Nullable error))completion;
 
 @end
 

GoogleDataTransport/GDTCORLibrary/Public/GDTCORPrioritizer.h

@@ -69,6 +69,11 @@ typedef NS_OPTIONS(NSInteger, GDTCORUploadConditions) {
 - (GDTCORUploadPackage *)uploadPackageWithTarget:(GDTCORTarget)target
                                       conditions:(GDTCORUploadConditions)conditions;
 
+@optional
+
+/** Saves the state of the prioritizer. */
+- (void)saveState;
+
 @end
 
 NS_ASSUME_NONNULL_END

GoogleDataTransport/GDTCORLibrary/Public/GDTCORTransport.h

@@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param completion A block that will be called when the event has been written or dropped.
  */
 - (void)sendTelemetryEvent:(GDTCOREvent *)event
-                onComplete:(void (^)(BOOL wasWritten, NSError *_Nullable error))completion;
+                onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *_Nullable error))completion;
 
 /** Copies and sends an internal telemetry event. Events sent using this API are lower in priority,
  * and sometimes won't be sent on their own.
@@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param completion A block that will be called when the event has been written or dropped.
  */
 - (void)sendDataEvent:(GDTCOREvent *)event
-           onComplete:(void (^)(BOOL wasWritten, NSError *_Nullable error))completion;
+           onComplete:(void (^_Nullable)(BOOL wasWritten, NSError *_Nullable error))completion;
 
 /** Copies and sends an SDK service data event. Events send using this API are higher in priority,
  * and will cause a network request at some point in the relative near future.

GoogleDataTransport/GDTCORTests/Integration/Helpers/GDTCORIntegrationTestPrioritizer.m

@@ -72,6 +72,9 @@ - (GDTCORUploadPackage *)uploadPackageWithTarget:(GDTCORTarget)target
   return uploadPackage;
 }
 
+- (void)saveState {
+}
+
 - (void)packageDelivered:(GDTCORUploadPackage *)package successful:(BOOL)successful {
   dispatch_async(_queue, ^{
     for (GDTCOREvent *event in package.events) {

GoogleDataTransportCCTSupport/GDTCCTLibrary/GDTCCTPrioritizer.m

@@ -131,6 +131,17 @@ typedef NS_ENUM(NSInteger, GDTCCTQoSTier) {
   GDTCCTQoSWifiOnly = 5,
 };
 
+- (void)saveState {
+  dispatch_sync(_queue, ^{
+    NSError *error;
+    GDTCOREncodeArchive(self, ArchivePath(), &error);
+    if (error) {
+      GDTCORLogDebug(@"Serializing GDTCCTPrioritizer to an archive failed: %@", error);
+    }
+  });
+  GDTCORLogDebug(@"GDTCCTPrioritizer saved state to %@ as requested by GDT.", ArchivePath());
+}
+
 /** Converts a GDTCOREventQoS to a GDTCCTQoS tier.
  *
  * @param qosTier The GDTCOREventQoS value.

GoogleDataTransportCCTSupport/GDTCCTTests/Integration/GDTCCTIntegrationTest.m

@@ -98,7 +98,10 @@ - (void)generateEventWithQoSTier:(GDTCOREventQoS)qosTier {
   GDTCOREvent *event = [self.transport eventForTransport];
   event.dataObject = [[GDTCCTTestDataObject alloc] init];
   event.qosTier = qosTier;
-  [self.transport sendDataEvent:event];
+  [self.transport sendDataEvent:event
+                     onComplete:^(BOOL wasWritten, NSError *_Nullable error) {
+                       NSLog(@"Storing a data event completed.");
+                     }];
   dispatch_async(dispatch_get_main_queue(), ^{
     self.totalEventsGenerated += 1;
   });