Changed offline to enabled by default and fix a few place to check fo…

…r offline in handled exceptions and crashes
newrelic · Jan 25, 2024 · e300cfa · e300cfa
1 parent 1efd215
commit e300cfa
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/Agent/CrashHandler/NRMAExceptionHandlerManager.m b/Agent/CrashHandler/NRMAExceptionHandlerManager.m
@@ -107,7 +107,13 @@ - (instancetype) initWithLastSessionsAttributes:(NSDictionary*)attributes
             [_reportManager processReportsWithSessionAttributes:attributes
                                                 analyticsEvents:events];
 
-            [self.uploader uploadCrashReports];
+            NRMAReachability* r = [NewRelicInternalUtils reachability];
+            @synchronized(r) {
+                NRMANetworkStatus status = [r currentReachabilityStatus];
+                if (status != NotReachable) { // Because we support offline mode check if we're online before sending the crash reports
+                    [self.uploader uploadCrashReports];
+                }
+            }
         }
 
         self.handler = [[NRMAUncaughtExceptionHandler alloc] initWithCrashReporter:_crashReporter];

diff --git a/Agent/FeatureFlags/NRMAFlags.m b/Agent/FeatureFlags/NRMAFlags.m
@@ -47,7 +47,8 @@ + (NRMAFeatureFlags) featureFlags
                               NRFeatureFlag_NetworkRequestEvents | 
                               NRFeatureFlag_RequestErrorEvents |
                               NRFeatureFlag_DistributedTracing |
-                              NRFeatureFlag_AppStartMetrics;
+                              NRFeatureFlag_AppStartMetrics |
+                              NRFeatureFlag_OfflineStorage;
                   });
     return __flags;
 }

diff --git a/Agent/General/NewRelicAgentInternal.m b/Agent/General/NewRelicAgentInternal.m
@@ -488,7 +488,7 @@ - (void) onSessionStart {
                                                                                             sessionId:[self currentSessionId]];
 
 
-        if (status != NotReachable) {
+        if (status != NotReachable) { // Because we support offline mode check if we're online before sending the handled exceptions
             [self.handledExceptionsController processAndPublishPersistedReports];
         }
 
@@ -500,7 +500,7 @@ - (void) onSessionStart {
 
     // Attempt to upload crash report files (if any exist)
     if ([NRMAFlags shouldEnableCrashReporting]) {
-        if (status != NotReachable) {
+        if (status != NotReachable) { // Because we support offline mode check if we're online before sending the crash reports
             [[NRMAExceptionHandlerManager manager].uploader uploadCrashReports];
         }
     }

diff --git a/Agent/HandledException/NRMAHandledExceptions.mm b/Agent/HandledException/NRMAHandledExceptions.mm
@@ -131,9 +131,18 @@ - (instancetype) initWithAnalyticsController:(NRMAAnalytics*)analytics
 }
 
 - (void) onHarvest {
-    _controller->publish();
-    _store->clear();
-    _publisher->retry();
+    NRMAReachability* r = [NewRelicInternalUtils reachability];
+    @synchronized(r) {
+        NRMANetworkStatus status = [r currentReachabilityStatus];
+        if (status != NotReachable) { // Because we support offline mode check if we're online before sending the handled exceptions reports
+            if(!_controller->publish()) { // If there are no reports in the controller to publish we still want to try and send persisted reports before we clear.
+                [self processAndPublishPersistedReports];
+            } else {
+                _store->clear();
+                _publisher->retry();
+            }
+        }
+    }
 }
 
 - (fbs::Platform) fbsPlatformFromString:(NSString*)platform {

diff --git a/Agent/Public/NewRelicFeatureFlags.h b/Agent/Public/NewRelicFeatureFlags.h
@@ -72,7 +72,10 @@
     Disabled by default. Enable or disable (default) flag for automatic instrumentation of async URLSession functions in Swift.
 
  - NRFeatureFlag_LogReporting
-    Disabled by default. Enable or disable (default) flag to enable log forwarding of logs passed to NewRelic.log* functions..
+    Disabled by default. Enable or disable (default) flag to enable log forwarding of logs passed to NewRelic.log* functions.
+ 
+ - NRFeatureFlag_OfflineStorage
+    Enabled by default. Enable (default) or disable flag to enable the storage of offline payloads.
 */
 
 
@@ -99,5 +102,5 @@ typedef NS_OPTIONS(unsigned long long, NRMAFeatureFlags){
 
     // NOTE: Temporarily removed NRFeatureFlag_LogReporting
     NRFeatureFlag_NewEventSystem                        = 1 << 20, // Disabled by default
-    NRFeatureFlag_OfflineStorage                        = 1 << 21, // Disabled by default
+    NRFeatureFlag_OfflineStorage                        = 1 << 21,
 };
diff --git a/Agent/Utilities/NewRelicInternalUtils.m b/Agent/Utilities/NewRelicInternalUtils.m
@@ -230,6 +230,8 @@ + (NSString*) carrierName {
                     } else {
                         cachedCarrierName = carrier.carrierName;
                     }
+                } else if (internetStatus == NotReachable) {
+                       cachedCarrierName = @"";
                 } else {
                     cachedCarrierName = NRMA_CARRIER_WIFI;
                 }

diff --git a/libMobileAgent/src/Hex/include/Hex/HexController.hpp b/libMobileAgent/src/Hex/include/Hex/HexController.hpp
@@ -40,7 +40,7 @@ namespace NewRelic {
 
             void submit(std::shared_ptr<Report::HexReport> report);
 
-            void publish();
+            bool publish();
 
             void setSessionId(const char* sessionId);
 

diff --git a/libMobileAgent/src/Hex/src/HexController.cxx b/libMobileAgent/src/Hex/src/HexController.cxx
@@ -84,12 +84,14 @@ std::shared_ptr<HexReportContext> HexController::detachKeyContext() {
 }
 
 
-void HexController::publish() {
+bool HexController::publish() {
     auto context = detachKeyContext();
     if (context->reports() > 0) {
         context->finalize();
         _publisher->publish(context);
+        return true;
     }
+    return false;
 }
 
 void HexController::submit(std::shared_ptr<Report::HexReport> report) {