Skip to content

Commit 7f3ad97

Browse files
nblumhardtnblumhardt
authored
Merge pull request #70 from nblumhardt/tidy-up
A quick run over/general tidy-up
2 parents ce036eb + 6b32f84 commit 7f3ad97

File tree

14 files changed

+65
-105
lines changed

14 files changed

+65
-105
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<VersionPrefix>9.0.0</VersionPrefix>
4+
<LangVersion>latest</LangVersion>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
47
</PropertyGroup>
58
</Project>

‎src/Seq.Extensions.Logging/Microsoft/Extensions/Logging/SeqLoggerExtensions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Logging.Configuration;
1010
using Serilog.Sinks.PeriodicBatching;
11+
// ReSharper disable UnusedMember.Global
1112

1213
namespace Microsoft.Extensions.Logging;
1314

@@ -29,7 +30,7 @@ public static ILoggerFactory AddSeq(this ILoggerFactory loggerFactory, IConfigur
2930
if (loggerFactory == null) throw new ArgumentNullException(nameof(loggerFactory));
3031
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
3132

32-
if (TryCreateProvider(configuration, LogLevel.Information, Array.Empty<Action<EnrichingEvent>>(), out var provider))
33+
if (TryCreateProvider(configuration, LogLevel.Information, [], out var provider))
3334
loggerFactory.AddProvider(provider);
3435

3536
return loggerFactory;
@@ -137,16 +138,15 @@ static bool TryCreateProvider(
137138
}
138139

139140
var levelOverrides = new Dictionary<string, LogLevel>();
140-
foreach (var overr in configuration.GetSection("LevelOverride").GetChildren())
141+
foreach (var levelOverride in configuration.GetSection("LevelOverride").GetChildren())
141142
{
142-
LogLevel value;
143-
if (!Enum.TryParse(overr.Value, out value))
143+
if (!Enum.TryParse(levelOverride.Value, out LogLevel value))
144144
{
145-
SelfLog.WriteLine("The level override setting `{0}` for `{1}` is invalid", overr.Value, overr.Key);
145+
SelfLog.WriteLine("The level override setting `{0}` for `{1}` is invalid", levelOverride.Value, levelOverride.Key);
146146
continue;
147147
}
148148

149-
levelOverrides[overr.Key] = value;
149+
levelOverrides[levelOverride.Key] = value;
150150
}
151151

152152
provider = CreateProvider(serverUrl, apiKey, minimumLevel, levelOverrides, enrichers);
@@ -197,7 +197,7 @@ static SerilogLoggerProvider CreateProvider(
197197
var overrides = new Dictionary<string, LoggingLevelSwitch>();
198198
foreach (var levelOverride in levelOverrides)
199199
{
200-
overrides.Add(levelOverride.Key, new LoggingLevelSwitch(levelOverride.Value));
200+
overrides[levelOverride.Key] = new LoggingLevelSwitch(levelOverride.Value);
201201
}
202202

203203
overrideMap = new LevelOverrideMap(overrides, levelSwitch);
@@ -209,7 +209,7 @@ static SerilogLoggerProvider CreateProvider(
209209
Period = TimeSpan.FromSeconds(2),
210210
});
211211

212-
var logger = new Logger(batchingSink, new Enricher(enrichers ?? Array.Empty<Action<EnrichingEvent>>()), batchingSink.Dispose, levelSwitch, overrideMap);
212+
var logger = new Logger(batchingSink, new Enricher(enrichers ?? []), batchingSink.Dispose, levelSwitch, overrideMap);
213213
var provider = new SerilogLoggerProvider(logger);
214214
return provider;
215215
}

‎src/Seq.Extensions.Logging/Seq.Extensions.Logging.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
<PackageIcon>icon.png</PackageIcon>
1414
<PackageProjectUrl>https://github.com/datalust/seq-extensions-logging</PackageProjectUrl>
1515
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16-
<LangVersion>latest</LangVersion>
1716
<RootNamespace />
1817
<PackageReadmeFile>README.md</PackageReadmeFile>
19-
<ImplicitUsings>enable</ImplicitUsings>
20-
<Nullable>enable</Nullable>
2118
</PropertyGroup>
2219

2320
<ItemGroup>

‎src/Seq.Extensions.Logging/Serilog/Parameters/MessageTemplateProcessor.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
using System.Diagnostics.CodeAnalysis;
1615
using Serilog.Core;
1716
using Serilog.Core.Pipeline;
1817
using Serilog.Events;
19-
using Serilog.Parsing;
2018

2119
namespace Serilog.Parameters;
2220

‎test/Seq.Extensions.Logging.Tests/Seq.Extensions.Logging.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<SignAssembly>true</SignAssembly>
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
88
<RootNamespace>Tests</RootNamespace>
9-
<LangVersion>latest</LangVersion>
109
</PropertyGroup>
1110

1211
<ItemGroup>

