Merge branch 'main' into feature/netstandard-odbc-instrumentation

nr-ahemsath · web-flow · commit cecbecf41acb · 2025-01-22T09:01:35.000-08:00
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -0,0 +1,5 @@
+When generating new source code files, always include the copyright header.
+
+When writing unit tests, always use modern NUnit assertions.
+
+We use JustMock.Lite, so use only mock configurations that are valid for that package.
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs b/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs
@@ -20,10 +20,6 @@ namespace NewRelic.Agent.Core
     public static class LoggerBootstrapper
     {
 
-        // Watch out!  If you change the time format that the agent puts into its log files, other log parsers may fail.
-        //private static ILayout AuditLogLayout = new PatternLayout("%utcdate{yyyy-MM-dd HH:mm:ss,fff} NewRelic %level: %message\r\n");
-        //private static ILayout FileLogLayout = new PatternLayout("%utcdate{yyyy-MM-dd HH:mm:ss,fff} NewRelic %6level: [pid: %property{pid}, tid: %property{threadid}] %message\r\n");
-
         private const string AuditLogLayout = "{UTCTimestamp} NewRelic Audit: {Message:l}\n";
 
         private const string FileLogLayout = "{UTCTimestamp} NewRelic {NRLogLevel,6}: [pid: {pid}, tid: {tid}] {Message:l}\n{Exception:l}";
@@ -34,8 +30,16 @@ public static class LoggerBootstrapper
 
         public static void SetLoggingLevel(string newLogLevel) => _loggingLevelSwitch.MinimumLevel = newLogLevel.MapToSerilogLogLevel();
 
+        private static bool _isWindows;
+
         public static void Initialize()
         {
+#if NETSTANDARD2_0
+            _isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+#else
+            _isWindows = true;
+#endif
+
             var startupLoggerConfig = new LoggerConfiguration()
                 .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher(), new UTCTimestampEnricher())
                 .MinimumLevel.Information()
@@ -52,22 +56,26 @@ public static void Initialize()
         /// <remarks>This should only be called once, as soon as you have a valid config.</remarks>
         public static void ConfigureLogger(ILogConfig config)
         {
+            // if logging is disabled, we don't log anywhere
+            if (!config.Enabled) 
+            {
+                SetLoggingLevel("off"); // to short-circuit logging calls
+                Log.Logger = Serilog.Core.Logger.None; // a logger that does nothing
+                return;
+            }
+
             SetLoggingLevel(config.LogLevel);
 
-            AuditLog.IsAuditLogEnabled = config.IsAuditLogEnabled;
+            AuditLog.IsAuditLogEnabled = config.IsAuditLogEnabled && !config.Console;
 
             var loggerConfig = new LoggerConfiguration()
                 .MinimumLevel.ControlledBy(_loggingLevelSwitch)
                 .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher(), new UTCTimestampEnricher())
+                .ConfigureConsoleSink(config)
                 .ConfigureAuditLogSink(config)
                 .ConfigureFileSink(config)
                 .ConfigureDebugSink();
 
-            if (config.Console)
-            {
-                loggerConfig = loggerConfig.ConfigureConsoleSink();
-            }
-
             // configure the global singleton logger instance (which remains specific to the Agent by way of ILRepack)
             var configuredLogger = loggerConfig.CreateLogger();
 
@@ -90,6 +98,9 @@ private static void EchoInMemoryLogsToConfiguredLogger(ILogger configuredLogger)
             _inMemorySink.Dispose();
         }
 
