Merge pull request #72 from serilog/dev

4.0.1 Release
serilog · Mar 15, 2024 · 87a2ac3 · 87a2ac3
2 parents b3821e5 + d139ae5
commit 87a2ac3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.csproj b/src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Buffer batches of log events to be flushed asynchronously.</Description>
-    <VersionPrefix>4.0.0</VersionPrefix>
+    <VersionPrefix>4.0.1</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net462</TargetFrameworks>
     <TargetFrameworks>$(TargetFrameworks);netstandard2.0;net6.0</TargetFrameworks>

diff --git a/src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PeriodicBatchingSink.cs b/src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PeriodicBatchingSink.cs
@@ -121,7 +121,7 @@ async Task LoopAsync()
                 {
                     _currentBatch.Enqueue(next);
                 }
-            } while ((_currentBatch.Count < _batchSizeLimit || _currentBatch.Count > 0 && isEagerBatch) &&
+            } while ((_currentBatch.Count < _batchSizeLimit && !isEagerBatch || _currentBatch.Count == 0) &&
                      !_shutdownSignal.IsCancellationRequested &&
                      await TryWaitToReadAsync(_queue.Reader, fillBatch, _shutdownSignal.Token).ConfigureAwait(false));
 

diff --git a/test/Serilog.Sinks.PeriodicBatching.Tests/PeriodicBatchingSinkTests.cs b/test/Serilog.Sinks.PeriodicBatching.Tests/PeriodicBatchingSinkTests.cs
@@ -107,6 +107,44 @@ public void ExecutionContextDoesNotFlowToBatchedSink()
         pbs.Emit(evt);
         pbs.Dispose();
 
-        Assert.Equal(default(int), observed);
+        Assert.Equal(default, observed);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task EagerlyEmitFirstEventCausesQuickInitialBatch(bool eagerlyEmit)
+    {
+        long batchesEmitted = 0;
+        var bs = new CallbackBatchedSink(_ =>
+        {
+            // ReSharper disable once AccessToModifiedClosure
+            Interlocked.Increment(ref batchesEmitted);
+            return Task.CompletedTask;
+        });
+
+        var options = new PeriodicBatchingSinkOptions
+        {
+            Period = TimeSpan.FromSeconds(2),
+            EagerlyEmitFirstEvent = eagerlyEmit,
+            BatchSizeLimit = 10,
+            QueueLimit = 1000
+        };
+
+        var pbs = new PeriodicBatchingSink(bs, options);
+
+        var evt = Some.InformationEvent();
+        pbs.Emit(evt);
+
+        await Task.Delay(1900);
+        Assert.Equal(eagerlyEmit ? 1L : 0, Interlocked.Read(ref batchesEmitted));
+
+#if FEATURE_ASYNCDISPOSABLE
+        await pbs.DisposeAsync();
+#else
+        pbs.Dispose();
+#endif
+
+        Assert.Equal(1L, Interlocked.Read(ref batchesEmitted));
     }
 }