feat: Add operation name to log events using Activity context

Author: hangy

src/Serilog.Sinks.ApplicationInsights/LoggerConfigurationApplicationInsightsExtensions.cs

@@ -1,11 +1,11 @@
 // Copyright 2016 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.
@@ -49,8 +49,7 @@ public static LoggerConfiguration ApplicationInsights(
         var client = new TelemetryClient(telemetryConfiguration ?? TelemetryConfiguration.Active);
 #pragma warning restore CS0618
 
-        return loggerConfiguration.Sink(new ApplicationInsightsSink(client, telemetryConverter),
-            restrictedToMinimumLevel, levelSwitch);
+        return loggerConfiguration.ApplicationInsights(client, telemetryConverter, restrictedToMinimumLevel, levelSwitch);
     }
 
     /// <summary>
@@ -72,8 +71,7 @@ public static LoggerConfiguration ApplicationInsights(
         var client = new TelemetryClient(TelemetryConfiguration.Active);
 #pragma warning restore CS0618
 
-        return loggerConfiguration.Sink(new ApplicationInsightsSink(client, telemetryConverter),
-            restrictedToMinimumLevel, levelSwitch);
+        return loggerConfiguration.ApplicationInsights(client, telemetryConverter, restrictedToMinimumLevel, levelSwitch);
     }
 
     /// <summary>
@@ -93,10 +91,13 @@ public static LoggerConfiguration ApplicationInsights(
         LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
         LoggingLevelSwitch levelSwitch = null)
     {
-        return loggerConfiguration.Sink(new ApplicationInsightsSink(telemetryClient, telemetryConverter),
-            restrictedToMinimumLevel, levelSwitch);
-    }
+        var wrapper = LoggerSinkConfiguration.Wrap(
+             wrappedSink => new ApplicationInsightsSink(telemetryClient, telemetryConverter),
+             configure => { }
+        );
 
+        return loggerConfiguration.Sink(wrapper, restrictedToMinimumLevel, levelSwitch);
+    }
 
     /// <summary>
     ///     Adds a Serilog sink that writes <see cref="LogEvent">log events</see> to Microsoft Application Insights
@@ -125,7 +126,6 @@ public static LoggerConfiguration ApplicationInsights(
 
         var client = new TelemetryClient(config);
 
-        return loggerConfiguration.Sink(new ApplicationInsightsSink(client, telemetryConverter),
-            restrictedToMinimumLevel, levelSwitch);
+        return loggerConfiguration.ApplicationInsights(client, telemetryConverter, restrictedToMinimumLevel, levelSwitch);
     }
-}
+}

src/Serilog.Sinks.ApplicationInsights/Sinks/ApplicationInsights/ApplicationInsightsSink.cs

@@ -1,18 +1,19 @@
 // Copyright 2016 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.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading;
@@ -101,6 +102,15 @@ public virtual void Emit(LogEvent logEvent)
 
         try
         {
+            var activity = Activity.Current;
+            if (activity is { OperationName: not null })
+            {
+                logEvent.AddOrUpdateProperty(
+                    new LogEventProperty(
+                        TelemetryConverterBase.OperationNameProperty,
+                        new ScalarValue(activity.OperationName)));
+            }
+
             var telemetries = _telemetryConverter.Convert(logEvent, _formatProvider);
 
             // if 'null' is returned (& we therefore there's nothing to track), the logEvent is basically skipped
@@ -121,7 +131,7 @@ public virtual void Emit(LogEvent logEvent)
 
     #endregion
 
-    #region AI specifc Helper methods
+    #region AI specific Helper methods
 
     /// <summary>
     ///     Hands over the <paramref name="telemetry" /> to the AI telemetry client.
@@ -139,7 +149,7 @@ protected virtual void TrackTelemetry(ITelemetry telemetry)
         _telemetryClient?.Track(telemetry);
     }
 
-    #endregion AI specifc Helper methods
+    #endregion AI specific Helper methods
 
     #region Implementation of IDisposable
 
@@ -195,7 +205,7 @@ protected virtual void Dispose(bool disposeManagedResources)
             IsDisposing = false;
         }
     }
-    
+
 #if NET6_0_OR_GREATER
     /// <summary>
     /// Disposes the sink and flushes telemetry to App Insights.
@@ -204,7 +214,7 @@ public async ValueTask DisposeAsync()
     {
         if (IsDisposing || IsDisposed)
             return;
-        
+
         try
         {
             IsDisposing = true;
@@ -220,4 +230,4 @@ public async ValueTask DisposeAsync()
 #endif
 
     #endregion Implementation of IDisposable
-}
+}

test/Serilog.Sinks.ApplicationInsights.Tests/EventTelemetryConverterTest.cs

@@ -76,7 +76,9 @@ public void ParentSpanIdIsSet()
     [Fact]
     public void OperationNameIsSet()
     {
-        Logger.Information("Test {OperationName}", "MyOperation");
+        using Activity activity = new("MyOperation");
+        activity.Start();
+        Logger.Information("Test");
         Assert.Equal("MyOperation", LastSubmittedEventTelemetry.Context.Operation.Name);
     }
 

test/Serilog.Sinks.ApplicationInsights.Tests/TraceTelemetryConverterTest.cs

@@ -76,7 +76,9 @@ public void ParentSpanIdIsSet()
     [Fact]
     public void OperationNameIsSet()
     {
-        Logger.Information("Test {OperationName}", "MyOperation");
+        using Activity activity = new("MyOperation");
+        activity.Start();
+        Logger.Information("Test");
         Assert.Equal("MyOperation", LastSubmittedTraceTelemetry.Context.Operation.Name);
     }