+        /// <summary>
+        /// Configures the in-memory log sink used during bootstrapping.
+        /// </summary>
         private static LoggerConfiguration ConfigureInMemoryLogSink(this LoggerConfiguration loggerConfiguration)
         {
             // formatter not needed since this will be pushed to other sinks for output.
@@ -116,12 +127,7 @@ private static LoggerConfiguration ConfigureInMemoryLogSink(this LoggerConfigura
         /// <param name="loggerConfiguration"></param>
         private static LoggerConfiguration ConfigureEventLogSink(this LoggerConfiguration loggerConfiguration)
         {
-#if NETSTANDARD2_0
-            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-#else
-            var isWindows = true;
-#endif
-            if (isWindows)
+            if (_isWindows)
             {
                 const string eventLogName = "Application";
                 const string eventLogSourceName = "New Relic .NET Agent";
@@ -169,8 +175,10 @@ private static LoggerConfiguration ConfigureDebugSink(this LoggerConfiguration l
         /// <summary>
         /// Configure the console sink
         /// </summary>
-        private static LoggerConfiguration ConfigureConsoleSink(this LoggerConfiguration loggerConfiguration)
+        private static LoggerConfiguration ConfigureConsoleSink(this LoggerConfiguration loggerConfiguration, ILogConfig config)
         {
+            if (!config.Console) return loggerConfiguration;
+
             return loggerConfiguration
                 .WriteTo.Async(a =>
                     a.Logger(configuration =>
@@ -185,14 +193,11 @@ private static LoggerConfiguration ConfigureConsoleSink(this LoggerConfiguration
         /// <summary>
         /// Configure the file log sink
         /// </summary>
-        /// <param name="loggerConfiguration"></param>
-        /// <param name="config">The configuration for the appender.</param>
         private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration loggerConfiguration, ILogConfig config)
         {
-            if (!config.Enabled)
-            {
-                return loggerConfiguration;
-            }
+            // console logging disables all file logging output.
+            if (config.Console) return loggerConfiguration;
+
             string logFileName = config.GetFullLogFileName();
 
             try
@@ -201,32 +206,36 @@ private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration lo
                     .WriteTo
                     .Async(a =>
                         a.Logger(configuration =>
-                            {
-                                configuration
-                                    .ExcludeAuditLog()
-                                    .ConfigureRollingLogSink(logFileName, FileLogLayout, config);
-                            })
-                        );
+                        {
+                            configuration
+                                .ExcludeAuditLog()
+                                .ConfigureRollingLogSink(logFileName, FileLogLayout, config);
+                        })
+                    );
             }
             catch (Exception ex)
             {
                 Log.Logger.Warning(ex, "Unexpected exception when configuring file sink.");
 
-                // Fallback to the event log sink if we cannot setup a file logger.
-                Extensions.Logging.Log.FileLoggingHasFailed = true;
-                Log.Logger.Warning("Falling back to EventLog sink.");
-                loggerConfiguration.ConfigureEventLogSink();
+                if (_isWindows)
+                {
+                    // Fallback to the event log sink if we cannot setup a file logger.
+                    Extensions.Logging.Log.FileLoggingHasFailed = true;
+                    Log.Logger.Warning("Falling back to EventLog sink.");
+                    loggerConfiguration.ConfigureEventLogSink();
+                }
             }
 
             return loggerConfiguration;
         }
 
         /// <summary>
-        /// Setup the audit log file appender and attach it to a logger.
+        /// Configure the audit log sink
         /// </summary>
         private static LoggerConfiguration ConfigureAuditLogSink(this LoggerConfiguration loggerConfiguration, ILogConfig config)
         {
-            if (!config.IsAuditLogEnabled || !config.Enabled) return loggerConfiguration;
+            // console logging disables all file logging output, including audit logs
+            if (!config.IsAuditLogEnabled || config.Console) return loggerConfiguration;
 
             string logFileName = config.GetFullLogFileName().Replace(".log", "_audit.log");
 
@@ -242,13 +251,8 @@ private static LoggerConfiguration ConfigureAuditLogSink(this LoggerConfiguratio
         }
 
         /// <summary>
-        /// Sets up a rolling file appender using defaults shared for all our rolling file appenders.
+        /// Configure the rolling log sink
         /// </summary>
-        /// <param name="loggerConfiguration"></param>
-        /// <param name="fileName">The name of the file this appender will write to.</param>
-        /// <param name="outputFormat"></param>
-        /// <param name="config"></param>
-        /// <remarks>This does not call appender.ActivateOptions or add the appender to the logger.</remarks>
         private static LoggerConfiguration ConfigureRollingLogSink(this LoggerConfiguration loggerConfiguration, string fileName, string outputFormat, ILogConfig config)
         {
             // check that the log file is accessible
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj
@@ -14,8 +14,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.76" />
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.405.2" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.79" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.405.5" />
     <PackageReference Include="NewRelic.Agent.Api" Version="10.34.1" />
   </ItemGroup>
 </Project>
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkDynamoDBTest.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkDynamoDBTest.cs
@@ -35,8 +35,6 @@ public AwsSdkDynamoDBTest(AwsSdkContainerDynamoDBTestFixture fixture, ITestOutpu
                 configModifier.ConfigureFasterMetricsHarvestCycle(15);
                 configModifier.ConfigureFasterSpanEventsHarvestCycle(15);
                 configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);
-                configModifier.LogToConsole();
-
             },
             exerciseApplication: () =>
             {
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkMultiServiceTest.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkMultiServiceTest.cs
@@ -36,8 +36,6 @@ public AwsSdkMultiServiceTest(AwsSdkContainerMultiServiceTestFixture fixture, IT
                 configModifier.ConfigureFasterMetricsHarvestCycle(15);
                 configModifier.ConfigureFasterSpanEventsHarvestCycle(15);
                 configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);
-                configModifier.LogToConsole();
-
             },
             exerciseApplication: () =>
             {
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkSQSTest.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/AwsSdk/AwsSdkSQSTest.cs
@@ -41,8 +41,6 @@ protected AwsSdkSQSTestBase(AwsSdkContainerSQSTestFixture fixture, ITestOutputHe
                 configModifier.ConfigureFasterMetricsHarvestCycle(15);
                 configModifier.ConfigureFasterSpanEventsHarvestCycle(15);
                 configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);
-                configModifier.LogToConsole();
-
             },
             exerciseApplication: () =>
             {
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/InfiniteTracingContainerTests.cs
@@ -33,7 +33,6 @@ protected InfiniteTracingContainerTest(T fixture, ITestOutputHelper output) : ba
                 configModifier.ConfigureFasterMetricsHarvestCycle(10);
                 configModifier.ConfigureFasterTransactionTracesHarvestCycle(10);
                 configModifier.SetLogLevel("Finest");
-                configModifier.LogToConsole();
             },
             exerciseApplication: () =>
             {
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/KafkaTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/KafkaTests.cs
@@ -34,7 +34,6 @@ protected LinuxKafkaTest(T fixture, ITestOutputHelper output) : base(fixture)
                 var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);
                 configModifier.SetLogLevel("debug");
                 configModifier.ConfigureFasterMetricsHarvestCycle(10);
-                configModifier.LogToConsole();
 
                 _fixture.RemoteApplication.SetAdditionalEnvironmentVariable("NEW_RELIC_KAFKA_TOPIC", _topicName);
             },
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs
@@ -22,7 +22,6 @@ protected LinuxContainerTest(T fixture, ITestOutputHelper output) : base(fixture
             {
                 var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);
                 configModifier.ConfigureFasterMetricsHarvestCycle(10);
-                configModifier.LogToConsole();
             },
             exerciseApplication: () =>
             {
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/MemcachedTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/MemcachedTests.cs
@@ -26,7 +26,6 @@ protected LinuxMemcachedTest(T fixture, ITestOutputHelper output) : base(fixture
                     var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);
                     configModifier.SetLogLevel("debug");
                     configModifier.ConfigureFasterMetricsHarvestCycle(10);
-                    configModifier.LogToConsole();
                 },
                 exerciseApplication: () =>
                 {
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs
@@ -44,7 +44,7 @@ public abstract class AgentLogBase
         public const string CustomEventDataLogLineRegex = DebugLogLinePrefixRegex + @"Request\(.{36}\): Invoked ""custom_event_data"" with : (.*)";
 
         // Collector responses
-        public const string ConnectResponseLogLineRegex = DebugLogLinePrefixRegex + @"Request\(.{36}\): Invocation of ""connect"" yielded response : {""return_value"":{""agent_run_id""(.*)";
+        public const string ConnectResponseLogLineRegex = DebugLogLinePrefixRegex + @"Request\(.{36}\): Invocation of ""connect"" yielded response : {""return_value"":(.*)";
         public const string ErrorResponseLogLinePrefixRegex = ErrorLogLinePrefixRegex + @"Request\(.{36}\): ";
 
         public const string ThreadProfileStartingLogLineRegex = InfoLogLinePrefixRegex + @"Starting a thread profiling session";
@@ -496,7 +496,7 @@ public IEnumerable<ConnectResponseData> GetConnectResponseDatas()
 
             foreach (var match in matches)
             {
-                var json = "{ \"agent_run_id\"" + match;
+                var json = match;
                 json = json?.Trim('[', ']');
                 json = json.Remove(json.Length - 1); // remove the extra }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CSP/AspNetCoreLocalHSMDisabledAndServerSideHSMEnabledTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/CSP/AspNetCoreLocalHSMDisabledAndServerSideHSMEnabledTests.cs
@@ -41,7 +41,7 @@ public void Test()
         {
             // This test looks for the connect response body that was intended to be removed in P17, but was not.  If it does get removed this will fail.
             // 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.
-            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");
+            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");
             Assert.NotNull(notConnectedLogLine);
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CSP/AspNetCoreLocalHSMEnabledAndServerSideHSMDisabledTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/CSP/AspNetCoreLocalHSMEnabledAndServerSideHSMDisabledTests.cs
@@ -49,7 +49,7 @@ public void Test()
         {
             // This test looks for the connect response body that was intended to be removed in P17, but was not.  If it does get removed this will fail.
             // 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.
-            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");
+            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");
             Assert.NotNull(notConnectedLogLine);
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CSP/HighSecurityModeServerDisabled.cs b/tests/Agent/IntegrationTests/IntegrationTests/CSP/HighSecurityModeServerDisabled.cs
@@ -46,7 +46,7 @@ public void Test()
         {
             // This test looks for the connect response body that was intended to be removed in P17, but was not.  If it does get removed this will fail.
             // 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.
-            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");
+            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");
             Assert.NotNull(notConnectedLogLine);
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CSP/HighSecurityModeServerEnabled.cs b/tests/Agent/IntegrationTests/IntegrationTests/CSP/HighSecurityModeServerEnabled.cs
@@ -44,7 +44,7 @@ public void Test()
         {
             // This test looks for the connect response body that was intended to be removed in P17, but was not.  If it does get removed this will fail.
             // 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.
-            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");
+            var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");
             Assert.NotNull(notConnectedLogLine);
         }
     }
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj
diff --git a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ public AwsSdkDynamoDBTest(AwsSdkContainerDynamoDBTestFixture fixture, ITestOutpu`
`35`	`35`	`configModifier.ConfigureFasterMetricsHarvestCycle(15);`
`36`	`36`	`configModifier.ConfigureFasterSpanEventsHarvestCycle(15);`
`37`	`37`	`configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);`
`38`		`- configModifier.LogToConsole();`
`39`		`-`
`40`	`38`	`},`
`41`	`39`	`exerciseApplication: () =>`
`42`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public AwsSdkMultiServiceTest(AwsSdkContainerMultiServiceTestFixture fixture, IT`
`36`	`36`	`configModifier.ConfigureFasterMetricsHarvestCycle(15);`
`37`	`37`	`configModifier.ConfigureFasterSpanEventsHarvestCycle(15);`
`38`	`38`	`configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);`
`39`		`- configModifier.LogToConsole();`
`40`		`-`
`41`	`39`	`},`
`42`	`40`	`exerciseApplication: () =>`
`43`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ protected AwsSdkSQSTestBase(AwsSdkContainerSQSTestFixture fixture, ITestOutputHe`
`41`	`41`	`configModifier.ConfigureFasterMetricsHarvestCycle(15);`
`42`	`42`	`configModifier.ConfigureFasterSpanEventsHarvestCycle(15);`
`43`	`43`	`configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);`
`44`		`- configModifier.LogToConsole();`
`45`		`-`
`46`	`44`	`},`
`47`	`45`	`exerciseApplication: () =>`
`48`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ protected InfiniteTracingContainerTest(T fixture, ITestOutputHelper output) : ba`
`33`	`33`	`configModifier.ConfigureFasterMetricsHarvestCycle(10);`
`34`	`34`	`configModifier.ConfigureFasterTransactionTracesHarvestCycle(10);`
`35`	`35`	`configModifier.SetLogLevel("Finest");`
`36`		`- configModifier.LogToConsole();`
`37`	`36`	`},`
`38`	`37`	`exerciseApplication: () =>`
`39`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ protected LinuxContainerTest(T fixture, ITestOutputHelper output) : base(fixture`
`22`	`22`	`{`
`23`	`23`	`var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);`
`24`	`24`	`configModifier.ConfigureFasterMetricsHarvestCycle(10);`
`25`		`- configModifier.LogToConsole();`
`26`	`25`	`},`
`27`	`26`	`exerciseApplication: () =>`
`28`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ protected LinuxMemcachedTest(T fixture, ITestOutputHelper output) : base(fixture`
`26`	`26`	`var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);`
`27`	`27`	`configModifier.SetLogLevel("debug");`
`28`	`28`	`configModifier.ConfigureFasterMetricsHarvestCycle(10);`
`29`		`- configModifier.LogToConsole();`
`30`	`29`	`},`
`31`	`30`	`exerciseApplication: () =>`
`32`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void Test()`
`41`	`41`	`{`
`42`	`42`	`// This test looks for the connect response body that was intended to be removed in P17, but was not. If it does get removed this will fail.`
`43`	`43`	`// 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.`
`44`		`- var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");`
	`44`	`+ var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");`
`45`	`45`	`Assert.NotNull(notConnectedLogLine);`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void Test()`
`49`	`49`	`{`
`50`	`50`	`// This test looks for the connect response body that was intended to be removed in P17, but was not. If it does get removed this will fail.`
`51`	`51`	`// 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.`
`52`		`- var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");`
	`52`	`+ var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");`
`53`	`53`	`Assert.NotNull(notConnectedLogLine);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void Test()`
`46`	`46`	`{`
`47`	`47`	`// This test looks for the connect response body that was intended to be removed in P17, but was not. If it does get removed this will fail.`
`48`	`48`	`// 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.`
`49`		`- var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");`
	`49`	`+ var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");`
`50`	`50`	`Assert.NotNull(notConnectedLogLine);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void Test()`
`44`	`44`	`{`
`45`	`45`	`// This test looks for the connect response body that was intended to be removed in P17, but was not. If it does get removed this will fail.`
`46`	`46`	`// 12/14/23 - the response status changed from "Gone" to "Conflict". If this test fails in the future, be alert for it possibly changing back.`
`47`		`- var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict with message {\"exception\":{\"message\":\"Account Security Violation: *?");`
	`47`	`+ var notConnectedLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorResponseLogLinePrefixRegex + "Received HTTP status code Conflict *?");`
`48`	`48`	`Assert.NotNull(notConnectedLogLine);`
`49`	`49`	`}`
`50`	`50`	`}`