Use Layout type instead of string for Dsn and Environment (#5)

1) Used Layout type instead of string for Dsn and Environment
2) Updated NLog to 4.5.11

Author: devigo

NLog.Targets.Sentry.UnitTests/NLog.Targets.Sentry.UnitTests.csproj

@@ -7,12 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NLog" Version="4.5.2" />
-    <PackageReference Include="NLog.Config" Version="4.5.2" />
-    <PackageReference Include="NLog.Schema" Version="4.5.2" />
+    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog.Config" Version="4.5.11" />
+    <PackageReference Include="NLog.Schema" Version="4.5.11" />
     <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
   </ItemGroup>

NLog.Targets.Sentry.UnitTests/SentryTargetTests.cs

@@ -1,11 +1,11 @@
-using Moq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Moq;
 using NLog.Config;
 using NUnit.Framework;
 using SharpRaven;
 using SharpRaven.Data;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
 
 namespace NLog.Targets.Sentry.UnitTests
 {
@@ -24,6 +24,22 @@ public void Teardown()
             LogManager.ThrowExceptions = false;
         }
 
+        [Test]
+        public void TestInitialization()
+        {
+            var sentryTarget = new SentryTarget
+            {
+                Dsn = "http://25e27038b1df4930b93c96c170d95527:d87ac60bb07b4be8908845b23e914dae@test/4",
+                Environment = "Test",
+                Timeout = "00:00:10",
+            };
+
+            var logEventInfo = LogEventInfo.CreateNullEvent();
+            Assert.AreEqual("http://25e27038b1df4930b93c96c170d95527:d87ac60bb07b4be8908845b23e914dae@test/4", sentryTarget.Dsn.Render(logEventInfo));
+            Assert.AreEqual("Test", sentryTarget.Environment.Render(logEventInfo));
+            Assert.AreEqual("00:00:10", sentryTarget.Timeout);
+        }
+
         [Test]
         public void TestPublicConstructor()
         {
@@ -40,14 +56,6 @@ public void TestPublicConstructor()
             });
         }
 
