Change telemetry uploads to upload daily (#3246)

Author: mikehaney24

GoogleDataTransportCCTSupport/GDTCCTLibrary/GDTCCTPrioritizer.m

@@ -66,11 +66,14 @@ - (GDTUploadPackage *)uploadPackageWithConditions:(GDTUploadConditions)condition
       return;
     }
 
+    // If on wifi, upload logs that are ok to send on wifi.
     if ((conditions & GDTUploadConditionWifiData) == GDTUploadConditionWifiData) {
       logEventsThatWillBeSent = [self logEventsOkToSendOnWifi];
     } else {
       logEventsThatWillBeSent = [self logEventsOkToSendOnMobileData];
     }
+
+    // If it's been > 24h since the last daily upload, upload logs with the daily QoS.
     if (self.timeOfLastDailyUpload) {
       int64_t millisSinceLastUpload =
           [GDTClock snapshot].timeMillis - self.timeOfLastDailyUpload.timeMillis;
@@ -113,11 +116,12 @@ typedef NS_ENUM(NSInteger, GDTCCTQoSTier) {
 FOUNDATION_STATIC_INLINE
 NSNumber *GDTCCTQosTierFromGDTEventQosTier(GDTEventQoS qosTier) {
   switch (qosTier) {
-    case GDTEventQoSTelemetry:
     case GDTEventQoSWifiOnly:
       return @(GDTCCTQoSWifiOnly);
       break;
 
+    case GDTEventQoSTelemetry:
+      // falls through.
     case GDTEventQoSDaily:
       return @(GDTCCTQoSDaily);
       break;
@@ -149,7 +153,8 @@ typedef NS_ENUM(NSInteger, GDTCCTQoSTier) {
   return
       [self.events objectsPassingTest:^BOOL(GDTStoredEvent *_Nonnull event, BOOL *_Nonnull stop) {
         NSNumber *qosTier = GDTCCTQosTierFromGDTEventQosTier(event.qosTier);
-        return [qosTier isEqual:@(GDTCCTQoSDefault)] || [qosTier isEqual:@(GDTCCTQoSWifiOnly)];
+        return [qosTier isEqual:@(GDTCCTQoSDefault)] || [qosTier isEqual:@(GDTCCTQoSWifiOnly)] ||
+               [qosTier isEqual:@(GDTCCTQoSDaily)];
       }];
 }
 

GoogleDataTransportCCTSupport/GDTCCTTests/Unit/GDTCCTPrioritizerTest.m

@@ -117,8 +117,9 @@ - (void)testDailyUpload {
   GDTCCTPrioritizer *prioritizer = [[GDTCCTPrioritizer alloc] init];
   GDTStoredEvent *dailyEvent = [_generator generateStoredEvent:GDTEventQoSDaily];
   [prioritizer prioritizeEvent:[_generator generateStoredEvent:GDTEventQoSWifiOnly]];
-  [prioritizer prioritizeEvent:[_generator generateStoredEvent:GDTEventQoSTelemetry]];
+  GDTStoredEvent *telemetryEvent = [_generator generateStoredEvent:GDTEventQoSTelemetry];
   [prioritizer prioritizeEvent:dailyEvent];
+  [prioritizer prioritizeEvent:telemetryEvent];
   GDTUploadPackage *package = [prioritizer uploadPackageWithConditions:GDTUploadConditionWifiData];
   // If no previous daily upload time existed, the daily event will be included.
   XCTAssertTrue([package.events containsObject:dailyEvent]);
@@ -133,6 +134,7 @@ - (void)testDailyUpload {
   [prioritizer.timeOfLastDailyUpload setValue:@(previousTime) forKeyPath:@"timeMillis"];
   package = [prioritizer uploadPackageWithConditions:GDTUploadConditionMobileData];
   XCTAssertTrue([package.events containsObject:dailyEvent]);
+  XCTAssertTrue([package.events containsObject:telemetryEvent]);
 }
 
 @end