Trace context

jsnlog/LogHandling/LogRequest.cs

@@ -11,9 +11,12 @@ internal class LogRequest : LogRequestBase, ILogRequest
         public DateTime UtcDate { get; private set; }
         public string EntryId { get; private set; }
         public string JsonMessage { get; private set; }
+
+        public LogTraceContext TraceContext { get; }
 
         public LogRequest(string message, string logger, string level,
-            DateTime utcDate, string entryId, string jsonMessage, LogRequestBase logRequestBase)
+            DateTime utcDate, string entryId, string jsonMessage, LogRequestBase logRequestBase,
+            LogTraceContext traceContext)
             : base(logRequestBase)
         {
             Message = message;
@@ -22,6 +25,7 @@ public LogRequest(string message, string logger, string level,
             UtcDate = utcDate;
             EntryId = entryId;
             JsonMessage = jsonMessage;
+            TraceContext = traceContext;
         }
 
         public override string ToString()

jsnlog/LogHandling/LoggerProcessor.cs

@@ -10,21 +10,34 @@ namespace JSNLog.LogHandling
     internal class LoggerProcessor
     {
         /// <summary>
-        /// The log data sent in a single log request from the client.
-        /// It is expected that this list has 2 items:
-        /// * the requestId (key: r)
-        /// * the array with log items (key: lg)
+        /// Individual log item
         /// </summary>
-
         private class LogRequestSingleMsg
         {
             public string m {get;set;}
             public string n {get;set;}
+            public LogRequestSingleTraceContext c { get; set; }
             public string l {get;set;}
             public string t {get;set;}
             public string u { get; set; }
         }
 
+        /// <summary>
+        /// W3C Trace Context (distributed trace-id, span-id, and parent span-id)
+        /// </summary>
+        private class LogRequestSingleTraceContext
+        {
+            public string d {get;set;}
+            public string p {get;set;}
+            public string s {get;set;}
+        }
+
+        /// <summary>
+        /// The log data sent in a single log request from the client.
+        /// It is expected that this list has 2 items:
+        /// * the requestId (key: r)
+        /// * the array with log items (key: lg)
+        /// </summary>
         private class LogRequestData
         {
             public string r {get;set;}
@@ -198,6 +211,12 @@ private static FinalLogData ProcessLogItem(LogRequestSingleMsg logItem, LogReque
             {
             }
 
+            LogTraceContext logTraceContext = null;
+            if (logItem.c != null)
+            {
+                logTraceContext = new LogTraceContext(logItem.c.d, logItem.c.s, logItem.c.p);
+            }
+
             // ----------------
 
             string jsonmessage = "";
@@ -208,7 +227,7 @@ private static FinalLogData ProcessLogItem(LogRequestSingleMsg logItem, LogReque
 
             // ----------------
 
-            var logRequest = new LogRequest(message, logger, level, utcDate, entryId, jsonmessage, logRequestBase);
+            var logRequest = new LogRequest(message, logger, level, utcDate, entryId, jsonmessage, logRequestBase, logTraceContext);
             var loggingEventArgs = new LoggingEventArgs(logRequest) 
             {
                 Cancel = false,

jsnlog/PublicFacing/AspNet5/Configuration/LoggingAdapter.cs

@@ -25,14 +25,42 @@ public void Log(FinalLogData finalLogData)
 
             Object message = LogMessageHelpers.DeserializeIfPossible(finalLogData.FinalMessage);
 
-            switch (finalLogData.FinalLevel)
+            IDisposable scope = null;
+            try
             {
-                case Level.TRACE: logger.LogTrace("{logMessage}", message); break;
-                case Level.DEBUG: logger.LogDebug("{logMessage}", message); break;
-                case Level.INFO: logger.LogInformation("{logMessage}", message); break;
-                case Level.WARN: logger.LogWarning("{logMessage}", message); break;
-                case Level.ERROR: logger.LogError("{logMessage}", message); break;
-                case Level.FATAL: logger.LogCritical("{logMessage}", message); break;
+                if (finalLogData.LogRequest.TraceContext != null)
+                {
+                    scope = logger.BeginScope("Client TraceContext: TraceId={TraceId},SpanId={SpanId},ParentId={ParentId}",
+                        finalLogData.LogRequest.TraceContext.TraceId,
+                        finalLogData.LogRequest.TraceContext.SpanId,
+                        finalLogData.LogRequest.TraceContext.ParentId ?? "0000000000000000");
+                }
+
+                switch (finalLogData.FinalLevel)
+                {
+                    case Level.TRACE:
+                        logger.LogTrace("{logMessage}", message);
+                        break;
+                    case Level.DEBUG:
+                        logger.LogDebug("{logMessage}", message);
+                        break;
+                    case Level.INFO:
+                        logger.LogInformation("{logMessage}", message);
+                        break;
+                    case Level.WARN:
+                        logger.LogWarning("{logMessage}", message);
+                        break;
+                    case Level.ERROR:
+                        logger.LogError("{logMessage}", message);
+                        break;
+                    case Level.FATAL:
+                        logger.LogCritical("{logMessage}", message);
+                        break;
+                }
+            }
+            finally
+            {
+                scope?.Dispose();
             }
         }
     }

jsnlog/PublicFacing/Configuration/ILogRequest.cs

@@ -16,6 +16,8 @@ public interface ILogRequest
         string RequestId { get; }
         string Url { get; }
 
+        LogTraceContext TraceContext { get; }
+
         Dictionary<string, string> QueryParameters { get; }
         Dictionary<string, string> Cookies { get; }
         Dictionary<string, string> Headers { get; }

jsnlog/PublicFacing/Configuration/LogTraceContext.cs

@@ -0,0 +1,18 @@
+using System.Diagnostics;
+
+namespace JSNLog
+{
+    public class LogTraceContext
+    {
+        public LogTraceContext(string traceId, string spanId, string parentId)
+        {
+            TraceId = traceId;
+            SpanId = spanId;
+            ParentId = parentId;
+        }
+
+        public string ParentId { get; }
+        public string SpanId {get;}
+        public string TraceId {get;}
+    }
+}