test: Added unit tests for HttpCollectorWire. (#1565)

Author: tippmar-nr

src/Agent/NewRelic/Agent/Core/Core.csproj

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>

src/Agent/NewRelic/Agent/Core/DataTransport/HttpCollectorWire.cs

@@ -131,13 +131,13 @@ public string SendData(string method, ConnectionInfo connectionInfo, string seri
                 {
                     var responseContent = GetResponseContent(response, requestGuid);
 
-                    _agentHealthReporter.ReportSupportabilityDataUsage("Collector", method, uncompressedByteCount, new UTF8Encoding().GetBytes(response.Content.ToString()).Length);
+                    _agentHealthReporter.ReportSupportabilityDataUsage("Collector", method, uncompressedByteCount, new UTF8Encoding().GetBytes(responseContent).Length);
 
                     // Possibly combine these logs? makes parsing harder in tests...
                     Log.DebugFormat("Request({0}): Invoked \"{1}\" with : {2}", requestGuid, method, serializedData);
                     Log.DebugFormat("Request({0}): Invocation of \"{1}\" yielded response : {2}", requestGuid, method, responseContent);
 
-                    AuditLog(Direction.Received, Source.Collector, response.Content.ToString());
+                    AuditLog(Direction.Received, Source.Collector, responseContent);
                     if (!response.IsSuccessStatusCode)
                     {
                         ThrowExceptionFromHttpResponseMessage(serializedData, response.StatusCode, responseContent, requestGuid);
@@ -199,16 +199,10 @@ private string GetResponseContent(HttpResponseMessage response, Guid requestGuid
         {
             try
             {
-                var responseStream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();
+                var responseStream = response.Content?.ReadAsStreamAsync().GetAwaiter().GetResult();
 
                 if (responseStream == null)
-                {
-                    throw new NullReferenceException("responseStream");
-                }
-                if (response.Headers == null)
-                {
-                    throw new NullReferenceException("response.Headers");
-                }
+                    return EmptyResponseBody;
 
                 var contentTypeEncoding = response.Content.Headers.ContentEncoding;
                 if (contentTypeEncoding.Contains("gzip"))

tests/Agent/UnitTests/CompositeTests/CrossAgentTests/DistributedTracing/TraceContextCrossAgentTests.cs

@@ -1,7 +1,6 @@
 // Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-using Castle.Core.Internal;
 using NewRelic.Agent.Api;
 using NewRelic.Agent.Core.DistributedTracing;
 using NewRelic.Agent.Extensions.Providers.Wrapper;
@@ -137,7 +136,7 @@ void MakeTransaction(TraceContextTestData testData)
                 carrier.Add(key, value);
             });
 
-            testData.OutboundPayloadsSettings?.ForEach(payloadSettings =>
+            testData.OutboundPayloadsSettings?.ToList().ForEach(payloadSettings =>
             {
                 _agent.CurrentTransaction.InsertDistributedTraceHeaders(insertedHeaders, setHeaders);
 
@@ -148,6 +147,7 @@ void MakeTransaction(TraceContextTestData testData)
 
                 insertedHeaders.Clear();
             });
+
             segment.End();
             transaction.End();
         }
@@ -161,8 +161,7 @@ List<IEnumerable<KeyValuePair<string, string>>> MakeHeaders(TraceContextTestData
                 {
                     var ingestHeaderSet = new List<KeyValuePair<string, string>>();
 
-                    headerSet.Headers.ForEach
-                    (header =>
+                    headerSet.Headers?.ToList().ForEach(header =>
                     {
 
                         if (header.Key.Equals("newrelic"))
@@ -295,7 +294,7 @@ private void ValidateOutboundHeaders(OutboundPayloadSettings payloadSettings, Di
                 }
             }
 
-            payloadSettings.Expected?.ForEach(expected =>
+            payloadSettings.Expected?.ToList().ForEach(expected =>
             {
                 switch (expected.Substring(0, expected.IndexOf('.')))
                 {
@@ -313,7 +312,7 @@ private void ValidateOutboundHeaders(OutboundPayloadSettings payloadSettings, Di
                 }
             });
 
-            payloadSettings.Unexpected?.ForEach(unexpected =>
+            payloadSettings.Unexpected?.ToList().ForEach(unexpected =>
             {
                 switch (unexpected.Substring(0, unexpected.IndexOf('.')))
                 {