Merge pull request #48 from VoxelGroup/FixLogger

fix: remove global properties if repeated

Author: josep-bocanegra

build/dependencies.props

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

src/Voxel.MiddyNet/MiddyLogger.cs

@@ -69,10 +69,18 @@ private void InternalLog(LogMessage logMessage)
 
         private void AddLambdaContextProperties()
         {
-            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));
+            AddOrReplaceProperty("AwsRequestId", lambdaContext.AwsRequestId);
+            AddOrReplaceProperty("FunctionName", lambdaContext.FunctionName);
+            AddOrReplaceProperty("FunctionVersion", lambdaContext.FunctionVersion);
+            AddOrReplaceProperty("MemoryLimitInMB", lambdaContext.MemoryLimitInMB);
+        }
+
+        private void AddOrReplaceProperty(string name, object value)
+        {
+            var index = globalProperties.FindIndex(p => p.Key == name);
+            if (index != -1) globalProperties.RemoveAt(index);
+
+            globalProperties.Add(new LogProperty(name, value));
         }
     }
 

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

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

test/Voxel.MiddyNet.Tests/MiddyLoggerShould.cs

@@ -21,7 +21,7 @@ public class MiddyLoggerShould
 
         public MiddyLoggerShould()
         {
-            lambdaLogger.Log(Arg.Do<string>(a => receivedLog = a));
+            lambdaLogger.Log(Arg.Do<string>(a => receivedLog += a));
             lambdaContext.AwsRequestId.Returns(AwsRequestId);
             lambdaContext.FunctionName.Returns(FunctionName);
             lambdaContext.FunctionVersion.Returns(FunctionVersion);
@@ -80,10 +80,25 @@ public void LogGlobalPropertiesAndExtraProperties()
             Approvals.Verify(receivedLog);
         }
 
+        [Fact]
+        public void LogTwiceWithNoErrors()
+        {
+            var logger = new MiddyLogger(lambdaLogger, lambdaContext);
+            logger.Log(LogLevel.Debug, "hello world");
+            logger.Log(LogLevel.Debug, "hello world");
+
+            Approvals.Verify(receivedLog);
+        }
+
         internal class ClassToLog
         {
             public string Property1 { get; set; }
             public string Property2 { get; set; }
         }
+
+        ~MiddyLoggerShould()
+        {
+            receivedLog = string.Empty;
+        }
     }
 }