Merge pull request #5 from biplovkc/biplovkc-patch-1

fix possible null reference on device os, family and browser
biplovkc · Jun 4, 2023 · d85269f · d85269f
2 parents 1e58c4e + 563b893
commit d85269f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/HttpContextEnricher.cs b/src/HttpContextEnricher.cs
@@ -36,9 +36,14 @@ public static void HttpRequestEnricher(IDiagnosticContext diagnosticContext, Htt
         diagnosticContext.Set("IpAddress", httpContextInfo.IpAddress);
         diagnosticContext.Set("Protocol", httpContextInfo.Protocol);
         diagnosticContext.Set("Scheme", httpContextInfo.Scheme);
-        diagnosticContext.Set("Device", clientInfo.Device.Family);
-        diagnosticContext.Set("OperatingSystem", clientInfo.OS.Family);
-        diagnosticContext.Set("Browser", clientInfo.UA.Family);
+        if (!string.IsNullOrWhiteSpace(clientInfo?.Device?.Family))
+            diagnosticContext.Set("Device", clientInfo.Device.Family);
+
+        if (!string.IsNullOrWhiteSpace(clientInfo?.OS?.Family))
+            diagnosticContext.Set("OperatingSystem", clientInfo.OS.Family);
+
+        if (!string.IsNullOrWhiteSpace(clientInfo?.UA?.Family))
+            diagnosticContext.Set("Browser", clientInfo.UA.Family);
     }
 
     private static string GetUserInfo(IPrincipal user) => user.Identity is { IsAuthenticated: true } ? user.Identity.Name : Environment.UserName;