Skip to content

Commit da9e085

Browse files
committed
fix up unused level property
1 parent 6e9d4e0 commit da9e085

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

src/SeqCli/Cli/Commands/IngestCommand.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ protected override async Task<int> Run()
8484
try
8585
{
8686
var enrichers = new List<ILogEventEnricher>();
87+
88+
if (_level != null)
89+
enrichers.Add(new ScalarPropertyEnricher(LevelMapping.SurrogateLevelProperty, _level));
90+
8791
foreach (var (name, value) in _properties.Properties)
8892
enrichers.Add(new ScalarPropertyEnricher(name, value));
8993

src/SeqCli/PlainText/LogEvents/LogEventBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static LogEvent FromProperties(IDictionary<string, object?> properties, s
3535
var messageTemplate = GetMessageTemplate(properties);
3636
var traceId = GetTraceId(properties);
3737
var spanId = GetSpanId(properties);
38-
var props = GetLogEventProperties(properties, remainder, level);
38+
var props = GetLogEventProperties(properties, remainder);
3939

4040
var fallbackMappedLevel = level != null ? LevelMapping.ToSerilogLevel(level) : LogEventLevel.Information;
4141
properties[LevelMapping.SurrogateLevelProperty] = level;
@@ -100,7 +100,7 @@ static MessageTemplate GetMessageTemplate(IDictionary<string, object?> propertie
100100
return null;
101101
}
102102

103-
static IEnumerable<LogEventProperty> GetLogEventProperties(IDictionary<string, object?> properties, string? remainder, string? level)
103+
static IEnumerable<LogEventProperty> GetLogEventProperties(IDictionary<string, object?> properties, string? remainder)
104104
{
105105
var payload = properties
106106
.Where(p => !ReifiedProperties.IsReifiedProperty(p.Key))
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System.IO;
2+
using System.Linq;
3+
using System.Threading.Tasks;
4+
using Seq.Api;
5+
using SeqCli.EndToEnd.Support;
6+
using Serilog;
7+
using Xunit;
8+
9+
namespace SeqCli.EndToEnd.Ingest;
10+
11+
public class OverrideLevelIngestionTestCase : ICliTestCase
12+
{
13+
public async Task ExecuteAsync(
14+
SeqConnection connection,
15+
ILogger logger,
16+
CliCommandRunner runner)
17+
{
18+
var inputFiles = Path.Combine("Data", "log-*.txt");
19+
20+
var exit = runner.Exec("ingest", $"-i {inputFiles} -l OK");
21+
Assert.Equal(0, exit);
22+
23+
var events = await connection.Events.ListAsync();
24+
Assert.Equal(4, events.Count(e => e.Level == "OK"));
25+
}
26+
}

0 commit comments

Comments
 (0)