Merge pull request #24 from osstotalsoft/feature/correlation-fix

Replaced existing CorrelationId in Serilog enricher
osstotalsoft · Sep 9, 2019 · 586bdb2 · 586bdb2
2 parents f2f8861 + 79a8096
commit 586bdb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Correlation/NBB.Correlation.AspNet/ApplicationBuilderExtensions.cs b/src/Correlation/NBB.Correlation.AspNet/ApplicationBuilderExtensions.cs
@@ -19,7 +19,7 @@ public static IApplicationBuilder UseCorrelation(this IApplicationBuilder app)
                 }
 
                 var correlationId = 
-                    ExtractGuid(context.Request.Headers["x-correlation-id"]) ??
+                    ExtractGuid(context.Request.Headers[HttpRequestHeaders.CorrelationId]) ??
                     ExtractGuid(context.Request.Query["correlationId"]);
 
                 using (CorrelationManager.NewCorrelationId(correlationId))

diff --git a/src/Correlation/NBB.Correlation.AspNet/HttpRequestHeaders.cs b/src/Correlation/NBB.Correlation.AspNet/HttpRequestHeaders.cs
@@ -0,0 +1,7 @@
+namespace NBB.Correlation.AspNet
+{
+    public static class HttpRequestHeaders
+    {
+        public const string CorrelationId = "x-correlation-id";
+    }
+}
diff --git a/src/Correlation/NBB.Correlation.Serilog/CorrelationLogEventEnricher.cs b/src/Correlation/NBB.Correlation.Serilog/CorrelationLogEventEnricher.cs
@@ -8,7 +8,7 @@ public class CorrelationLogEventEnricher : ILogEventEnricher
 
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
         {
-            logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("CorrelationId", CorrelationManager.GetCorrelationId()));
+            logEvent.AddOrUpdateProperty(propertyFactory.CreateProperty("CorrelationId", CorrelationManager.GetCorrelationId()));
         }
     }
 }