work on trace ingestion in seqcli

KodrAus · KodrAus · commit 3208e66f08ac · 2023-12-20T08:43:06.000+10:00
diff --git a/src/SeqCli/Cli/Commands/IngestCommand.cs b/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)
             {
diff --git a/src/SeqCli/Cli/Commands/PrintCommand.cs b/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,
diff --git a/src/SeqCli/Cli/Commands/SearchCommand.cs b/src/SeqCli/Cli/Commands/SearchCommand.cs
@@ -110,7 +110,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)
diff --git a/src/SeqCli/Cli/Features/OutputFormatFeature.cs b/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,
diff --git a/src/SeqCli/Ingestion/JsonLogEventReader.cs b/src/SeqCli/Ingestion/JsonLogEventReader.cs
@@ -75,12 +75,6 @@ public static LogEvent ReadFromJObject(JObject jObject)
             var serilogLevel = LevelMapping.ToSerilogLevel(levelToken.Value<string>()!);
             if (serilogLevel != LogEventLevel.Information)
                 jObject.Add("@l", new JValue(serilogLevel.ToString()));
-
-            jObject.Add(SurrogateLevelProperty.PropertyName, levelToken);
-        }
-        else
-        {
-            jObject.Add(SurrogateLevelProperty.PropertyName, new JValue("Information"));
         }
 
         return LogEventReader.ReadFromJObject(jObject);
diff --git a/src/SeqCli/Ingestion/LogShipper.cs b/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);
         }
diff --git a/src/SeqCli/Levels/SurrogateLevelAwareCompactJsonFormatter.cs b/src/SeqCli/Levels/SurrogateLevelAwareCompactJsonFormatter.cs
diff --git a/src/SeqCli/Levels/SurrogateLevelProperty.cs b/src/SeqCli/Levels/SurrogateLevelProperty.cs
diff --git a/src/SeqCli/Output/OutputFormatter.cs b/src/SeqCli/Output/OutputFormatter.cs
@@ -0,0 +1,11 @@
+using Serilog.Formatting;
+using Serilog.Templates;
+
+namespace SeqCli.Output;
+
+static class OutputFormatter
+{
+    internal static readonly ITextFormatter Json = new ExpressionTemplate(
+        "{ {@t, @mt, @l: if @l = 'Information' then undefined() else @l, @x, @sp, @tr, @ps, @st, ..rest()} }\n"
+    );
+}
diff --git a/src/SeqCli/Output/SurrogateLevelRemovalEnricher.cs b/src/SeqCli/Output/SurrogateLevelRemovalEnricher.cs
diff --git a/src/SeqCli/PlainText/LogEvents/LogEventBuilder.cs b/src/SeqCli/PlainText/LogEvents/LogEventBuilder.cs
@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using SeqCli.Levels;
@@ -31,7 +32,9 @@ public static LogEvent FromProperties(IDictionary<string, object?> properties, s
         var timestamp = GetTimestamp(properties);
         var level = GetLevel(properties);          
         var exception = TryGetException(properties);          
-        var messageTemplate = GetMessageTemplate(properties);          
+        var messageTemplate = GetMessageTemplate(properties);
+        var traceId = GetTraceId(properties);
+        var spanId = GetSpanId(properties);
         var props = GetLogEventProperties(properties, remainder, level);
 
         var fallbackMappedLevel = level != null ? LevelMapping.ToSerilogLevel(level) : LogEventLevel.Information;
@@ -41,7 +44,10 @@ public static LogEvent FromProperties(IDictionary<string, object?> properties, s
             fallbackMappedLevel,
             exception,
             messageTemplate,
-            props);
+            props,
+            traceId ?? default,
+            spanId ?? default
+        );
     }
         
     static readonly MessageTemplate NoMessage = new MessageTemplateParser().Parse("");
@@ -67,6 +73,24 @@ static MessageTemplate GetMessageTemplate(IDictionary<string, object?> propertie
         return null;
     }
 