-        [Test]
-        public void TestBadDsn()
-        {
-            // ReSharper disable ObjectCreationAsStatement
-            Assert.Throws<ArgumentException>(() => new SentryTarget(null) { Dsn = "http://localhost" });
-            // ReSharper restore ObjectCreationAsStatement
-        }
-
         [Test]
         public void TestLoggingToSentry()
         {

NLog.Targets.Sentry/NLog.Targets.Sentry.csproj

@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NLog" Version="4.5.2" />
+    <PackageReference Include="NLog" Version="4.5.11" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
   </ItemGroup>
 </Project>

NLog.Targets.Sentry/SentryTarget.cs

@@ -1,13 +1,13 @@
-using NLog.Common;
-using NLog.Config;
-using SharpRaven;
-using SharpRaven.Data;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-
 using System.Reflection;
+using NLog.Common;
+using NLog.Config;
+using NLog.Layouts;
+using SharpRaven;
+using SharpRaven.Data;
 
 // ReSharper disable CheckNamespace
 
@@ -17,7 +17,6 @@ namespace NLog.Targets
     [Target("Sentry")]
     public class SentryTarget : TargetWithLayout
     {
-        private Dsn dsn;
         private TimeSpan clientTimeout;
         private LogLevel minLogLevelForEvent = LogLevel.Trace;
         private readonly Lazy<IRavenClient> client;
@@ -94,11 +93,7 @@ static SentryTarget()
         /// The DSN for the Sentry host
         /// </summary>
         [RequiredParameter]
-        public string Dsn
-        {
-            get { return this.dsn?.ToString(); }
-            set { this.dsn = new Dsn(value); }
-        }
+        public Layout Dsn { get; set; }
 
         /// <summary>
         /// Gets or sets the minimum log level required to trigger a Sentry event.
@@ -115,7 +110,7 @@ public string MinLogLevelForEvent
         /// <summary>
         /// Gets or sets the environment name to send with the event logs.
         /// </summary>
-        public string Environment { get; set; }
+        public Layout Environment { get; set; }
 
         /// <summary>
         /// Gets or sets the type of version number to send with the logs.
@@ -131,8 +126,8 @@ public string VersionNumberType
         /// </summary>
         public string Timeout
         {
-            get { return this.clientTimeout.ToString("c"); }
-            set { this.clientTimeout = TimeSpan.ParseExact(value, "c", CultureInfo.InvariantCulture); }
+            get => clientTimeout.ToString("c");
+            set => clientTimeout = TimeSpan.ParseExact(value, "c", CultureInfo.InvariantCulture);
         }
 
         /// <summary>
@@ -150,7 +145,7 @@ public string Timeout
         /// </summary>
         public SentryTarget()
         {
-            this.client = new Lazy<IRavenClient>(this.DefaultClientFactory);
+            this.client = new Lazy<IRavenClient>(DefaultClientFactory);
         }
 
         /// <summary>
@@ -172,7 +167,7 @@ protected override void Write(LogEventInfo logEvent)
             {
                 if (logEvent.Level >= this.minLogLevelForEvent)
                 {
-                    if (logEvent.Exception == null && this.IgnoreEventsWithNoException)
+                    if (logEvent.Exception == null && IgnoreEventsWithNoException)
                     {
                         return;
                     }
@@ -183,16 +178,16 @@ protected override void Write(LogEventInfo logEvent)
                         eventProperties = logEvent.Properties.ToDictionary(x => x.Key.ToString(), x => x.Value?.ToString());
                     }
 
-                    var tags = this.SendLogEventInfoPropertiesAsTags ? eventProperties : null;
-                    var extras = this.SendLogEventInfoPropertiesAsTags ? null : eventProperties;
+                    var tags = SendLogEventInfoPropertiesAsTags ? eventProperties : null;
+                    var extras = SendLogEventInfoPropertiesAsTags ? null : eventProperties;
 
                     this.client.Value.Logger = logEvent.LoggerName;
 
                     // If the log event did not contain an exception and we're not ignoring
                     // those kinds of events then we'll send a "Message" to Sentry
                     if (logEvent.Exception == null)
                     {
-                        var sentryMessage = new SentryMessage(this.Layout.Render(logEvent));
+                        var sentryMessage = new SentryMessage(Layout.Render(logEvent));
                         var msg = new SentryEvent(sentryMessage)
                         {
                             Level = LoggingLevelMap[logEvent.Level],
@@ -239,7 +234,7 @@ protected override void Write(LogEventInfo logEvent)
             }
             catch (Exception ex)
             {
-                this.LogException(ex);
+                LogException(ex);
                 throw;  // Notify NLog about failure, so fallback/retry can be performed
             }
         }
@@ -269,11 +264,13 @@ protected override void Dispose(bool disposing)
         /// <returns>New instance of a RavenClient.</returns>
         private IRavenClient DefaultClientFactory()
         {
-            var ravenClient = new RavenClient(this.dsn)
+            var renderedDsn = Dsn.Render(LogEventInfo.CreateNullEvent());
+            var renderedEnvironment = Environment?.Render(LogEventInfo.CreateNullEvent());
+            var ravenClient = new RavenClient(renderedDsn)
             {
-                ErrorOnCapture = this.LogException,
+                ErrorOnCapture = LogException,
                 Timeout = this.clientTimeout,
-                Environment = this.Environment,
+                Environment = renderedEnvironment,
                 Release = GetVersion(),
             };
 
@@ -292,7 +289,7 @@ private IRavenClient DefaultClientFactory()
 
         private string GetVersion()
         {
-            switch (versionNumberType)
+            switch (this.versionNumberType)
             {
                 case Targets.VersionNumberType.AssemblyVersion:
                     return RootAssembly?.GetName().Version.ToString();