test: reduce logging integration testing time (#1606)

Author: nr-ahemsath

.github/workflows/all_solutions.yml

@@ -471,8 +471,7 @@ jobs:
       matrix:
         namespace: [ AgentFeatures, AgentLogs, AgentMetrics, Api, AppDomainCaching, AspNetCore, BasicInstrumentation, CatInbound, CatOutbound, CodeLevelMetrics, Configuration, 
           CSP, CustomAttributes, CustomInstrumentation, DataTransmission, DistributedTracing, Errors, HttpClientInstrumentation, InfiniteTracing, Logging.ContextData, 
-          Logging.HsmAndCsp, Logging.LocalDecoration, Logging.LogLevelDetection, Logging.MaxSamplesStored, Logging.MetricsAndForwarding.log4net, 
-          Logging.MetricsAndForwarding.MicrosoftLogging, Logging.MetricsAndForwarding.NLog, Logging.MetricsAndForwarding.Serilog, Logging.ZeroMaxSamplesStored,
+          Logging.HsmAndCsp, Logging.LocalDecoration, Logging.LogLevelDetection, Logging.MaxSamplesStored, Logging.MetricsAndForwarding, Logging.ZeroMaxSamplesStored,
           Owin, ReJit.NetCore, ReJit.NetFramework, RequestHandling, RequestHeadersCapture.AspNet, RequestHeadersCapture.AspNetCore, RequestHeadersCapture.EnvironmentVariables, 
           RequestHeadersCapture.Owin, RequestHeadersCapture.WCF, RestSharp, WCF.Client.IIS.ASPDisabled, WCF.Client.IIS.ASPEnabled, WCF.Client.Self, 
           WCF.Service.IIS.ASPDisabled, WCF.Service.IIS.ASPEnabled, WCF.Service.Self] # maintain alphabetical order, please!

.github/workflows/run_integration_tests.yml

@@ -54,8 +54,7 @@ jobs:
             # Use the full list of namespaces
             namespaces="[ 'AgentFeatures', 'AgentLogs', 'AgentMetrics', 'Api', 'AppDomainCaching', 'AspNetCore', 'BasicInstrumentation', 'CatInbound', 'CatOutbound', 'CodeLevelMetrics', 'Configuration', \
           'CSP', 'CustomAttributes', 'CustomInstrumentation', 'DataTransmission', 'DistributedTracing', 'Errors', 'HttpClientInstrumentation', 'InfiniteTracing', 'Logging.ContextData', \
-          'Logging.HsmAndCsp', 'Logging.LocalDecoration', 'Logging.LogLevelDetection', 'Logging.MaxSamplesStored', 'Logging.MetricsAndForwarding.log4net', \
-          'Logging.MetricsAndForwarding.MicrosoftLogging', 'Logging.MetricsAndForwarding.NLog', 'Logging.MetricsAndForwarding.Serilog', 'Logging.ZeroMaxSamplesStored', \
+          'Logging.HsmAndCsp', 'Logging.LocalDecoration', 'Logging.LogLevelDetection', 'Logging.MaxSamplesStored', 'Logging.MetricsAndForwarding', 'Logging.ZeroMaxSamplesStored', \
           'Owin', 'ReJit.NetCore', 'ReJit.NetFramework', 'RequestHandling', 'RequestHeadersCapture.AspNet', 'RequestHeadersCapture.AspNetCore', 'RequestHeadersCapture.EnvironmentVariables', \
           'RequestHeadersCapture.Owin', 'RequestHeadersCapture.WCF', 'RestSharp', 'WCF.Client.IIS.ASPDisabled', 'WCF.Client.IIS.ASPEnabled', 'WCF.Client.Self', \
           'WCF.Service.IIS.ASPDisabled', 'WCF.Service.IIS.ASPEnabled', 'WCF.Service.Self' ]"

tests/Agent/IntegrationTests/IntegrationTests/Logging/ContextDataNotSupportedTests.cs

@@ -60,7 +60,7 @@ public ContextDataNotSupportedTestsBase(TFixture fixture, ITestOutputHelper outp
                 },
                 exerciseApplication: () =>
                 {
-                    Thread.Sleep(TimeSpan.FromSeconds(2));
+                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.LogDataLogLineRegex, TimeSpan.FromSeconds(30));
                 }
             );
 

tests/Agent/IntegrationTests/IntegrationTests/Logging/ContextDataTests.cs

