Added ability to set contextdata with the nlog target.

Author: ejsmith

Source/Platforms/NLog/ExceptionlessClientExtensions.cs

@@ -1,12 +1,27 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Exceptionless.Enrichments;
+using Exceptionless.Models;
 using NLog;
+using NLog.Fluent;
 
 namespace Exceptionless.NLog {
     public static class ExceptionlessClientExtensions {
         public static EventBuilder CreateFromLogEvent(this ExceptionlessClient client, LogEventInfo ev) {
-            var builder = ev.Exception != null ? client.CreateException(ev.Exception) : client.CreateLog(ev.LoggerName, ev.FormattedMessage, ev.Level.Name);
+            var contextData = ev.GetContextData();
+
+            if (ev.Exception != null)
+                contextData.SetException(ev.Exception);
+
+            var builder = client.CreateEvent(contextData);
+            if (ev.Exception == null) {
+                builder.SetType(Event.KnownTypes.Log);
+                builder.SetSource(ev.LoggerName);
+                builder.SetProperty(Event.KnownDataKeys.Level, ev.Level.Name);
+            } else {
+                builder.SetType(Event.KnownTypes.Error);
+            }
             builder.Target.Date = ev.TimeStamp;
 
             if (!String.IsNullOrWhiteSpace(ev.FormattedMessage))
@@ -15,8 +30,12 @@ public static EventBuilder CreateFromLogEvent(this ExceptionlessClient client, L
             if (ev.Exception != null)
                 builder.SetSource(ev.LoggerName);
 
+            var tagList = ev.GetTags();
+            if (tagList.Count > 0)
+                builder.AddTags(tagList.ToArray());
+
             foreach (var p in ev.Properties.Where(kvp => !_ignoredEventProperties.Contains(kvp.Key.ToString(), StringComparer.OrdinalIgnoreCase)))
-                builder.AddObject(p.Value, p.Key.ToString());
+                builder.SetProperty(p.Key.ToString(), p.Value);
 
             return builder;
         }
@@ -25,10 +44,59 @@ public static void SubmitFromLogEvent(this ExceptionlessClient client, LogEventI
             CreateFromLogEvent(client, ev).Submit();
         }
 
+        public static LogBuilder Tag(this LogBuilder builder, params string[] tags) {
+            var tagList = builder.LogEventInfo.GetTags();
+            tagList.AddRange(tags);
+
+            return builder;
+        }
+
+        public static LogBuilder ContextProperty(this LogBuilder builder, string key, object value) {
+            var contextData = builder.LogEventInfo.GetContextData();
+            contextData[key] = value;
+
+            return builder;
+        }
+
+        public static LogBuilder MarkUnhandled(this LogBuilder builder, string submissionMethod = null) {
+            var contextData = builder.LogEventInfo.GetContextData();
+            contextData.MarkAsUnhandledError();
+            if (!String.IsNullOrEmpty(submissionMethod))
+                contextData.SetSubmissionMethod(submissionMethod);
+
+            return builder;
+        }
+
+        public static List<string> GetTags(this LogEventInfo ev) {
+            var tagList = new List<string>();
+            if (!ev.Properties.ContainsKey("Tags"))
+                ev.Properties["Tags"] = tagList;
+
+            if (ev.Properties.ContainsKey("Tags")
+                && ev.Properties["Tags"] is List<string>)
+                tagList = (List<string>)ev.Properties["Tags"];
+
+            return tagList;
+        }
+
+        public static ContextData GetContextData(this LogEventInfo ev) {
+            var contextData = new ContextData();
+            if (!ev.Properties.ContainsKey("ContextData"))
+                ev.Properties["ContextData"] = contextData;
+
+            if (ev.Properties.ContainsKey("ContextData")
+                && ev.Properties["ContextData"] is ContextData)
+                contextData = (ContextData)ev.Properties["ContextData"];
+
+            return contextData;
+        }
+
         private static readonly List<string> _ignoredEventProperties = new List<string> {
             "CallerFilePath",
             "CallerMemberName",
-            "CallerLineNumber"
+            "CallerLineNumber",
+            "Tags",
+            "ContextData"
         };
     }
 }

Source/Platforms/NLog/ExceptionlessTarget.cs

@@ -7,7 +7,7 @@
 namespace Exceptionless.NLog {
     [Target("Exceptionless")]
     public class ExceptionlessTarget : TargetWithLayout {
-        private ExceptionlessClient _client;
+        private ExceptionlessClient _client = ExceptionlessClient.Default;
 
         public string ApiKey { get; set; }
         public string ServerUrl { get; set; }
@@ -24,12 +24,12 @@ protected override void InitializeTarget() {
 
             if (!String.IsNullOrEmpty(ApiKey) || !String.IsNullOrEmpty(ServerUrl))
                 _client = new ExceptionlessClient(config => {
-                    config.ApiKey = ApiKey;
-                    config.ServerUrl = ServerUrl;
+                    if (!String.IsNullOrEmpty(ApiKey))
+                        config.ApiKey = ApiKey;
+                    if (!String.IsNullOrEmpty(ServerUrl))
+                        config.ServerUrl = ServerUrl;
                     config.UseInMemoryStorage();
                 });
-            else
-                _client = ExceptionlessClient.Default;
         }
 
         protected override void Write(AsyncLogEventInfo info) {

Source/Samples/SampleConsole/Program.cs

@@ -22,6 +22,7 @@
 using Exceptionless.Log4net;
 using Exceptionless.Logging;
 using Exceptionless.Models;
+using Exceptionless.NLog;
 using log4net;
 using log4net.Config;
 using log4net.Core;
@@ -57,7 +58,7 @@ private static void Main() {
 
             // test NLog
             NLog.GlobalDiagnosticsContext.Set("GlobalProp", "GlobalValue");
-            Log.Info().Message("Hi").Property("LocalProp", "LocalValue").Write();
+            Log.Info().Message("Hi").Tag("Tag1", "Tag2").Property("LocalProp", "LocalValue").MarkUnhandled("SomeMethod").ContextProperty("Blah", new Event()).Write();
 
             // test log4net
             XmlConfigurator.Configure();