added an offline attribute to events created offline and added an off…

…line data sent support metric
newrelic · Dec 14, 2023 · 97cb3bf · 97cb3bf
1 parent 8b876f3
commit 97cb3bf
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
diff --git a/Agent/Analytics/Events/NRMAMobileEvent.m b/Agent/Analytics/Events/NRMAMobileEvent.m
@@ -8,6 +8,7 @@
 
 #import "NRMAMobileEvent.h"
 #import "Constants.h"
+#import "NewRelicInternalUtils.h"
 
 static NSString* const kTimestampKey = @"Timestamp";
 static NSString* const kSessionElapsedTimeKey = @"SessionElapsedTime";
@@ -56,7 +57,14 @@ - (id)JSONObject {
     dict[kNRMA_RA_timestamp] = @(self.timestamp);
     dict[kNRMA_RA_sessionElapsedTime] = @(self.sessionElapsedTimeSeconds);
     dict[kNRMA_RA_eventType] = self.eventType;
-
+
+    NRMAReachability* r = [NewRelicInternalUtils reachability];
+    @synchronized(r) {
+        NRMANetworkStatus status = [r currentReachabilityStatus];
+        if (status == NotReachable) {
+            dict[@"Offline"] = [[NSNumber alloc] initWithBool:TRUE];
+        }
+    }
     return [NSDictionary dictionaryWithDictionary:dict];
 }
 

diff --git a/Agent/Harvester/NRMAHarvester.mm b/Agent/Harvester/NRMAHarvester.mm
@@ -333,18 +333,20 @@ - (void) connected
     //TODO: add addition collector response processing.
     if (response.isError) {
         // failure
-        if([self checkResponseAndPersist:response]) {
+        if([self checkOfflineAndPersist:response]) {
+            // If the harvest was persisted for offline storage clear the harvest.
             [self.harvestData clear];
         } else {
             [self fireOnHarvestFailure];
         }
     } else {
         // success
         [self.harvestData clear];
+        // If there was a successful harvest upload send the persisted offline payloads.
         [connection sendOfflineStorage];
     }
     //Supportability/MobileAgent/Collector/Harvest
-continues:
+
     [harvestTimer stopTimer];
 #ifndef  DISABLE_NRMA_EXCEPTION_WRAPPER
     @try {
@@ -362,7 +364,7 @@ - (void) connected
     [self fireOnHarvestComplete];
 }
 
-- (BOOL) checkResponseAndPersist:(NRMAHarvestResponse*) response {
+- (BOOL) checkOfflineAndPersist:(NRMAHarvestResponse*) response {
     if([NRMAOfflineStorage checkErrorToPersist:response.error]) {
         NSError* error = nil;
         NSData* jsonData = [NRMAJSON dataWithJSONABLEObject:self.harvestData options:0 error:&error];

diff --git a/Agent/Harvester/NRMAHarvesterConnection.m b/Agent/Harvester/NRMAHarvesterConnection.m
@@ -46,11 +46,12 @@ -(void) sendOfflineStorage {
             NRLOG_ERROR(@"Failed to create data POST");
             return;
         }
-
+        [NRMASupportMetricHelper enqueueOfflinePayloadMetric:@"data" size:[post.HTTPBody length]];
+
         NRMAHarvestResponse* response = [self send:post];
 
         if([NRMAOfflineStorage checkErrorToPersist:response.error]) {
-            [_offlineStorage persistDataToDisk:jsonData];
+         //   [_offlineStorage persistDataToDisk:jsonData]; Re-save if failed to send again?
         }
     }];
 }

diff --git a/Agent/Measurements/NRMASupportMetricHelper.h b/Agent/Measurements/NRMASupportMetricHelper.h
@@ -19,4 +19,5 @@ static NSMutableArray *deferredMetrics = NULL;
 + (void) enqueueUpgradeMetric;
 + (void) enqueueStopAgentMetric;
 + (void) processDeferredMetrics;
++ (void) enqueueOfflinePayloadMetric:(NSString*)endpoint size:(long)size;
 @end
diff --git a/Agent/Measurements/NRMASupportMetricHelper.m b/Agent/Measurements/NRMASupportMetricHelper.m
@@ -59,6 +59,14 @@ + (void) enqueueMaxPayloadSizeLimitMetric:(NSString*)endpoint {
                                                     scope:nil]];
 }
 
++ (void) enqueueOfflinePayloadMetric:(long)size {
+    NSString* nativePlatform = [NewRelicInternalUtils osName];
+    NSString* platform = [NewRelicInternalUtils stringFromNRMAApplicationPlatform:[NRMAAgentConfiguration connectionInformation].deviceInformation.platform];
+    [NRMATaskQueue queue:[[NRMAMetric alloc] initWithName:[NSString stringWithFormat: kNRMAOfflineSupportabilityFormatString, nativePlatform, platform, kNRMACollectorDest]
+                                                    value:[NSNumber numberWithLongLong:size]
+                                                    scope:nil]];
+}
+
 + (void) enqueueUpgradeMetric {
     if (deferredMetrics == nil) {
         deferredMetrics = [NSMutableArray array];

diff --git a/Agent/Public/NRConstants.h b/Agent/Public/NRConstants.h
@@ -124,6 +124,8 @@ typedef NSString NRMetricUnit;
 #define kNRMAMaxPayloadSizeLimitSupportabilityFormatString  @"Supportability/Mobile/%@/%@/%@/MaxPayloadSizeLimit/%@"
 #define kNRMAMaxPayloadSizeLimit         1000000 // bytes
 
+#define kNRMAOfflineSupportabilityFormatString  @"Supportability/Mobile/%@/%@/%@/Offline/bytes"
+
 #define kNRMABytesOutConnectAPIString     @"/connect/Output/Bytes"
 #define kNRMABytesOutDataAPIString        @"/data/Output/Bytes"
 #define kNRMABytesOutFAPIString           @"/f/Output/Bytes"

diff --git a/Agent/Utilities/NRMAOfflineStorage.m b/Agent/Utilities/NRMAOfflineStorage.m
@@ -12,6 +12,7 @@
 #import "NRMAOfflineStorage.h"
 #import "Constants.h"
 #import "NRMAJSON.h"
+#import "NRMASupportMetricHelper.h"
 
 @implementation NRMAOfflineStorage {
 }
@@ -92,8 +93,7 @@ + (NSString*)newOfflineFilePath {
 }
 
 + (BOOL)checkErrorToPersist:(NSError*) error {
-    return (error.code == NSURLErrorNotConnectedToInternet || error.code == NSURLErrorTimedOut);
-
+    return (error.code == NSURLErrorNotConnectedToInternet || error.code == NSURLErrorTimedOut || error.code == NSURLErrorCannotFindHost || error.code == NSURLErrorNetworkConnectionLost || error.code == NSURLErrorCannotConnectToHost);
 }
 
 @end
diff --git a/Agent/Utilities/NewRelicInternalUtils.h b/Agent/Utilities/NewRelicInternalUtils.h
@@ -93,5 +93,7 @@ NSTimeInterval NRMAMillisecondTimestamp(void);
 
 + (NRMANetworkMonitor*) networkMonitor;
 
++ (NRMAReachability*) reachability;
+
 @end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,5 +93,7 @@ NSTimeInterval NRMAMillisecondTimestamp(void);

		+ (NRMANetworkMonitor*) networkMonitor;

		+ (NRMAReachability*) reachability;

		@end