+    static ActivityTraceId? GetTraceId(IDictionary<string, object?> properties)
+    {
+        if (properties.TryGetValue(ReifiedProperties.TraceId, out var tr) && 
+            tr is TextSpan ts)
+            return ActivityTraceId.CreateFromString(ts.ToStringValue());
+
+        return null;
+    }
+    
+    static ActivitySpanId? GetSpanId(IDictionary<string, object?> properties)
+    {
+        if (properties.TryGetValue(ReifiedProperties.SpanId, out var sp) && 
+            sp is TextSpan ts)
+            return ActivitySpanId.CreateFromString(ts.ToStringValue());
+
+        return null;
+    }
+
     static Exception? TryGetException(IDictionary<string, object?> properties)
     {
         if (properties.TryGetValue(ReifiedProperties.Exception, out var x) &&
@@ -79,7 +103,6 @@ static IEnumerable<LogEventProperty> GetLogEventProperties(IDictionary<string, o
     {
         var payload = properties
             .Where(p => !ReifiedProperties.IsReifiedProperty(p.Key))
-            .Concat(new[] { KeyValuePair.Create(SurrogateLevelProperty.PropertyName, (object?)level) })
             .Select(p => LogEventPropertyFactory.SafeCreate(p.Key, new ScalarValue(p.Value)));
 
         if (remainder != null)
diff --git a/src/SeqCli/PlainText/ReifiedProperties.cs b/src/SeqCli/PlainText/ReifiedProperties.cs
@@ -8,11 +8,14 @@ public const string
         Message = "@m",
         Timestamp = "@t",
         Level = "@l",
-        Exception = "@x";
+        Exception = "@x",
+        StartTimestamp = "@st",
+        SpanId = "@sp",
+        TraceId = "@tr";
         
     static readonly HashSet<string> All = new()
     {
-        Message, Timestamp, Level, Exception
+        Message, Timestamp, Level, Exception, StartTimestamp, SpanId, TraceId
     };
 
     public static bool IsReifiedProperty(string name)
diff --git a/src/SeqCli/Syntax/SeqSyntax.cs b/src/SeqCli/Syntax/SeqSyntax.cs
@@ -10,7 +10,6 @@ public static CompiledExpression CompileExpression(string expression)
         // Support non-Serilog level names (`@l` can't be overridden by the name resolver). At a later date,
         // we'll use the Seq.Syntax package to do this reliably (at the moment, all occurrences
         // of @l, whether referring to the property or not, will be replaced).
-        var expr = expression.Replace("@l", "@Level").Replace("@Level", $"coalesce(@p['{SurrogateLevelProperty.PropertyName}'],@l)");
-        return SerilogExpression.Compile(expr, nameResolver: new SeqBuiltInNameResolver());
+        return SerilogExpression.Compile(expression, nameResolver: new SeqBuiltInNameResolver());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,6 @@ protected override async Task<int> Run()`
`87`	`87`	`foreach (var (name, value) in _properties.Properties)`
`88`	`88`	`enrichers.Add(new ScalarPropertyEnricher(name, value));`
`89`	`89`
`90`		`- if (_level != null)`
`91`		`- enrichers.Add(new ScalarPropertyEnricher(SurrogateLevelProperty.PropertyName, _level));`
`92`		`-`
`93`	`90`	`Func<LogEvent, bool>? filter = null;`
`94`	`91`	`if (_filter != null)`
`95`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ LogEvent ToSerilogEvent(EventEntity evt)`
`110`	`110`	`new MessageTemplate(evt.MessageTemplateTokens.Select(ToMessageTemplateToken)),`
`111`	`111`	`evt.Properties`
`112`	`112`	`.Select(p => CreateProperty(p.Name, p.Value))`
`113`		`- .Concat(new[] { new LogEventProperty(SurrogateLevelProperty.PropertyName, new ScalarValue(evt.Level)) }));`
	`113`	`+ );`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`static MessageTemplateToken ToMessageTemplateToken(MessageTemplateTokenPart token)`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,10 @@ public Logger CreateOutputLogger()`
`77`	`77`
`78`	`78`	`if (_json)`
`79`	`79`	`{`
`80`		`- outputConfiguration.WriteTo.Console(new SurrogateLevelAwareCompactJsonFormatter());`
	`80`	`+ outputConfiguration.WriteTo.Console(OutputFormatter.Json);`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`84`		`- outputConfiguration.Enrich.With<SurrogateLevelRemovalEnricher>();`
`85`	`84`	`outputConfiguration.WriteTo.Console(`
`86`	`85`	`outputTemplate: DefaultOutputTemplate,`
`87`	`86`	`theme: Theme,`