feat: Remote Logging with manual set entityGuid and ingestKey feature…

… complete.
newrelic · Jan 9, 2024 · 0aff012 · 0aff012
1 parent 1be17d1
commit 0aff012
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 42 deletions.
diff --git a/Agent/General/NewRelicAgentInternal.m b/Agent/General/NewRelicAgentInternal.m
@@ -465,9 +465,6 @@ - (void) onSessionStart {
                                                                             uuid);
     self->_agentConfiguration.sessionIdentifier = uuid_String;
 
-    // TODO: Remove Logging Debugging Logging
-    NRLOG_VERBOSE(@"Set new sessionId = %@",uuid_String);
-
     CFRelease(uuid);
     if (self->_agentConfiguration.sessionIdentifier.length > 0) {
         NRMA_setSessionId([self->_agentConfiguration.sessionIdentifier UTF8String]);

diff --git a/Agent/Harvester/DataStore/NRMAHarvesterConfiguration.m b/Agent/Harvester/DataStore/NRMAHarvesterConfiguration.m
@@ -149,13 +149,6 @@ - (BOOL) isEqual:(id)object {
     if (self.application_id != that.application_id) return NO;
     if (![self.encoding_key isEqualToString:that.encoding_key]) return NO;
 
-    // Should trusted_account_key be considered in Equality
-
-    // Should entity_guid be considered in Equality?
-
-    // Should log_reporting be considered in Equality?
-
-
     // [ <account id> , <app id> ];
     return [self.data_token isEqual:that.data_token];
 }
@@ -179,12 +172,6 @@ - (NSUInteger) hash
     result = 31 * result + (unsigned int)self.application_id;
     result = 31 * result + self.encoding_key.hash;
 
-    // Should trusted_account_key be considered in Hash?
-
-    // Should entity_guid be considered in Hash?
-
-    // Should log_reporting be considered in Hash?
-
     return result;
 }
 @end
diff --git a/Agent/Harvester/NRMAHarvester.mm b/Agent/Harvester/NRMAHarvester.mm
@@ -333,10 +333,10 @@ - (void) connected
             [self transition:NRMA_HARVEST_DISCONNECTED];
             // Reconnect performed here.
             [self execute];
-
-            // TODO: Is this the right place to send the configuration update Spt Metric?
+
             // Send Supportability metric when received 409 to indicate that a config update should happen or send it when actual /connect call finishes which refreshes the data.
             [NRMASupportMetricHelper enqueueConfigurationUpdateMetric];
+
             break;
         default:
             break;

diff --git a/Test Harness/NRTestApp/NRTestApp/ViewModels/UtilViewModel.swift b/Test Harness/NRTestApp/NRTestApp/ViewModels/UtilViewModel.swift
@@ -43,10 +43,6 @@ class UtilViewModel {
         options.append(UtilOption(title: "Notice Network Request", handler: { [self] in noticeNWRequest()}))
         options.append(UtilOption(title: "Notice Network Failure", handler: { [self] in noticeFailedNWRequest()}))
 
-        options.append(UtilOption(title: "Notice Network Failure W Single Quotes", handler: { [self] in noticeFailedNWRequestWSingleQuotes()}))
-
-
-        options.append(UtilOption(title: "Toggle Remote Logging On/Off", handler: { [self] in toggleRemoteLogging()}))
         options.append(UtilOption(title: "Test Log Dict", handler: { [self] in testLogDict()}))
 
         options.append(UtilOption(title: "URLSession dataTask", handler: { [self] in doDataTask()}))
@@ -133,26 +129,6 @@ class UtilViewModel {
                                       with: NRTimer(), andFailureCode: NSURLErrorTimedOut)
     }
 
-    func noticeFailedNWRequestWSingleQuotes() {
-        NewRelic.noticeNetworkFailure(for: URL(string: "http://test.com/test('test')"), httpMethod: "GET",
-                                      with: NRTimer(), andFailureCode: NSURLErrorTimedOut)
-    }
-
-    var logEnabled = false
-
-    // testing only: this won't work once server supports settings this.
-    // Does not sync initial state.
-    func toggleRemoteLogging() {
-        if !logEnabled {
-            NewRelic.enableFeatures([NRMAFeatureFlags.NRFeatureFlag_LogReporting])
-            logEnabled = true
-        }
-        else {
-            NewRelic.disableFeatures([NRMAFeatureFlags.NRFeatureFlag_LogReporting])
-            logEnabled = false
-        }
-    }
-
     func testLogDict() {
         NewRelic.logAll([
             "logLevel": "WARNING",