Merge branch 'main' into FixPublishing

Author: Vicenç García Altés

build/dependencies.props

@@ -5,6 +5,6 @@
   </PropertyGroup>  
 
   <PropertyGroup Label="MiddyNet Versions">
-    <middynet>1.1.2$(VersionSuffix)</middynet>
+    <middynet>1.2.0$(VersionSuffix)</middynet>
   </PropertyGroup>
 </Project>

src/Voxel.MiddyNet/MiddyLogger.cs

@@ -9,16 +9,20 @@ namespace Voxel.MiddyNet
     public class MiddyLogger : IMiddyLogger
     {
         private readonly ILambdaLogger lambdaLogger;
+        private readonly ILambdaContext lambdaContext;
 
         private List<LogProperty> globalProperties = new List<LogProperty>();
 
-        public MiddyLogger(ILambdaLogger lambdaLogger)
+        public MiddyLogger(ILambdaLogger lambdaLogger, ILambdaContext lambdaContext)
         {
             this.lambdaLogger = lambdaLogger;
+            this.lambdaContext = lambdaContext;
         }
 
         public void Log(LogLevel logLevel, string message)
         {
+            AddLambdaContextProperties();
+
             var logMessage = new LogMessage
             {
                 Level = logLevel,
@@ -31,6 +35,8 @@ public void Log(LogLevel logLevel, string message)
 
         public void Log(LogLevel logLevel, string message, params LogProperty[] properties)
         {
+            AddLambdaContextProperties();
+
             var logMessage = new LogMessage
             {
                 Level = logLevel,
@@ -41,6 +47,11 @@ public void Log(LogLevel logLevel, string message, params LogProperty[] properti
             InternalLog(logMessage);
         }
 
+        public void EnrichWith(LogProperty logProperty)
+        {
+            globalProperties.Add(logProperty);
+        }
+
         private void InternalLog(LogMessage logMessage)
         {
             var options = new JsonSerializerOptions
@@ -56,9 +67,12 @@ private void InternalLog(LogMessage logMessage)
             lambdaLogger.Log(jsonString);
         }
 
-        public void EnrichWith(LogProperty logProperty)
+        private void AddLambdaContextProperties()
         {
-            globalProperties.Add(logProperty);
+            globalProperties.Add(new LogProperty("AwsRequestId", lambdaContext.AwsRequestId));
+            globalProperties.Add(new LogProperty("FunctionName", lambdaContext.FunctionName));
+            globalProperties.Add(new LogProperty("FunctionVersion", lambdaContext.FunctionVersion));
+            globalProperties.Add(new LogProperty("MemoryLimitInMB", lambdaContext.MemoryLimitInMB));
         }
     }
 

src/Voxel.MiddyNet/MiddyNetContext.cs

@@ -21,7 +21,7 @@ public MiddyNetContext(ILambdaContext context)
             AdditionalContext = new Dictionary<string, object>();
             MiddlewareBeforeExceptions = new List<Exception>();
             MiddlewareAfterExceptions = new List<Exception>();
-            LoggerFactory = logger => new MiddyLogger(logger);
+            LoggerFactory = logger => new MiddyLogger(logger, context);
             AttachToLambdaContext(context);
         }
 

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.LogEnrichWithExtraProperties.approved.txt

@@ -1,5 +1,9 @@
 {
   "Message": "hello world",
   "Level": "Info",
-  "key": "value"
+  "key": "value",
+  "AwsRequestId": "12345",
+  "FunctionName": "FunctionName",
+  "FunctionVersion": "1.0",
+  "MemoryLimitInMB": 1024
 }

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.LogExtraProperties.approved.txt

@@ -1,5 +1,9 @@
 {
   "Message": "hello world",
   "Level": "Info",
+  "AwsRequestId": "12345",
+  "FunctionName": "FunctionName",
+  "FunctionVersion": "1.0",
+  "MemoryLimitInMB": 1024,
   "key": "value"
 }

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.LogExtraPropertiesWithObject.approved.txt

@@ -1,6 +1,10 @@
 {
   "Message": "hello world",
   "Level": "Info",
+  "AwsRequestId": "12345",
+  "FunctionName": "FunctionName",
+  "FunctionVersion": "1.0",
+  "MemoryLimitInMB": 1024,
   "key": {
     "Property1": "The value of property1",
     "Property2": "The value of property2"

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.LogGlobalPropertiesAndExtraProperties.approved.txt

@@ -2,5 +2,9 @@
   "Message": "hello world",
   "Level": "Info",
   "key": "value",
+  "AwsRequestId": "12345",
+  "FunctionName": "FunctionName",
+  "FunctionVersion": "1.0",
+  "MemoryLimitInMB": 1024,
   "key2": "value2"
 }

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.LogLevelAndMessage.approved.txt

@@ -1,4 +1,8 @@
 {
   "Message": "hello world",
-  "Level": "Debug"
+  "Level": "Debug",
+  "AwsRequestId": "12345",
+  "FunctionName": "FunctionName",
+  "FunctionVersion": "1.0",
+  "MemoryLimitInMB": 1024
 }

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.cs

@@ -10,17 +10,28 @@ namespace Voxel.MiddyNet.Tests
     public class MiddyLoggerShould
     {
         private readonly ILambdaLogger lambdaLogger = Substitute.For<ILambdaLogger>();
+        private readonly ILambdaContext lambdaContext = Substitute.For<ILambdaContext>();
+        private const string AwsRequestId = "12345";
+        private const string FunctionName = "FunctionName";
+        private const string FunctionVersion = "1.0";
+        private const int MemoryLimitInMb = 1024;
+
         private string receivedLog = string.Empty;
+        
 
         public MiddyLoggerShould()
         {
             lambdaLogger.Log(Arg.Do<string>(a => receivedLog = a));
+            lambdaContext.AwsRequestId.Returns(AwsRequestId);
+            lambdaContext.FunctionName.Returns(FunctionName);
+            lambdaContext.FunctionVersion.Returns(FunctionVersion);
+            lambdaContext.MemoryLimitInMB.Returns(MemoryLimitInMb);
         }
 
         [Fact]
         public void LogLevelAndMessage()
         {
-            var logger = new MiddyLogger(lambdaLogger);
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
             logger.Log(LogLevel.Debug, "hello world");
 
             Approvals.Verify(receivedLog);
@@ -29,7 +40,7 @@ public void LogLevelAndMessage()
         [Fact]
         public void LogExtraProperties()
         {
-            var logger = new MiddyLogger(lambdaLogger);
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
             logger.Log(LogLevel.Info, "hello world", new LogProperty("key", "value"));
 
             Approvals.Verify(receivedLog);
@@ -44,7 +55,7 @@ public void LogExtraPropertiesWithObject()
                 Property2 = "The value of property2"
             };
 
-            var logger = new MiddyLogger(lambdaLogger);
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
             logger.Log(LogLevel.Info, "hello world", new LogProperty("key", classToLog));
 
             Approvals.Verify(receivedLog);
@@ -53,7 +64,7 @@ public void LogExtraPropertiesWithObject()
         [Fact]
         public void LogEnrichWithExtraProperties()
         {
-            var logger = new MiddyLogger(lambdaLogger);
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
             logger.EnrichWith(new LogProperty("key", "value"));
             logger.Log(LogLevel.Info, "hello world");
 
@@ -62,7 +73,7 @@ public void LogEnrichWithExtraProperties()
         [Fact]
         public void LogGlobalPropertiesAndExtraProperties()
         {
-            var logger = new MiddyLogger(lambdaLogger);
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
             logger.EnrichWith(new LogProperty("key", "value"));
             logger.Log(LogLevel.Info, "hello world", new LogProperty("key2", "value2"));