Merge pull request #11 from StefanOssendorf/threadName-enricher

ThreadName Enricher added for Net45 and Standard2.0

Author: nblumhardt

src/Serilog.Enrichers.Thread/Enrichers/ThreadIdEnricher.cs

@@ -1,4 +1,4 @@
-// Copyright 2013-2015 Serilog Contributors
+// Copyright 2013-2019 Serilog Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/Serilog.Enrichers.Thread/Enrichers/ThreadNameEnricher.cs

@@ -0,0 +1,48 @@
+// Copyright 2013-2019 Serilog Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if THREAD_NAME
+using System.Threading;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace Serilog.Enrichers 
+{
+
+    /// <summary>
+    /// Enriches log events with a ThreadName property containing the 
+    /// </summary>
+    public class ThreadNameEnricher : ILogEventEnricher 
+    {
+        /// <summary>
+        /// The property name added to enriched log events.
+        /// </summary>
+        public const string ThreadNamePropertyName = "ThreadName";
+
+        /// <summary>
+        /// Enrich the log event.
+        /// </summary>
+        /// <param name="logEvent">The log event to enrich.</param>
+        /// <param name="propertyFactory">Factory for creating new properties to add to the event.</param>
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory) 
+        {
+            var threadName = Thread.CurrentThread.Name;
+            if (threadName != null) 
+            {
+                logEvent.AddPropertyIfAbsent(new LogEventProperty(ThreadNamePropertyName, new ScalarValue(threadName)));
+            }
+        }
+    }
+}
+#endif

src/Serilog.Enrichers.Thread/Serilog.Enrichers.Thread.csproj

@@ -28,4 +28,12 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <DefineConstants>$(DefineConstants);THREAD_NAME</DefineConstants>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>$(DefineConstants);THREAD_NAME</DefineConstants>
+  </PropertyGroup>
+
 </Project>

src/Serilog.Enrichers.Thread/ThreadLoggerConfigurationExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright 2013-2016 Serilog Contributors
+// Copyright 2013-2019 Serilog Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,5 +38,19 @@ public static LoggerConfiguration WithThreadId(
             if (enrichmentConfiguration == null) throw new ArgumentNullException(nameof(enrichmentConfiguration));
             return enrichmentConfiguration.With<ThreadIdEnricher>();
         }
+
+#if THREAD_NAME
+        /// <summary>
+        /// Enrich log events with a ThreadName property containing the <see cref="Thread.CurrentThread"/> <see cref="Thread.Name"/>.
+        /// </summary>
+        /// <param name="enrichmentConfiguration"></param>
+        /// <returns></returns>
+        public static LoggerConfiguration WithThreadName(
+            this LoggerEnrichmentConfiguration enrichmentConfiguration)
+        {
+            if (enrichmentConfiguration == null) throw new ArgumentNullException(nameof(enrichmentConfiguration));
+            return enrichmentConfiguration.With<ThreadNameEnricher>();
+        }
+#endif
     }
-}
+}