NR-318119 Renamed the flag to include stderr and changed the log divi…

…der to \n\n
newrelic · Oct 18, 2024 · 57c93a9 · 57c93a9
1 parent 7fba9ba
commit 57c93a9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/Agent/FeatureFlags/NRMAFlags.m b/Agent/FeatureFlags/NRMAFlags.m
@@ -178,7 +178,7 @@ + (BOOL) shouldEnableBackgroundReporting {
 }
 
 + (BOOL) shouldEnableRedirectStdOut {
-    return ([NRMAFlags featureFlags] & NRFeatureFlag_RedirectStdOut) != 0;
+    return ([NRMAFlags featureFlags] & NRFeatureFlag_RedirectStdOutStdErr) != 0;
 }
 
 + (NSArray<NSString*>*) namesForFlags:(NRMAFeatureFlags)flags {
@@ -243,7 +243,7 @@ + (BOOL) shouldEnableRedirectStdOut {
     if ((flags & NRFeatureFlag_BackgroundReporting) == NRFeatureFlag_BackgroundReporting) {
         [retArray addObject:@"BackgroundReporting"];
     }
-    if ((flags & NRFeatureFlag_RedirectStdOut) == NRFeatureFlag_RedirectStdOut) {
+    if ((flags & NRFeatureFlag_RedirectStdOutStdErr) == NRFeatureFlag_RedirectStdOutStdErr) {
         [retArray addObject:@"RedirectStdOut"];
     }
 

diff --git a/Agent/Public/NewRelicFeatureFlags.h b/Agent/Public/NewRelicFeatureFlags.h
@@ -102,6 +102,6 @@ typedef NS_OPTIONS(unsigned long long, NRMAFeatureFlags){
     NRFeatureFlag_NewEventSystem                        = 1 << 20, // Disabled by default
     NRFeatureFlag_OfflineStorage                        = 1 << 21, // Disabled by default
     NRFeatureFlag_BackgroundReporting                   = 1 << 22, // Disabled by default
-    NRFeatureFlag_RedirectStdOut                        = 1 << 23, // Disabled by default
+    NRFeatureFlag_RedirectStdOutStdErr                  = 1 << 23, // Disabled by default
 
 };
diff --git a/Agent/Utilities/NRAutoLogCollector.m b/Agent/Utilities/NRAutoLogCollector.m
@@ -49,7 +49,6 @@ + (void) restoreStandardOutputAndError {
     dup2(saved_stderr, fileno(stderr));
     close(saved_stdout);
     close(saved_stderr);
-
 }
 
 + (void) readAndParseLogFile {
@@ -65,16 +64,16 @@ + (void) readAndParseLogFile {
     NSString *fileContents = [NSString stringWithContentsOfFile:[NRAutoLogCollector logFileURL].path
                                                        encoding:NSUTF8StringEncoding
                                                           error:&error];
+    [NRAutoLogCollector clearLogFile];
+
     if (error) {
         return;
     } else if (fileContents.length == 0){
         return;
     }
 
-    [NRAutoLogCollector clearLogFile];
-
     // Split the file contents into individual log entries
-    NSArray<NSString *> *newLogEntries = [fileContents componentsSeparatedByString:@"\n"];
+    NSArray<NSString *> *newLogEntries = [fileContents componentsSeparatedByString:@"\n\n"];
 
     // Process each log entry
     for (NSString *logEntry in newLogEntries) {
@@ -129,11 +128,13 @@ + (unsigned int) extractType:(NSString *) inputString {
             // Extract the matched type value
             NSRange typeRange = [match rangeAtIndex:1];
             NSString *typeString = [inputString substringWithRange:typeRange];
-            if([typeString compare:@"Info"] == NSOrderedSame || [typeString compare:@"Default"] == NSOrderedSame){
+            if([typeString caseInsensitiveCompare:@"Info"] == NSOrderedSame || [typeString caseInsensitiveCompare:@"Default"] == NSOrderedSame){
                 return NRLogLevelInfo;
-            } else if([typeString compare:@"Debug"] == NSOrderedSame){
+            } else if([typeString caseInsensitiveCompare:@"Debug"] == NSOrderedSame){
                 return NRLogLevelDebug;
-            } else if([typeString compare:@"Error"] == NSOrderedSame || [typeString compare:@"Fault"] == NSOrderedSame){
+            } else if([typeString caseInsensitiveCompare:@"Warning"] == NSOrderedSame){
+                return NRLogLevelWarning;
+            } else if([typeString caseInsensitiveCompare:@"Error"] == NSOrderedSame || [typeString caseInsensitiveCompare:@"Fault"] == NSOrderedSame){
                 return NRLogLevelError;
             }
         }

diff --git a/Test Harness/NRTestApp/NRTestApp/AppDelegate.swift b/Test Harness/NRTestApp/NRTestApp/AppDelegate.swift
@@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // NewRelic.enableFeatures([NRMAFeatureFlags.NRFeatureFlag_BackgroundReporting])
 
         // Note: Disabled by default. Enable or disable (default) flag to enable auto collect of stdout.
-        // NewRelic.enableFeatures([NRMAFeatureFlags.NRFeatureFlag_RedirectStdOut])
+        //NewRelic.enableFeatures([NRMAFeatureFlags.NRFeatureFlag_RedirectStdOutStdErr])
         NewRelic.saltDeviceUUID(true)
 
        // NewRelic.replaceDeviceIdentifier("myDeviceId")

diff --git a/Test Harness/NRTestApp/NRTestApp/ViewModels/UtilViewModel.swift b/Test Harness/NRTestApp/NRTestApp/ViewModels/UtilViewModel.swift
@@ -161,7 +161,7 @@ class UtilViewModel {
     func testSystemLogs() {
         for i in 0...100 {
             triggerException.testNSLog()
-            print("TEST swift!!!!! \(i)")
+            print("TEST swift!!!!! \(i)\n")
             if #available(iOS 14.0, *) {
                 os_log("TEST OSLog!!!!!!! \(i)")
                 let logger = Logger()