Remove unnecessary TraceId/SpanId from log event properties

Author: hangy

README.md

@@ -143,7 +143,7 @@ By default, trace telemetry submits:
 - **rendered message** in trace's standard *message* property.
 - **severity** in trace's standard *severityLevel* property.
 - **timestamp** in trace's standard *timestamp* property.
-- **operation id** from `operationId` property, `TraceId` property, or `Activity.TraceId` (captured at log time).
+- **operation id** from `operationId` property, or the `LogEvent.TraceId` property.
 - **operation parent id** from `ParentSpanId` property.
 - **operation name** from `OperationName` property.
 - **component version** from `version` property.
@@ -155,7 +155,7 @@ Event telemetry submits:
 - **message template** as *event name*.
 - **renderedMessage** in *customDimensions*.
 - **timestamp** in event's standard *timestamp* property.
-- **operation id** from `operationId` property, `TraceId` property, or `Activity.TraceId` (captured at log time).
+- **operation id** from `operationId` property, or the `LogEvent.TraceId` property.
 - **operation parent id** from `ParentSpanId` property.
 - **operation name** from `OperationName` property.
 - **component version** from `version` property.
@@ -166,7 +166,7 @@ Exception telemetry submits:
 - **exception** as standard AI exception.
 - **severity** in trace's standard *severityLevel* property.
 - **timestamp** in trace's standard *timestamp* property.
-- **operation id** from `operationId` property, `TraceId` property, or `Activity.TraceId` (captured at log time).
+- **operation id** from `operationId` property, or the `LogEvent.TraceId` property.
 - **operation parent id** from `ParentSpanId` property.
 - **operation name** from `OperationName` property.
 - **component version** from `version` property.
@@ -349,7 +349,6 @@ Application Insight's operation id is set from the following sources in order of
 
 1. `operationId` LogEvent property
 2. `TraceId` LogEvent property
-3. `Activity.TraceId` (captured at log time)
 
 This can be set like so:
 
@@ -387,7 +386,7 @@ The following LogEvent properties are mapped to Application Insights telemetry:
 | `operationId` | `Context.Operation.Id` | Overrides TraceId |
 | `version` | `Context.Component.Version` | |
 
-Precedence for `Context.Operation.Id`: `operationId` property > `TraceId` property > `Activity.TraceId` (when both `operationId` and `TraceId` properties are absent).
+Precedence for `Context.Operation.Id`: `operationId` property > `TraceId` property (when both `operationId` and `TraceId` properties are absent).
 
 ## Using with Azure Functions
 

src/Serilog.Sinks.ApplicationInsights/Sinks/ApplicationInsights/TelemetryConverters/TelemetryConverterBase.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
+using System.Diagnostics;
 using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.DataContracts;
 using Serilog.Events;
@@ -39,21 +35,11 @@ public abstract class TelemetryConverterBase : ITelemetryConverter
     /// </summary>
     public const string OperationIdProperty = "operationId";
 
-    /// <summary>
-    ///     Property that is included when in log context, will be pushed out as AI trace id.
-    /// </summary>
-    public const string TraceIdProperty = "TraceId";
-
     /// <summary>
     ///     Property that is included when in log context, will be pushed out as AI parent span id.
     /// </summary>
     public const string ParentSpanIdProperty = "ParentSpanId";
 
-    /// <summary>
-    ///     Property that is included when in log context, will be pushed out as AI span id.
-    /// </summary>
-    public const string SpanIdProperty = "SpanId";
-
     /// <summary>
     ///     Property that is included when in log context, will be pushed out as AI operation name.
     /// </summary>
@@ -167,8 +153,6 @@ public void ForwardPropertiesToTelemetryProperties(LogEvent logEvent,
             // Operation.Id (TraceId)
             if (logEvent.Properties.TryGetValue(OperationIdProperty, out var operationIdProp))
                 telemetry.Context.Operation.Id = operationIdProp.ToString().Trim('"');
-            else if (logEvent.Properties.TryGetValue(TraceIdProperty, out var traceIdProp))
-                telemetry.Context.Operation.Id = traceIdProp.ToString().Trim('"');
             else if (logEvent.TraceId is ActivityTraceId traceId)
                 telemetry.Context.Operation.Id = traceId.ToHexString();
 
@@ -181,14 +165,7 @@ public void ForwardPropertiesToTelemetryProperties(LogEvent logEvent,
                 telemetry.Context.Operation.Name = operationNameProp.ToString().Trim('"');
 
             // Set Id for RequestTelemetry and DependencyTelemetry
-            if (logEvent.Properties.TryGetValue(SpanIdProperty, out var spanIdProp))
-            {
-                if (telemetry is RequestTelemetry req)
-                    req.Id = spanIdProp.ToString().Trim('"');
-                else if (telemetry is DependencyTelemetry dep)
-                    dep.Id = spanIdProp.ToString().Trim('"');
-            }
-            else if (logEvent.SpanId is ActivitySpanId spanId)
+            if (logEvent.SpanId is ActivitySpanId spanId)
             {
                 if (telemetry is RequestTelemetry req)
                     req.Id = spanId.ToHexString();