Test fixes for the removal of non-batched buffered log processing

Author: paulbatum

src/WebJobs.Script.WebHost/Diagnostics/ConsoleWriter.cs

@@ -20,7 +20,7 @@ internal class ConsoleWriter : IDisposable
         // we can influence the latency distribution by controlling how much of the buffer we will process in one pass.
         // If we set this to 1, the P50 latency will be low, but the P99 latency will be high.
         // If we set this to a large value, it keeps the P99 latency under control but the P50 degrades.
-        // In local testing with a console attached, processing 1/10th of the buffer size per iteration yields single digit P50 while keeping P99 under 100ms.
+        // In local testing with a console attached, processing 1/10th of the buffer size per iteration yields P50 under 10ms with P99 under 100ms.
         private const int SingleWriteBufferDenominator = 10;
 
         private static readonly TimeSpan DisposeTimeout = TimeSpan.FromSeconds(5);

test/WebJobs.Script.Tests/Diagnostics/LinuxContainerEventGeneratorWithConsoleOutputTests.cs

@@ -35,7 +35,7 @@ public void Dispose()
             Console.SetOut(standardOutput);
         }
 
-        private IEnvironment CreateEnvironment(bool consoleDisabled = false, int? bufferSize = null, bool? batched = null)
+        private IEnvironment CreateEnvironment(bool consoleDisabled = false, int? bufferSize = null)
         {
             var mockEnvironment = new Mock<IEnvironment>(MockBehavior.Strict);
             mockEnvironment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.ContainerName)).Returns(_containerName);
@@ -45,13 +45,6 @@ private IEnvironment CreateEnvironment(bool consoleDisabled = false, int? buffer
 
             mockEnvironment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.ConsoleLoggingDisabled)).Returns(consoleDisabled ? "1" : "0");
             mockEnvironment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.ConsoleLoggingBufferSize)).Returns(bufferSize?.ToString());
-            mockEnvironment.Setup(p => p.GetEnvironmentVariable(EnvironmentSettingNames.ConsoleLoggingBufferBatched)).Returns(
-                batched switch
-                {
-                    null => null,
-                    true => "1",
-                    false => "0",
-                });
             return mockEnvironment.Object;
         }
 
