Merge pull request #37 from nblumhardt/dev

Efficiently construct Serilog events using BindProperty()

Author: nblumhardt

appveyor.yml

@@ -3,9 +3,9 @@ image: Visual Studio 2015
 configuration: Release
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" -OutFile ".\build\installcli.ps1"
+  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath'
+  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-002823'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1

src/Serilog.Extensions.Logging/Extensions/Logging/EventIdEnricher.cs

@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Serilog.Core;
 using Serilog.Events;
 using FrameworkLogger = Microsoft.Extensions.Logging.ILogger;
@@ -59,6 +58,8 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             var logger = _logger;
             string messageTemplate = null;
 
+            var properties = new List<LogEventProperty>();
+
             var structure = state as IEnumerable<KeyValuePair<string, object>>;
             if (structure != null)
             {
@@ -70,11 +71,15 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                     }
                     else if (property.Key.StartsWith("@"))
                     {
-                        logger = logger.ForContext(property.Key.Substring(1), property.Value, destructureObjects: true);
+                        LogEventProperty destructured;
+                        if (logger.BindProperty(property.Key.Substring(1), property.Value, true, out destructured))
+                            properties.Add(destructured);
                     }
                     else
                     {
-                        logger = logger.ForContext(property.Key, property.Value);
+                        LogEventProperty bound;
+                        if (logger.BindProperty(property.Key, property.Value, false, out bound))
+                            properties.Add(bound);
                     }                    
                 }
 
@@ -84,24 +89,28 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 if (messageTemplate == null && !stateTypeInfo.IsGenericType)
                 {
                     messageTemplate = "{" + stateType.Name + ":l}";
-                    logger = logger.ForContext(stateType.Name, AsLoggableValue(state, formatter));
+                    LogEventProperty stateTypeProperty;
+                    if (logger.BindProperty(stateType.Name, AsLoggableValue(state, formatter), false, out stateTypeProperty))
+                        properties.Add(stateTypeProperty);
                 }
             }
 
             if (messageTemplate == null && state != null)
             {
                 messageTemplate = "{State:l}";
-                logger = logger.ForContext("State", AsLoggableValue(state, formatter));
+                LogEventProperty stateProperty;
+                if (logger.BindProperty("State", AsLoggableValue(state, formatter), false, out stateProperty))
+                    properties.Add(stateProperty);
             }
 
             if (string.IsNullOrEmpty(messageTemplate))
                 return;
 
             if (eventId.Id != 0 || eventId.Name != null)
-                logger = logger.ForContext(new[] { new EventIdEnricher(eventId) });
+                properties.Add(CreateEventIdProperty(eventId));
 
             var parsedTemplate = _messageTemplateParser.Parse(messageTemplate);
-            var evt = new LogEvent(DateTimeOffset.Now, level, exception, parsedTemplate, Enumerable.Empty<LogEventProperty>());
+            var evt = new LogEvent(DateTimeOffset.Now, level, exception, parsedTemplate, properties);
             logger.Write(evt);
         }
 
@@ -133,5 +142,22 @@ static LogEventLevel ConvertLevel(LogLevel logLevel)
                     return LogEventLevel.Verbose;
             }
         }
+
+        static LogEventProperty CreateEventIdProperty(EventId eventId)
+        {
+            var properties = new List<LogEventProperty>(2);
+
+            if (eventId.Id != 0)
+            {
+                properties.Add(new LogEventProperty("Id", new ScalarValue(eventId.Id)));
+            }
+
+            if (eventId.Name != null)
+            {
+                properties.Add(new LogEventProperty("Name", new ScalarValue(eventId.Name)));
+            }
+
+            return new LogEventProperty("EventId", new StructureValue(properties));
+        }
     }
 }

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs

@@ -1,4 +1,4 @@
-{
+{
   "version": "1.0.0-rc2-*",
   "description": "Serilog provider for Microsoft.Extensions.Logging",
   "authors": [ "Microsoft", "Serilog Contributors" ],
@@ -9,8 +9,8 @@
     "iconUrl": "http://serilog.net/images/serilog-extension-nuget.png"
   },
   "dependencies": {
-    "Serilog": "2.0.0-rc-556",
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-final"
+    "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
+    "Serilog": "2.0.0-rc-576"
   },
   "buildOptions": {
     "keyFile": "../../assets/Serilog.snk",