wip

FantasticFiasco · Nov 6, 2021 · 07a2560 · 07a2560
1 parent cbfde69
commit 07a2560
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/Serilog.Sinks.Http/Sinks/Http/Private/NonDurable/LogEventQueue.cs b/src/Serilog.Sinks.Http/Sinks/Http/Private/NonDurable/LogEventQueue.cs
@@ -23,13 +23,17 @@ public class LogEventQueue
         private readonly long? queueLimitBytes;
         private readonly object syncRoot = new();
 
+        private long queueBytes;
+
         public LogEventQueue(long? queueLimitBytes = null)
         {
             if (queueLimitBytes < 1)
                 throw new ArgumentException("queueLimitBytes must be either null or greater than 0", nameof(queueLimitBytes));
 
             queue = new Queue<string>();
             this.queueLimitBytes = queueLimitBytes;
+
+            queueBytes = 0;
         }
 
         public void Enqueue(string logEvent)
@@ -45,11 +49,13 @@ public EnqueueResult TryEnqueue(string logEvent)
         {
             lock (syncRoot)
             {
-                if (queue.Count == queueLimit)
+                var logEventByteSize = ByteSize.From(logEvent);
+                if (queueBytes + logEventByteSize > queueLimitBytes)
                 {
                     return EnqueueResult.QueueFull;
                 }
 
+                queueBytes += logEventByteSize;
                 queue.Enqueue(logEvent);
                 return EnqueueResult.Ok;
             }
@@ -66,13 +72,15 @@ public DequeueResult TryDequeue(long? logEventMaxSize, out string logEvent)
                 }
 
                 logEvent = queue.Peek();
+                var logEventByteSize = ByteSize.From(logEvent);
 
-                if (ByteSize.From(logEvent) > logEventMaxSize)
+                if (logEventByteSize > logEventMaxSize)
                 {
                     logEvent = string.Empty;
                     return DequeueResult.MaxSizeViolation;
                 }
 
+                queueBytes -= logEventByteSize;
                 queue.Dequeue();
                 return DequeueResult.Ok;
             }

diff --git a/test/Serilog.Sinks.HttpTests/HttpSinkGivenCodeConfigurationShould.cs b/test/Serilog.Sinks.HttpTests/HttpSinkGivenCodeConfigurationShould.cs
@@ -21,7 +21,7 @@ public HttpSinkGivenCodeConfigurationShould()
                     requestUri: "https://www.mylogs.com",
                     logEventsInBatchLimit: 100,
                     batchSizeLimitBytes: ByteSize.MB,
-                    queueLimit: 10000,
+                    queueLimitBytes: ByteSize.MB,
                     period: TimeSpan.FromMilliseconds(1),
                     textFormatter: new NormalRenderedTextFormatter(),
                     batchFormatter: new DefaultBatchFormatter(),

diff --git a/test/Serilog.Sinks.HttpTests/Sinks/Http/Private/NonDurable/HttpSinkShould.cs b/test/Serilog.Sinks.HttpTests/Sinks/Http/Private/NonDurable/HttpSinkShould.cs
@@ -22,7 +22,7 @@ public async Task StayIdleGivenNoLogEvents()
                 logEventLimitBytes: null,
                 logEventsInBatchLimit: null,
                 batchSizeLimitBytes: null,
-                queueLimit: null,
+                queueLimitBytes: null,
                 period: TimeSpan.FromMilliseconds(1), // 1 ms period
                 textFormatter: new NormalTextFormatter(),
                 batchFormatter: new DefaultBatchFormatter(),
@@ -48,7 +48,7 @@ public async Task RespectLogEventLimitBytes()
                 logEventLimitBytes: 1, // Is lower than emitted log event
                 logEventsInBatchLimit: null,
                 batchSizeLimitBytes: null,
-                queueLimit: null,
+                queueLimitBytes: null,
                 period: TimeSpan.FromMilliseconds(1), // 1 ms period
                 textFormatter: new NormalTextFormatter(),
                 batchFormatter: new DefaultBatchFormatter(),
@@ -65,7 +65,7 @@ public async Task RespectLogEventLimitBytes()
         }
 
         [Fact]
-        public async Task RespectQueueLimit()
+        public async Task RespectQueueLimitBytes()
         {
             // Arrange
             var httpClient = new HttpClientMock();
@@ -76,12 +76,14 @@ public async Task RespectQueueLimit()
                 .Select(number => Some.LogEvent("Event {number}", number))
                 .ToArray();
 
+
+            // TODO: Calculate the size of the first log event, and set the value as queueLimitBytes
             using var sink = new HttpSink(
                 requestUri: "https://www.mylogs.com",
                 logEventLimitBytes: null,
                 logEventsInBatchLimit: null,
                 batchSizeLimitBytes: null,
-                queueLimit: 1, // Queue only holds 1 event
+                queueLimitBytes: 1, // Queue only holds the first event
                 period: TimeSpan.FromMilliseconds(1), // 1 ms period
                 textFormatter: new NormalTextFormatter(),
                 batchFormatter: new DefaultBatchFormatter(),

diff --git a/test/Serilog.Sinks.HttpTests/appsettings_http.json b/test/Serilog.Sinks.HttpTests/appsettings_http.json
@@ -8,7 +8,7 @@
           "requestUri": "https://www.mylogs.com",
           "logEventsInBatchLimit": 100,
           "batchSizeLimitBytes": 1048576,
-          "queueLimit": 10000,
+          "queueLimitBytes": 1048576,
           "period": "00:00:00.001",
           "textFormatter": "Serilog.Sinks.Http.TextFormatters.NormalRenderedTextFormatter, Serilog.Sinks.Http",
           "batchFormatter": "Serilog.Sinks.Http.BatchFormatters.DefaultBatchFormatter, Serilog.Sinks.Http",