Map AWS Lambda LogLevel to Microsoft LogLevel

Author: hjgraca

libraries/src/AWS.Lambda.Powertools.Common/Core/PowertoolsConfigurations.cs

@@ -149,6 +149,7 @@ public bool GetEnvironmentVariableOrDefault(string variable, bool defaultValue)
 
     /// <summary>
     ///     Gets the log level.
+    ///     Dont' use this method directly use GetLogLevel extension method instead
     /// </summary>
     /// <value>The log level.</value>
     public string LogLevel =>

libraries/src/AWS.Lambda.Powertools.Logging/Internal/PowertoolsConfigurations.cs

@@ -14,6 +14,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using AWS.Lambda.Powertools.Common;
 using Microsoft.Extensions.Logging;
 
@@ -36,7 +37,12 @@ internal static LogLevel GetLogLevel(this IPowertoolsConfigurations powertoolsCo
         if (logLevel.HasValue)
             return logLevel.Value;
 
-        if (Enum.TryParse((powertoolsConfigurations.LogLevel ?? "").Trim(), true, out LogLevel result))
+        var logFromEnv = (powertoolsConfigurations.LogLevel ?? "").Trim();
+
+        if (AwsLogLevelMapper.TryGetValue(logFromEnv.ToUpper(), out var awsLogLevel))
+            logFromEnv = awsLogLevel;
+        
+        if (Enum.TryParse(logFromEnv, true, out LogLevel result))
             return result;
 
         return LoggingConstants.DefaultLogLevel;
@@ -53,4 +59,14 @@ internal static LoggerOutputCase GetLoggerOutputCase(this IPowertoolsConfigurati
 
         return LoggingConstants.DefaultLoggerOutputCase;
     }
+
+    private static Dictionary<string, string> AwsLogLevelMapper = new()
+    {
+        { "TRACE", "TRACE" },
+        { "DEBUG", "DEBUG" },
+        { "INFO", "INFORMATION" },
+        { "WARN", "WARNING" },
+        { "ERROR", "ERROR" },
+        { "FATAL", "CRITICAL" }
+    };
 }

libraries/tests/AWS.Lambda.Powertools.Logging.Tests/PowertoolsLoggerTest.cs

@@ -1306,16 +1306,16 @@ public void Log_Should_Serialize_TimeOnly()
         }
 
         [Theory]
-        [InlineData(true, LogLevel.Warning)]
-        [InlineData(false, LogLevel.Critical)]
-        public void Log_Should_Use_Lambda_Log_Level_When_Enabled(bool willLog, LogLevel logLevel)
+        [InlineData(true, "WARN", LogLevel.Warning)]
+        [InlineData(false, "Fatal", LogLevel.Critical)]
+        public void Log_Should_Use_Lambda_Log_Level_When_Enabled(bool willLog, string awsLogLevel, LogLevel logLevel)
         {
             // Arrange
             var loggerName = Guid.NewGuid().ToString();
 
             var environment = Substitute.For<IPowertoolsEnvironment>();
             environment.GetEnvironmentVariable("POWERTOOLS_LOG_LEVEL").Returns("Error");
-            environment.GetEnvironmentVariable("AWS_LAMBDA_LOG_LEVEL").Returns(logLevel.ToString());
+            environment.GetEnvironmentVariable("AWS_LAMBDA_LOG_LEVEL").Returns(awsLogLevel);
 
             var systemWrapper = new SystemWrapperMock(environment);
             var configuration = new PowertoolsConfigurations(systemWrapper);
@@ -1333,12 +1333,38 @@ public void Log_Should_Use_Lambda_Log_Level_When_Enabled(bool willLog, LogLevel
                 Time = new TimeOnly(12, 0, 0)
             };
 
+            // Act
             logger.LogWarning(message);
 
+            // Assert
             Assert.True(logger.IsEnabled(logLevel));
-            Assert.Equal(logLevel.ToString(), configuration.LogLevel);
+            Assert.Equal(logLevel, configuration.GetLogLevel());
             Assert.Equal(willLog, systemWrapper.LogMethodCalled);
         }
+        
+        [Theory]
+        [InlineData("TRACE", LogLevel.Trace)]
+        [InlineData("debug", LogLevel.Debug)]
+        [InlineData("Info", LogLevel.Information)]
+        [InlineData("WARN", LogLevel.Warning)]
+        [InlineData("ERROR", LogLevel.Error)]
+        [InlineData("Fatal", LogLevel.Critical)]
+        [InlineData("DoesNotExist", LogLevel.Information)]
+        public void Should_Map_AWS_Log_Level_And_Default_To_Information(string awsLogLevel, LogLevel logLevel)
+        {
+            // Arrange
+            var environment = Substitute.For<IPowertoolsEnvironment>();
+            environment.GetEnvironmentVariable("AWS_LAMBDA_LOG_LEVEL").Returns(awsLogLevel);
+
+            var systemWrapper = new SystemWrapperMock(environment);
+            var configuration = new PowertoolsConfigurations(systemWrapper);
+
+            // Act
+            var logLvl = configuration.GetLogLevel();
+            
+            // Assert
+            Assert.Equal(logLevel, logLvl);
+        }
 
         [Theory]
         [InlineData(true, LogLevel.Warning)]
@@ -1366,6 +1392,7 @@ public void Log_Should_Use_Powertools_Log_Level_When_Lambda_Log_Level_Unavailabl
                 Time = new TimeOnly(12, 0, 0)
             };
 
+            // Act
             logger.LogWarning(message);
 
             // Assert