Adding support for scopes

SumoLogic.Logging.AspNetCore/Logger.cs

@@ -60,7 +60,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 return;
             }
             var line = $"{formatter(state, exception)}";
-            provider.WriteLine(line, categoryName);
+            provider.WriteLine(line, categoryName, logLevel);
         }
     }
 }

SumoLogic.Logging.AspNetCore/LoggerOptions.cs

@@ -112,5 +112,19 @@ public string Uri
         /// </summary>
         public ILogger DebuggingLogger { get; set; }
 
+        /// <summary>
+        /// Gets or sets a flag to indicate whether to include scopes from <c>System.Extensions.Logging.IExternalScopeProvider</c>.
+        /// </summary>
+        public bool IncludeScopes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the separator to use when appending multiple scope values to a log message.
+        /// </summary>
+        public string ScopeSeparator { get; set; } = " => ";
+
+        /// <summary>
+        /// Gets or sets a flag to indicate whether to include the category provided to the log request.
+        /// </summary>
+        public bool IncludeCategory { get; set; }
     }
 }

SumoLogic.Logging.AspNetCore/LoggerProvider.cs

@@ -29,6 +29,7 @@
 using SumoLogic.Logging.Common.Queue;
 using SumoLogic.Logging.Common.Sender;
 using System;
+using System.Text;
 using System.Threading;
 
 namespace SumoLogic.Logging.AspNetCore
@@ -37,7 +38,7 @@ namespace SumoLogic.Logging.AspNetCore
     /// Sumo Logic Logger Provider implementation
     /// </summary>
     [ProviderAlias("SumoLogic")]
-    public class LoggerProvider : ILoggerProvider
+    public class LoggerProvider : ILoggerProvider, ISupportExternalScope
     {
         public LoggerOptions LoggerOptions { get; private set; }
 
@@ -50,6 +51,12 @@ public class LoggerProvider : ILoggerProvider
         private SumoLogicMessageSenderBufferFlushingTask flushBufferTask = null;
 
         private volatile BufferWithEviction<string> messagesQueue = null;
+        private bool includeScopes;
+        private bool includeCategory;
+        private string scopeSeparator;
+        private IExternalScopeProvider scopeProvider;
+
+        private IExternalScopeProvider ScopeProvider => includeScopes ? scopeProvider : null;
 
         public LoggerProvider(IOptionsMonitor<LoggerOptions> options)
         {
@@ -90,7 +97,7 @@ public void Dispose()
         /// </summary>
         /// <param name="message">the message line to be sent</param>
         /// <param name="categoryName">not used for now</param>
-        public void WriteLine(String message, String categoryName)
+        public void WriteLine(string message, string categoryName, LogLevel logLevel)
         {
             if (null == message)
             {
@@ -103,17 +110,40 @@ public void WriteLine(String message, String categoryName)
                 return;
             }
 
-            String line = string.Concat(
-                message.TrimEnd(Environment.NewLine.ToCharArray()),
-                Environment.NewLine);
+            var builder = new StringBuilder();
+            if (includeCategory)
+            {
+                builder.Append(" [");
+                builder.Append(logLevel.ToString());
+                builder.Append("] ");
+                builder.Append(categoryName);
+            }
+
+            var scopeProvider = ScopeProvider;
+            if (scopeProvider != null)
+            {
+                scopeProvider.ForEachScope((scope, stringBuilder) =>
+                {
+                    stringBuilder.Append(this.scopeSeparator).Append(scope);
+                }, builder);
+
+                builder.Append(this.scopeSeparator);
+            }
+            else if (includeCategory)
+            {
+                builder.Append(this.scopeSeparator);
+            }
+
+
+            builder.AppendLine(message.Trim());
 
             if (LoggerOptions.IsBuffered)
             {
-                messagesQueue.Add(line);
+                messagesQueue.Add(builder.ToString());
             }
             else
             {
-                WriteLineToSumo(line);
+                WriteLineToSumo(builder.ToString());
             }
         }
 
@@ -130,6 +160,9 @@ private void ReConfig(LoggerOptions options)
             {
                 InitBuffer(options);
             }
+            includeScopes = options.IncludeScopes;
+            includeCategory = options.IncludeCategory;
+            scopeSeparator = options.ScopeSeparator;
             LoggerOptions = options;
         }
 
@@ -167,7 +200,7 @@ private void InitBuffer(LoggerOptions options)
             flushBufferTimer = new Timer(
                 callback: _ => flushBufferTask.Run(), // No task await to avoid unhandled exception
                 state: null,
-                dueTime: TimeSpan.FromMilliseconds(0),
+                dueTime: TimeSpan.FromMilliseconds(0),
                 period: options.FlushingAccuracy);
 
             DebuggingLogger?.Debug("InitBuffer::Completed");
@@ -184,5 +217,9 @@ private void WriteLineToSumo(String body)
                 .GetResult();
         }
 
+        void ISupportExternalScope.SetScopeProvider(IExternalScopeProvider scopeProvider)
+        {
+            this.scopeProvider = scopeProvider;
+        }
     }
 }