huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.2.x] Port Drop messages in azure loggers if queue is full (#592)

This commit is contained in:
Pavel Krymets 2019-01-15 09:04:57 -08:00 committed by GitHub
parent c94d063eb8
commit 7940062040
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Logging/Logging.AzureAppServices/src/Internal/BatchingLoggerProvider.cs
View File

@ -18,6 +18,8 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Internal
private readonly int? _batchSize; private readonly int? _batchSize;
private readonly IDisposable _optionsChangeToken; private readonly IDisposable _optionsChangeToken;
private int _messagesDropped;
private BlockingCollection<LogMessage> _messageQueue; private BlockingCollection<LogMessage> _messageQueue;
private Task _outputTask; private Task _outputTask;
private CancellationTokenSource _cancellationTokenSource; private CancellationTokenSource _cancellationTokenSource;
@ -78,6 +80,16 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Internal
limit--; limit--;
} }
var messagesDropped = Interlocked.Exchange(ref _messagesDropped, 0);
if (messagesDropped != 0)
{
_currentBatch.Add(new LogMessage()
{
Message = $"{messagesDropped} message(s) dropped because of queue size limit. Increase the queue size or decrease logging verbosity to avoid this.{Environment.NewLine}",
Timestamp = DateTimeOffset.Now
});
}
if (_currentBatch.Count > 0) if (_currentBatch.Count > 0)
{ {
try try
@ -91,7 +103,6 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Internal
_currentBatch.Clear(); _currentBatch.Clear();
} }
await IntervalAsync(_interval, _cancellationTokenSource.Token); await IntervalAsync(_interval, _cancellationTokenSource.Token);
} }
} }
@ -107,7 +118,10 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Internal
{ {
try try
{ {
_messageQueue.Add(new LogMessage { Message = message, Timestamp = timestamp }, _cancellationTokenSource.Token); if (!_messageQueue.TryAdd(new LogMessage { Message = message, Timestamp = timestamp }, millisecondsTimeout: 0, cancellationToken: _cancellationTokenSource.Token))
{
Interlocked.Increment(ref _messagesDropped);
}
} }
catch catch
{ {
@ -160,4 +174,4 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Internal
return new BatchingLogger(this, categoryName); return new BatchingLogger(this, categoryName);
} }
} }
} }

13
src/Logging/Logging.AzureAppServices/test/BatchingLoggerProviderTests.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -51,7 +51,6 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Test
Assert.Single(provider.Batches); Assert.Single(provider.Batches);
Assert.Single(provider.Batches[0]); Assert.Single(provider.Batches[0]);
Assert.Equal("2016-05-04 03:02:01.000 +00:00 [Information] Cat: Info message" + _nl, provider.Batches[0][0].Message); Assert.Equal("2016-05-04 03:02:01.000 +00:00 [Information] Cat: Info message" + _nl, provider.Batches[0][0].Message);
provider.IntervalControl.Resume(); provider.IntervalControl.Resume();
await provider.IntervalControl.Pause; await provider.IntervalControl.Pause;
@ -62,7 +61,7 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Test
} }
[Fact] [Fact]
public async Task BlocksWhenReachingMaxQueue() public async Task DropsMessagesWhenReachingMaxQueue()
{ {
var provider = new TestBatchingLoggingProvider(maxQueueSize: 1); var provider = new TestBatchingLoggingProvider(maxQueueSize: 1);
var logger = (BatchingLogger)provider.CreateLogger("Cat"); var logger = (BatchingLogger)provider.CreateLogger("Cat");
@ -70,14 +69,14 @@ namespace Microsoft.Extensions.Logging.AzureAppServices.Test
await provider.IntervalControl.Pause; await provider.IntervalControl.Pause;
logger.Log(_timestampOne, LogLevel.Information, 0, "Info message", null, (state, ex) => state); logger.Log(_timestampOne, LogLevel.Information, 0, "Info message", null, (state, ex) => state);
var task = Task.Run(() => logger.Log(_timestampOne.AddHours(1), LogLevel.Error, 0, "Error message", null, (state, ex) => state)); logger.Log(_timestampOne.AddHours(1), LogLevel.Error, 0, "Error message", null, (state, ex) => state);
Assert.False(task.Wait(1000));
provider.IntervalControl.Resume(); provider.IntervalControl.Resume();
await provider.IntervalControl.Pause; await provider.IntervalControl.Pause;
Assert.True(task.Wait(1000)); Assert.Equal(2, provider.Batches[0].Length);
Assert.Equal("2016-05-04 03:02:01.000 +00:00 [Information] Cat: Info message" + _nl, provider.Batches[0][0].Message);
Assert.Equal("1 message(s) dropped because of queue size limit. Increase the queue size or decrease logging verbosity to avoid this." + _nl, provider.Batches[0][1].Message);
} }
private class TestBatchingLoggingProvider: BatchingLoggerProvider private class TestBatchingLoggingProvider: BatchingLoggerProvider