‎test/Seq.Extensions.Logging.Tests/Seq/Extensions/Logging/EnricherTests.cs‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System;
21
using Serilog.Parameters;
32
using Serilog.Events;
43
using Seq.Extensions.Logging;
4+
using Tests.Support;
55
using Xunit;
66

77
namespace Tests.Seq.Extensions.Logging;
@@ -11,54 +11,38 @@ public class EnricherTests
1111
[Fact]
1212
public void EnrichersAreAppliedInOrder()
1313
{
14-
var evt = new LogEvent(
15-
default,
16-
default,
17-
default,
18-
default,
19-
new(),
20-
default,
21-
default
22-
);
14+
var evt = Some.EmptyLogEvent();
2315

2416
new Enricher([
25-
(evt) => evt.AddPropertyIfAbsent("A", 1),
26-
(evt) => evt.AddPropertyIfAbsent("A", 2),
27-
(evt) => evt.AddOrUpdateProperty("B", 1),
28-
(evt) => evt.AddOrUpdateProperty("B", 2),
17+
enrichingEvent => enrichingEvent.AddPropertyIfAbsent("A", 1),
18+
enrichingEvent => enrichingEvent.AddPropertyIfAbsent("A", 2),
19+
enrichingEvent => enrichingEvent.AddOrUpdateProperty("B", 1),
20+
enrichingEvent => enrichingEvent.AddOrUpdateProperty("B", 2),
2921
])
3022
.Enrich(
3123
evt,
3224
new PropertyValueConverter(int.MaxValue, int.MaxValue)
3325
);
3426

35-
Assert.Equal(1, (evt.Properties["A"] as ScalarValue).Value);
36-
Assert.Equal(2, (evt.Properties["B"] as ScalarValue).Value);
27+
Assert.Equal(1, ((ScalarValue)evt.Properties["A"]).Value);
28+
Assert.Equal(2, ((ScalarValue)evt.Properties["B"]).Value);
3729
}
3830

3931
[Fact]
4032
public void FailingEnricherIsHandled()
4133
{
42-
var evt = new LogEvent(
43-
default,
44-
default,
45-
default,
46-
default,
47-
new(),
48-
default,
49-
default
50-
);
34+
var evt = Some.EmptyLogEvent();
5135

5236
new Enricher([
53-
(evt) => evt.AddOrUpdateProperty("A", 1),
37+
enrichingEvent => enrichingEvent.AddOrUpdateProperty("A", 1),
5438
_ => throw new Exception("Enricher Failed"),
55-
(evt) => evt.AddOrUpdateProperty("A", 2),
39+
enrichingEvent => enrichingEvent.AddOrUpdateProperty("A", 2),
5640
])
5741
.Enrich(
5842
evt,
5943
new PropertyValueConverter(int.MaxValue, int.MaxValue)
6044
);
6145

62-
Assert.Equal(2, (evt.Properties["A"] as ScalarValue).Value);
46+
Assert.Equal(2, ((ScalarValue)evt.Properties["A"]).Value);
6347
}
6448
}

‎test/Seq.Extensions.Logging.Tests/Seq/Extensions/Logging/EnrichingEventTests.cs‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System;
21
using Xunit;
32
using Serilog.Parameters;
43
using Serilog.Events;
54
using Seq.Extensions.Logging;
5+
using Tests.Support;
66

77
namespace Tests.Seq.Extensions.Logging;
88

@@ -12,43 +12,27 @@ public class EnrichingEventTests
1212
public void AddPropertyIfAbsentAddsProperties()
1313
{
1414
var enriching = new EnrichingEvent(
15-
new LogEvent(
16-
default,
17-
default,
18-
default,
19-
default,
20-
new(),
21-
default,
22-
default
23-
),
15+
Some.EmptyLogEvent(),
2416
new PropertyValueConverter(int.MaxValue, int.MaxValue)
2517
);
2618

2719
enriching.AddPropertyIfAbsent("A", false);
2820
enriching.AddPropertyIfAbsent("A", true);
2921

30-
Assert.Equal(false, (enriching.LogEvent.Properties["A"] as ScalarValue).Value);
22+
Assert.Equal(false, ((ScalarValue)enriching.LogEvent.Properties["A"]).Value);
3123
}
3224

3325
[Fact]
3426
public void AddOrUpdatePropertyAddsProperties()
3527
{
3628
var enriching = new EnrichingEvent(
37-
new LogEvent(
38-
default,
39-
default,
40-
default,
41-
default,
42-
new(),
43-
default,
44-
default
45-
),
29+
Some.EmptyLogEvent(),
4630
new PropertyValueConverter(int.MaxValue, int.MaxValue)
4731
);
4832

4933
enriching.AddOrUpdateProperty("A", false);
5034
enriching.AddOrUpdateProperty("A", true);
5135

52-
Assert.Equal(true, (enriching.LogEvent.Properties["A"] as ScalarValue).Value);
36+
Assert.Equal(true, ((ScalarValue)enriching.LogEvent.Properties["A"]).Value);
5337
}
5438
}

