Skip to content

Commit b32bb6a

Browse files
nblumhardtnblumhardt
committed
Update dependencies, fix lints
1 parent ef00e39 commit b32bb6a

File tree

6 files changed

+277
-283
lines changed

6 files changed

+277
-283
lines changed

‎src/Serilog.Sinks.Async/Sinks/Async/BackgroundWorkerSink.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sealed class BackgroundWorkerSink : ILogEventSink, IAsyncLogEventSinkInspector,
3232

3333
long _droppedMessages;
3434

35-
public BackgroundWorkerSink(ILogEventSink wrappedSink, int bufferCapacity, bool blockWhenFull, IAsyncLogEventSinkMonitor? monitor = null)
35+
public BackgroundWorkerSink(ILogEventSink wrappedSink, int bufferCapacity, bool blockWhenFull, IAsyncLogEventSinkMonitor? monitor)
3636
{
3737
if (bufferCapacity <= 0) throw new ArgumentOutOfRangeException(nameof(bufferCapacity));
3838
_wrappedSink = wrappedSink ?? throw new ArgumentNullException(nameof(wrappedSink));

‎test/Serilog.Sinks.Async.PerformanceTests/Serilog.Sinks.Async.PerformanceTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
20-
<PackageReference Include="xunit" Version="2.4.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
20+
<PackageReference Include="xunit" Version="2.8.1" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
26-
<PackageReference Include="Serilog.Sinks.File" Version="3.1.0" />
25+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
26+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2727
</ItemGroup>
2828

2929
</Project>

‎test/Serilog.Sinks.Async.Tests/BackgroundWorkerSinkIntegrationSpec.cs

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -10,157 +10,158 @@
1010

1111
namespace Serilog.Sinks.Async.Tests;
1212

13-
public class BackgroundWorkerSinkIntegrationSpec
13+
public static class BackgroundWorkerSinkIntegrationSpec
1414
{
1515
/// <summary>
1616
/// If <see cref="withDelay" />, then adds a 1sec delay before every fifth element created
1717
/// </summary>
1818
static void CreateAudits(ILogger logger, int count, bool withDelay)
1919
{
20-
var delay = TimeSpan.FromMilliseconds(1000);
21-
var sw = new Stopwatch();
22-
sw.Start();
23-
Debug.WriteLine("{0:h:mm:ss tt} Start: Writing {1} audits", DateTime.Now, count);
24-
try
20+
var delay = TimeSpan.FromMilliseconds(1000);
21+
var sw = new Stopwatch();
22+
sw.Start();
23+
Debug.WriteLine("{0:h:mm:ss tt} Start: Writing {1} audits", DateTime.Now, count);
24+
try
25+
{
26+
var delayCount = 0;
27+
Loop.For(counter =>
2528
{
26-
var delayCount = 0;
27-
Loop.For(counter =>
29+
if (withDelay
30+
&& counter > 0
31+
&& counter % 5 == 0)
2832
{
29-
if (withDelay
30-
&& counter > 0
31-
&& counter%5 == 0)
32-
{
33-
delayCount++;
34-
Debug.WriteLine("{0:h:mm:ss tt} Delay ({1}) after {2}th write, for {3:0.###}secs", DateTime.Now,
35-
delayCount, counter,
36-
delay.TotalSeconds);
37-
Thread.Sleep(delay);
38-
}
39-
logger.Information("{$Counter}", counter);
40-
}, count);
41-
}
42-
finally
43-
{
44-
sw.Stop();
45-
Debug.WriteLine("{0:h:mm:ss tt} End: Writing {1} audits, taking {2:0.###}", DateTime.Now, count,
46-
sw.Elapsed.TotalSeconds);
47-
}
33+
delayCount++;
34+
Debug.WriteLine("{0:h:mm:ss tt} Delay ({1}) after {2}th write, for {3:0.###}secs", DateTime.Now,
35+
delayCount, counter,
36+
delay.TotalSeconds);
37+
Thread.Sleep(delay);
38+
}
39+
40+
logger.Information("{$Counter}", counter);
41+
}, count);
42+
}
43+
finally
44+
{
45+
sw.Stop();
46+
Debug.WriteLine("{0:h:mm:ss tt} End: Writing {1} audits, taking {2:0.###}", DateTime.Now, count,
47+
sw.Elapsed.TotalSeconds);
4848
}
49+
}
4950

5051
static List<LogEvent> RetrieveEvents(MemorySink sink, int count)
5152
{
52-
Debug.WriteLine("{0:h:mm:ss tt} Retrieving {1} events", DateTime.Now, count);
53+
Debug.WriteLine("{0:h:mm:ss tt} Retrieving {1} events", DateTime.Now, count);
5354

54-
Loop.Retry(() => sink.Events, events => events != null && events.Count >= count, TimeSpan.FromSeconds(1),
55-
TimeSpan.FromSeconds(30));
55+
Loop.Retry(() => sink.Events, events => events != null && events.Count >= count, TimeSpan.FromSeconds(1),
56+
TimeSpan.FromSeconds(30));
5657

57-
return sink.Events.ToList();
58-
}
58+
return sink.Events.ToList();
59+
}
5960

