Removed TraceIdentifier usage and fixed operation.Id propagation.

microsoft · Jun 16, 2017 · 49e5c00 · 49e5c00
1 parent 403156f
commit 49e5c00
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...cationInsights.AspNetCore/DiagnosticListeners/Implementation/HostingDiagnosticListener.cs b/...cationInsights.AspNetCore/DiagnosticListeners/Implementation/HostingDiagnosticListener.cs
@@ -41,7 +41,6 @@ public void OnBeginRequest(HttpContext httpContext, long timestamp)
                 httpContext.Features.Set(new RequestTelemetry());
 
                 this.beginRequestTimestamp.Value = timestamp;
-                this.client.Context.Operation.Id = httpContext.TraceIdentifier = Guid.NewGuid().ToString();
             }
         }
 

diff --git a/...t.ApplicationInsights.AspNetCore/TelemetryInitializers/OperationIdTelemetryInitializer.cs b/...t.ApplicationInsights.AspNetCore/TelemetryInitializers/OperationIdTelemetryInitializer.cs
@@ -15,7 +15,7 @@ protected override void OnInitializeTelemetry(HttpContext platformContext, Reque
         {
             if (string.IsNullOrEmpty(telemetry.Context.Operation.Id))
             {
-                telemetry.Context.Operation.Id = requestTelemetry.Id;
+                telemetry.Context.Operation.Id = requestTelemetry.Context.Operation.Id ?? requestTelemetry.Id;
             }
         }
     }