Update Amazon.Lambda.Logging.AspNetCore to honor Lambda log config set to JSON

This means the log message sent through the ILogger is converted into a parameterized log message allowing RuntimeSupport to create the JSON document

Author: normj

Libraries/src/Amazon.Lambda.Logging.AspNetCore/LambdaILogger.cs

@@ -52,39 +52,63 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 return;
             }
 
-            var components = new List<string>(4);
-            if (_options.IncludeLogLevel)
-            {
-                components.Add($"[{logLevel}]");
-            }
-
-            GetScopeInformation(components);
+            var lambdaLogLevel = ConvertLogLevel(logLevel);
 
-            if (_options.IncludeCategory)
+            if (IsLambdaJsonFormatEnabled && state is IEnumerable<KeyValuePair<string, object>> structure)
             {
-                components.Add($"{_categoryName}:");
+                string messageTemplate = null;
+                var parameters = new List<object>();
+                foreach (var property in structure)
+                {
+                    if (property is { Key: "{OriginalFormat}", Value: string value })
+                    {
+                        messageTemplate = value;
+                    }
+                    else
+                    {
+                        parameters.Add(property.Value);
+                    }
+                }
+
+#pragma warning disable CA2252
+                Amazon.Lambda.Core.LambdaLogger.Log(lambdaLogLevel, exception, messageTemplate, parameters.ToArray());
+#pragma warning restore CA2252
             }
-            if (_options.IncludeEventId)
+            else
             {
-                components.Add($"[{eventId}]:");
-            }
+                var components = new List<string>(4);
+                if (_options.IncludeLogLevel)
+                {
+                    components.Add($"[{logLevel}]");
+                }
 
-            var text = formatter.Invoke(state, exception);
-            components.Add(text);
+                GetScopeInformation(components);
 
-            if (_options.IncludeException)
-            {
-                components.Add($"{exception}");
-            }
-            if (_options.IncludeNewline)
-            {
-                components.Add(Environment.NewLine);
-            }
+                if (_options.IncludeCategory)
+                {
+                    components.Add($"{_categoryName}:");
+                }
+                if (_options.IncludeEventId)
+                {
+                    components.Add($"[{eventId}]:");
+                }
 
-            var finalText = string.Join(" ", components);
+                var text = formatter.Invoke(state, exception);
+                components.Add(text);
 
-            var lambdaLogLevel = ConvertLogLevel(logLevel);
-            Amazon.Lambda.Core.LambdaLogger.Log(lambdaLogLevel, finalText);
+                if (_options.IncludeException)
+                {
+                    components.Add($"{exception}");
+                }
+                if (_options.IncludeNewline)
+                {
+                    components.Add(Environment.NewLine);
+                }
+
+                var finalText = string.Join(" ", components);
+
+                Amazon.Lambda.Core.LambdaLogger.Log(lambdaLogLevel, finalText);
+            }
         }
 
         private static Amazon.Lambda.Core.LogLevel ConvertLogLevel(LogLevel logLevel)
@@ -126,9 +150,17 @@ private void GetScopeInformation(List<string> logMessageComponents)
                     logMessageComponents.Add("=>");
                 }
             }
-        }
-
-        // Private classes	       
+        }
+
+        private bool IsLambdaJsonFormatEnabled
+        {
+            get
+            {
+                return string.Equals(Environment.GetEnvironmentVariable("AWS_LAMBDA_LOG_FORMAT"), "JSON", StringComparison.InvariantCultureIgnoreCase);
+            }
+        }
+
+        // Private classes	       
         private class NoOpDisposable : IDisposable
         {
             public void Dispose()