6061
public class GivenNoBufferQueueAndNoDelays : SinkSpecBase
6162
{
6263
public GivenNoBufferQueueAndNoDelays()
6364
: base(false, false)
6465
{
65-
}
66+
}
6667
}
6768

6869
public class GivenBufferQueueAndNoDelays : SinkSpecBase
6970
{
7071
public GivenBufferQueueAndNoDelays()
7172
: base(true, false)
7273
{
73-
}
74+
}
7475
}
7576

7677
public class GivenNoBufferQueueAndDelays : SinkSpecBase
7778
{
7879
public GivenNoBufferQueueAndDelays()
7980
: base(false, true)
8081
{
81-
}
82+
}
8283
}
8384

8485
public class GivenBufferQueueAndDelays : SinkSpecBase
8586
{
8687
public GivenBufferQueueAndDelays()
8788
: base(true, true)
8889
{
89-
}
90+
}
9091
}
9192

9293
public abstract class SinkSpecBase : IDisposable
9394
{
94-
bool _delayCreation;
95-
Logger _logger;
96-
MemorySink _memorySink;
95+
readonly bool _delayCreation;
96+
readonly Logger _logger;
97+
readonly MemorySink _memorySink;
9798

9899
protected SinkSpecBase(bool useBufferedQueue, bool delayCreation)
99100
{
100-
_delayCreation = delayCreation;
101+
_delayCreation = delayCreation;
101102

102-
_memorySink = new MemorySink();
103+
_memorySink = new MemorySink();
103104

104-
if (useBufferedQueue)
105-
{
106-
_logger = new LoggerConfiguration()
107-
.WriteTo.Async(a => a.Sink(_memorySink))
108-
.CreateLogger();
109-
}
110-
else
111-
{
112-
_logger = new LoggerConfiguration()
113-
.WriteTo.Sink(_memorySink)
114-
.CreateLogger();
115-
}
116-
117-
Debug.WriteLine("{0:h:mm:ss tt} Started test", DateTime.Now);
105+
if (useBufferedQueue)
106+
{
107+
_logger = new LoggerConfiguration()
108+
.WriteTo.Async(a => a.Sink(_memorySink))
109+
.CreateLogger();
110+
}
111+
else
112+
{
113+
_logger = new LoggerConfiguration()
114+
.WriteTo.Sink(_memorySink)
115+
.CreateLogger();
118116
}
119117

118+
Debug.WriteLine("{0:h:mm:ss tt} Started test", DateTime.Now);
119+
}
120+
120121
public void Dispose()
121122
{
122-
_logger.Dispose();
123-
Debug.WriteLine("{0:h:mm:ss tt} Ended test", DateTime.Now);
124-
}
123+
_logger.Dispose();
124+
Debug.WriteLine("{0:h:mm:ss tt} Ended test", DateTime.Now);
125+
}
125126

126127
[Fact]
127128
public void WhenAuditSingle_ThenQueued()
128129
{
129-
CreateAudits(_logger, 1, _delayCreation);
130+
CreateAudits(_logger, 1, _delayCreation);
130131

131-
var result = RetrieveEvents(_memorySink, 1);
132+
var result = RetrieveEvents(_memorySink, 1);
132133

133-
Assert.Single(result);
134-
}
134+
Assert.Single(result);
135+
}
135136

136137
[Fact]
137138
public void WhenAuditTen_ThenQueued()
138139
{
139-
CreateAudits(_logger, 10, _delayCreation);
140+
CreateAudits(_logger, 10, _delayCreation);
140141

141-
var result = RetrieveEvents(_memorySink, 10);
142+
var result = RetrieveEvents(_memorySink, 10);
142143

143-
Assert.Equal(10, result.Count);
144-
}
144+
Assert.Equal(10, result.Count);
145+
}
145146

146147
[Fact]
147148
public void WhenAuditHundred_ThenQueued()
148149
{
149-
CreateAudits(_logger, 100, _delayCreation);
150+
CreateAudits(_logger, 100, _delayCreation);
150151

151-
var result = RetrieveEvents(_memorySink, 100);
152+
var result = RetrieveEvents(_memorySink, 100);
152153

153-
Assert.Equal(100, result.Count);
154-
}
154+
Assert.Equal(100, result.Count);
155+
}
155156

156157
[Fact]
157158
public void WhenAuditFiveHundred_ThenQueued()
158159
{
159-
CreateAudits(_logger, 500, _delayCreation);
160+
CreateAudits(_logger, 500, _delayCreation);
160161

161-
var result = RetrieveEvents(_memorySink, 500);
162+
var result = RetrieveEvents(_memorySink, 500);
162163

163-
Assert.Equal(500, result.Count);
164-
}
164+
Assert.Equal(500, result.Count);
165+
}
165166
}
166167
}

0 commit comments

Comments
 (0)