‎test/Seq.Extensions.Logging.Tests/Seq/Extensions/Logging/ExceptionDataEnricherTests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using Seq.Extensions.Logging;
22
using Serilog.Events;
3-
using System;
4-
using System.Linq;
53
using Tests.Support;
64
using Xunit;
75

@@ -25,7 +23,7 @@ public void WhenNoDataIsPresentNoPropertyIsAdded()
2523
public void WhenDataIsPresentThePropertyIsAdded()
2624
{
2725
var enricher = new ExceptionDataEnricher();
28-
var exception = new Exception()
26+
var exception = new Exception
2927
{
3028
Data =
3129
{

‎test/Seq.Extensions.Logging.Tests/Serilog/Extensions/Logging/SerilogLoggerTests.cs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System;
54
using System.Collections;
65
using Serilog.Events;
76
using Microsoft.Extensions.Logging;
8-
using System.Collections.Generic;
97
using System.Diagnostics;
10-
using System.IO;
11-
using System.Linq;
128
using Xunit;
139
using Serilog.Extensions.Logging;
1410
using Seq.Extensions.Logging;
@@ -34,7 +30,7 @@ static SerilogLoggerTests()
3430
{
3531
var sink = new SerilogSink();
3632

37-
var l = new global::Serilog.Core.Logger(sink, new Enricher(enrichers), null, new global::Serilog.Core.LoggingLevelSwitch(logLevel), null);
33+
var l = new global::Serilog.Core.Logger(sink, new Enricher(enrichers), null, new global::Serilog.Core.LoggingLevelSwitch(logLevel));
3834

3935
var provider = new SerilogLoggerProvider(l);
4036
provider.SetScopeProvider(new LoggerExternalScopeProvider());
@@ -138,9 +134,9 @@ public void LogsCorrectMessage()
138134
{
139135
var (logger, sink) = SetUp(LogLevel.Trace);
140136

141-
logger.Log<object>(LogLevel.Information, 0, null, null, null!);
137+
logger.Log<object?>(LogLevel.Information, 0, null, null, null!);
142138
logger.Log(LogLevel.Information, 0, TestMessage, null, null!);
143-
logger.Log<object>(LogLevel.Information, 0, null, null, (_, _) => TestMessage);
139+
logger.Log<object?>(LogLevel.Information, 0, null, null, (_, _) => TestMessage);
144140

145141
Assert.Equal(3, sink.Writes.Count);
146142

@@ -270,7 +266,7 @@ public void OverridesStateEventIdIfSpecified()
270266

271267
const int expected = 3;
272268

273-
logger.Log<KeyValuePair<string, object>[]>(LogLevel.Information, expected, state: [new("EventId", "Something")], exception: null, formatter: (s, e) => "");
269+
logger.Log<KeyValuePair<string, object>[]>(LogLevel.Information, expected, state: [new("EventId", "Something")], exception: null, formatter: (_, _) => "");
274270

275271
Assert.Single(sink.Writes);
276272

@@ -397,14 +393,14 @@ public void EnrichersAreApplied()
397393
{
398394
var (logger, sink) = SetUp(
399395
LogLevel.Trace,
400-
(evt) => evt.AddPropertyIfAbsent("EnrichedScalar", true),
401-
(evt) => evt.AddPropertyIfAbsent("EnrichedObject", new { a = 1 }, true)
396+
evt => evt.AddPropertyIfAbsent("EnrichedScalar", true),
397+
evt => evt.AddPropertyIfAbsent("EnrichedObject", new { a = 1 }, true)
402398
);
403399

404400
logger.Log(LogLevel.Information, 0, TestMessage, null, null!);
405401

406-
Assert.Equal(true, (sink.Writes[0].Properties["EnrichedScalar"] as ScalarValue).Value);
407-
Assert.Equal(1, ((sink.Writes[0].Properties["EnrichedObject"] as StructureValue).Properties[0].Value as ScalarValue).Value);
402+
Assert.Equal(true, ((ScalarValue)sink.Writes[0].Properties["EnrichedScalar"]).Value);
403+
Assert.Equal(1, ((ScalarValue)((StructureValue)sink.Writes[0].Properties["EnrichedObject"]).Properties[0].Value).Value);
408404
}
409405

410406
class FoodScope : IEnumerable<KeyValuePair<string, object>>
@@ -450,8 +446,8 @@ IEnumerator IEnumerable.GetEnumerator()
450446
class Person
451447
{
452448
// ReSharper disable once UnusedAutoPropertyAccessor.Local
453-
public string FirstName { get; set; }
449+
public string? FirstName { get; set; }
454450
// ReSharper disable once UnusedAutoPropertyAccessor.Local
455-
public string LastName { get; set; }
451+
public string? LastName { get; set; }
456452
}
457453
}

‎test/Seq.Extensions.Logging.Tests/Serilog/Extensions/Logging/Support/SerilogSink.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.Collections.Generic;
54
using Serilog.Core;
65
using Serilog.Events;
76
using Xunit;

0 commit comments

Comments
 (0)