@@ -37,7 +37,6 @@ public HSMOrCSPDisablesForwardingTestsBase(TFixture fixture, ITestOutputHelper o
 
                     // applicationLogging metrics and forwarding enabled by default
                     configModifier
-                    .EnableDistributedTrace()
                     .SetLogLevel("debug");
 
                     if (typeof(TFixture).ToString().Contains("HSM"))

tests/Agent/IntegrationTests/IntegrationTests/Logging/HSMOrCSPDisablesForwardingTests.cs

@@ -1,6 +1,7 @@
 // Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Web;
@@ -34,7 +35,7 @@ public LocalDecorationTestsBase(TFixture fixture, ITestOutputHelper output, bool
             _decorationEnabled = decorationEnabled;
             _isWebLogTest = isWebLogTest;
             _fixture = fixture;
-            _fixture.SetTimeout(System.TimeSpan.FromMinutes(2));
+            _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
             _fixture.AddCommand($"LoggingTester SetFramework {loggingFramework}");
@@ -50,16 +51,20 @@ public LocalDecorationTestsBase(TFixture fixture, ITestOutputHelper output, bool
 
             _fixture.RemoteApplication.AppName = _compositeApplicationName;
 
-            _fixture.Actions
+            _fixture.AddActions
             (
                 setupConfiguration: () =>
                 {
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
                     configModifier
                     .EnableLogDecoration(_decorationEnabled)
-                    .EnableDistributedTrace()
-                    .SetLogLevel("debug");
+                    .SetLogLevel("finest");
+                },
+                exerciseApplication: () =>
+                {
+                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(30));
+                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.LogDataLogLineRegex, TimeSpan.FromSeconds(30));
                 }
             );
 
@@ -71,8 +76,8 @@ public void LogIsDecorated()
         {
             var testOutput = _fixture.RemoteApplication.CapturedOutput.StandardOutput;
             // Make sure the original message is there
-            var commandResults = Regex.Split(testOutput, System.Environment.NewLine).Where(l => !l.Contains("EXECUTING"));
-            Assert.Contains(_testMessage, string.Join(System.Environment.NewLine, commandResults));
+            var commandResults = Regex.Split(testOutput, Environment.NewLine).Where(l => !l.Contains("EXECUTING"));
+            Assert.Contains(_testMessage, string.Join(Environment.NewLine, commandResults));
 
             // Sample decorated data we are looking for:
             // "NR-LINKING|MjczMDcwfEFQTXxBUFBMSUNBVElPTnwxODQyMg|blah.hsd1.ca.comcast.net|45f120972d61834b96fb890d2a8f97e7|840d9a82e8bc18a8|myApplicationName|"

tests/Agent/IntegrationTests/IntegrationTests/Logging/LocalDecorationTests.cs

@@ -38,7 +38,6 @@ public LogLevelTestsBase(TFixture fixture, ITestOutputHelper output, LoggingFram
 
                     // applicationLogging metrics and forwarding enabled by default
                     configModifier
-                    .EnableDistributedTrace()
                     .SetLogLevel("debug");
                 },
                 exerciseApplication: () =>

tests/Agent/IntegrationTests/IntegrationTests/Logging/LogLevelTests.cs

@@ -18,7 +18,7 @@ public abstract class MaxSamplesStoredTestsBase<TFixture> : NewRelicIntegrationT
         public MaxSamplesStoredTestsBase(TFixture fixture, ITestOutputHelper output, LoggingFramework loggingFramework) : base(fixture)
         {
             _fixture = fixture;
-            _fixture.SetTimeout(System.TimeSpan.FromMinutes(2));
+            _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
             _fixture.AddCommand($"LoggingTester SetFramework {loggingFramework}");
@@ -37,8 +37,10 @@ public MaxSamplesStoredTestsBase(TFixture fixture, ITestOutputHelper output, Log
 
                     // applicationLogging metrics and forwarding enabled by default
                     configModifier
+                    // 12 is the per-minute sample limit.
+                    // It gets divided by 12 to come up with the per-five-second-faster-event-harvest limit of 1
+                    // (This assumes that the FEH interval is set to the default five seconds)
                     .SetLogForwardingMaxSamplesStored(12)
-                    .EnableDistributedTrace()
                     .SetLogLevel("debug");
                 },
                 exerciseApplication: () =>
@@ -61,7 +63,8 @@ public void OnlyOneLogLineIsSent()
             Assert.False(string.IsNullOrWhiteSpace(logData.Common.Attributes.EntityGuid));
             Assert.False(string.IsNullOrWhiteSpace(logData.Common.Attributes.Hostname));
 
-            // Since we set the maximum number of log lines stored to 1 in setupConfiguration, there should only be one log line
+            // Since we set the maximum number of log lines per five-second harvest interval
+            // stored to 1 in setupConfiguration, there should only be one log line
             Assert.Single(logData.Logs);
             var logLine = logData.Logs[0];
             Assert.False(string.IsNullOrWhiteSpace(logLine.Message));