@@ -86,12 +79,10 @@ public void SingleEventNoBuffer()
             Assert.Equal($"MS_FUNCTION_LOGS 4,C37E3412-86D1-4B93-BC5A-A2AE09D26C2D,TestApp,TestFunction,TestEvent,TestSource,\"These are the details, lots of details\",\"This is the summary, a great summary\",{ScriptHost.Version},{timestamp.ToString("O")},TestExceptionType,\"Test exception message, with details\",E2D5A6ED-4CE3-4CFD-8878-FD4814F0A1F3,3AD41658-1C4E-4C9D-B0B9-24F2BDAE2829,F0AAA9AD-C3A6-48B9-A75E-57BB280EBB53,TEST-CONTAINER,test-stamp,test-tenant,TestRuntimeSiteName,TestSlotName", output);
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task SingleEventBuffer(bool batched)
+        [Fact]
+        public async Task SingleEventBuffer()
         {
-            var env = CreateEnvironment(bufferSize: 10, batched: batched);
+            var env = CreateEnvironment(bufferSize: 10);
             var generator = new LinuxContainerEventGenerator(env);
 
             var timestamp = DateTime.Parse("2023-04-19T14:12:00.0000000Z");
@@ -105,12 +96,10 @@ public async Task SingleEventBuffer(bool batched)
             Assert.Equal($"MS_FUNCTION_LOGS 4,C37E3412-86D1-4B93-BC5A-A2AE09D26C2D,TestApp,TestFunction,TestEvent,TestSource,\"These are the details, lots of details\",\"This is the summary, a great summary\",{ScriptHost.Version},{timestamp.ToString("O")},TestExceptionType,\"Test exception message, with details\",E2D5A6ED-4CE3-4CFD-8878-FD4814F0A1F3,3AD41658-1C4E-4C9D-B0B9-24F2BDAE2829,F0AAA9AD-C3A6-48B9-A75E-57BB280EBB53,TEST-CONTAINER,test-stamp,test-tenant,TestRuntimeSiteName,TestSlotName", output);
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task MultipleEventsBuffered(bool batched)
+        [Fact]
+        public async Task MultipleEventsBuffered()
         {
-            var env = CreateEnvironment(bufferSize: 10, batched: batched);
+            var env = CreateEnvironment(bufferSize: 10);
             var generator = new LinuxContainerEventGenerator(env);
 
             var timestamp = DateTime.Parse("2023-04-19T14:12:00.0000000Z");
@@ -130,13 +119,11 @@ public async Task MultipleEventsBuffered(bool batched)
             Assert.Equal($"MS_FUNCTION_LOGS 4,C37E3412-86D1-4B93-BC5A-A2AE09D26C2D,TestApp,TestFunction3,TestEvent,TestSource,\"These are the details, lots of details\",\"This is the summary, a great summary\",{ScriptHost.Version},{timestamp.ToString("O")},TestExceptionType,\"Test exception message, with details\",E2D5A6ED-4CE3-4CFD-8878-FD4814F0A1F3,3AD41658-1C4E-4C9D-B0B9-24F2BDAE2829,F0AAA9AD-C3A6-48B9-A75E-57BB280EBB53,TEST-CONTAINER,test-stamp,test-tenant,TestRuntimeSiteName,TestSlotName", output[2]);
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void MultipleEventsWithTinyBuffer_WritesDirectlyToConsoleOnTimeout(bool batched)
+        [Fact]
+        public void MultipleEventsWithTinyBuffer_WritesDirectlyToConsoleOnTimeout()
         {
             // setup in a state where the buffer isn't being processed and can only hold two messages
-            var env = CreateEnvironment(bufferSize: 2, batched: batched);
+            var env = CreateEnvironment(bufferSize: 2);
             var consoleWriter = new ConsoleWriter(env, LinuxContainerEventGenerator.LogUnhandledException, consoleBufferTimeout: TimeSpan.FromMilliseconds(10), autoStart: false);
             var generator = new LinuxContainerEventGenerator(env, consoleWriter);
 
@@ -160,7 +147,7 @@ public void MultipleEventsWithTinyBuffer_WritesDirectlyToConsoleOnTimeout(bool b
         public async Task WritesLogsDirectlyWhenBufferIsFull()
         {
             // setup in a state where the buffer isn't being processed and can only hold two messages
-            var env = CreateEnvironment(bufferSize: 2, batched: true);
+            var env = CreateEnvironment(bufferSize: 2);
             var consoleWriter = new ConsoleWriter(env, LinuxContainerEventGenerator.LogUnhandledException, consoleBufferTimeout: TimeSpan.FromMilliseconds(500), autoStart: false);
             var generator = new LinuxContainerEventGenerator(env, consoleWriter);
 
@@ -172,7 +159,7 @@ public async Task WritesLogsDirectlyWhenBufferIsFull()
             generator.LogFunctionTraceEvent(LogLevel.Information, "C37E3412-86D1-4B93-BC5A-A2AE09D26C2D", "TestApp", "TestFunction3", "TestEvent", "TestSource", "These are the details, lots of details", "This is the summary, a great summary", "TestExceptionType", "Test exception message, with details", "E2D5A6ED-4CE3-4CFD-8878-FD4814F0A1F3", "3AD41658-1C4E-4C9D-B0B9-24F2BDAE2829", "F0AAA9AD-C3A6-48B9-A75E-57BB280EBB53", "TestRuntimeSiteName", "TestSlotName", timestamp);
             await Task.Delay(TimeSpan.FromMilliseconds(10));
 
-            consoleWriter.StartProcessingBuffer(batched: true);
+            consoleWriter.StartProcessingBuffer();
             await Task.Delay(TimeSpan.FromMilliseconds(50));
 
             using var sr = new StreamReader(_consoleOut);
@@ -190,7 +177,7 @@ public async Task WritesLogsDirectlyWhenBufferIsFull()
         [Fact]
         public async Task FlushesBufferOnDispose()
         {
-            var env = CreateEnvironment(bufferSize: 10, batched: true);
+            var env = CreateEnvironment(bufferSize: 10);
             var consoleWriter = new ConsoleWriter(env, LinuxContainerEventGenerator.LogUnhandledException, consoleBufferTimeout: TimeSpan.FromMilliseconds(500), autoStart: true);
             var generator = new LinuxContainerEventGenerator(env, consoleWriter);