Remove existing header if we already have a parent

microsoft · Oct 10, 2020 · c61ce39 · c61ce39
1 parent cbc128d
commit c61ce39
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/ReverseProxy/Telemetry/DiagnosticsHandler.cs b/src/ReverseProxy/Telemetry/DiagnosticsHandler.cs
@@ -180,6 +180,11 @@ private void InjectHeaders(Activity currentActivity, HttpRequestMessage request)
 
             if (currentActivity.IdFormat == ActivityIdFormat.W3C)
             {
+                if (!string.IsNullOrEmpty(currentActivity.ParentId))
+                {
+                    request.Headers.Remove(DiagnosticsHandlerLoggingStrings.TraceParentHeaderName);
+                }
+
                 if (!request.Headers.Contains(DiagnosticsHandlerLoggingStrings.TraceParentHeaderName))
                 {
                     request.Headers.TryAddWithoutValidation(DiagnosticsHandlerLoggingStrings.TraceParentHeaderName, currentActivity.Id);
@@ -191,6 +196,11 @@ private void InjectHeaders(Activity currentActivity, HttpRequestMessage request)
             }
             else
             {
+                if (!string.IsNullOrEmpty(currentActivity.ParentId))
+                {
+                    request.Headers.Remove(DiagnosticsHandlerLoggingStrings.RequestIdHeaderName);
+                }
+
                 if (!request.Headers.Contains(DiagnosticsHandlerLoggingStrings.RequestIdHeaderName))
                 {
                     request.Headers.TryAddWithoutValidation(DiagnosticsHandlerLoggingStrings.RequestIdHeaderName, currentActivity.Id);