Merge pull request #302 from KodrAus/feat/trace-support

Support ingesting span events

Author: KodrAus

Build.Docker.ps1

@@ -13,13 +13,16 @@ $archs = @(
     @{ rid = "arm64"; platform = "linux/arm64/v8" }
 )
 
+$endToEndVersion = "preview"
+
 function Execute-Tests
 {
     & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release -f $framework /p:Configuration=Release /p:VersionPrefix=$version
     if ($LASTEXITCODE -ne 0) { exit 1 }
 
     cd ./test/SeqCli.EndToEnd/
-    docker pull datalust/seq:latest
+    docker pull "datalust/seq:$endToEndVersion"
+    docker tag "datalust/seq:$endToEndVersion" datalust/seq:latest
     & dotnet run -f $framework -- --docker-server
     if ($LASTEXITCODE -ne 0)
     { 

src/SeqCli/Cli/Commands/IngestCommand.cs

@@ -87,9 +87,6 @@ protected override async Task<int> Run()
             foreach (var (name, value) in _properties.Properties)
                 enrichers.Add(new ScalarPropertyEnricher(name, value));
 
-            if (_level != null)
-                enrichers.Add(new ScalarPropertyEnricher(SurrogateLevelProperty.PropertyName, _level));
-
             Func<LogEvent, bool>? filter = null;
             if (_filter != null)
             {

src/SeqCli/Cli/Commands/PrintCommand.cs

@@ -75,7 +75,6 @@ var theme
         var outputConfiguration = new LoggerConfiguration()
             .MinimumLevel.Is(LevelAlias.Minimum)
             .Enrich.With<RedundantEventTypeRemovalEnricher>()
-            .Enrich.With<SurrogateLevelRemovalEnricher>()
             .WriteTo.Console(
                 outputTemplate: _template ?? OutputFormatFeature.DefaultOutputTemplate,
                 theme: theme,

src/SeqCli/Cli/Commands/SearchCommand.cs

@@ -108,7 +108,7 @@ LogEvent ToSerilogEvent(EventEntity evt)
             new MessageTemplate(evt.MessageTemplateTokens.Select(ToMessageTemplateToken)),
             evt.Properties
                 .Select(p => CreateProperty(p.Name, p.Value))
-                .Concat(new[] { new LogEventProperty(SurrogateLevelProperty.PropertyName, new ScalarValue(evt.Level)) }));
+        );
     }
 
     static MessageTemplateToken ToMessageTemplateToken(MessageTemplateTokenPart token)

src/SeqCli/Cli/Features/OutputFormatFeature.cs

@@ -77,11 +77,10 @@ public Logger CreateOutputLogger()
 
         if (_json)
         {
-            outputConfiguration.WriteTo.Console(new SurrogateLevelAwareCompactJsonFormatter());
+            outputConfiguration.WriteTo.Console(OutputFormatter.Json);
         }
         else
         {
-            outputConfiguration.Enrich.With<SurrogateLevelRemovalEnricher>();
             outputConfiguration.WriteTo.Console(
                 outputTemplate: DefaultOutputTemplate,
                 theme: Theme,

src/SeqCli/Ingestion/JsonLogEventReader.cs

@@ -70,17 +70,14 @@ public static LogEvent ReadFromJObject(JObject jObject)
 
         if (jObject.TryGetValue("@l", out var levelToken))
         {
+            var originalLevel = levelToken.Value<string>()!;
             jObject.Remove("@l");
 
-            var serilogLevel = LevelMapping.ToSerilogLevel(levelToken.Value<string>()!);
+            var serilogLevel = LevelMapping.ToSerilogLevel(originalLevel);
             if (serilogLevel != LogEventLevel.Information)
                 jObject.Add("@l", new JValue(serilogLevel.ToString()));
-
-            jObject.Add(SurrogateLevelProperty.PropertyName, levelToken);
-        }
-        else
-        {
-            jObject.Add(SurrogateLevelProperty.PropertyName, new JValue("Information"));
+            
+            jObject.Add(LevelMapping.SurrogateLevelProperty, originalLevel);
         }
 
         return LogEventReader.ReadFromJObject(jObject);

src/SeqCli/Ingestion/LogShipper.cs

@@ -21,16 +21,14 @@
 using Newtonsoft.Json;
 using Seq.Api;
 using SeqCli.Api;
-using SeqCli.Levels;
+using SeqCli.Output;
 using Serilog;
 using Serilog.Events;
 
 namespace SeqCli.Ingestion;
 
 static class LogShipper
 {
-    static readonly SurrogateLevelAwareCompactJsonFormatter Formatter = new SurrogateLevelAwareCompactJsonFormatter();
-
     public static async Task<int> ShipEvents(
         SeqConnection connection,
         string? apiKey,
@@ -157,7 +155,7 @@ static async Task<bool> SendBatchAsync(
         using (var builder = new StringWriter())
         {
             foreach (var evt in batch)
-                Formatter.Format(evt, builder);
+                OutputFormatter.Json.Format(evt, builder);
 
             content = new StringContent(builder.ToString(), Encoding.UTF8, ApiConstants.ClefMediaType);
         }

src/SeqCli/Levels/LevelMapping.cs

@@ -20,6 +20,9 @@ namespace SeqCli.Levels;
 
 public static class LevelMapping
 {
+    // Use a "hygienic" name for the original level value to avoid collisions
+    internal static readonly string SurrogateLevelProperty = $"_SeqcliOriginalLevel_{Guid.NewGuid():N}";
+
     static readonly Dictionary<string, (string, LogEventLevel)> LevelsByName =
         new(StringComparer.OrdinalIgnoreCase)
         {