Inline checks for AddHeaderTagsToSpan

Author: andrewlock

tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs

@@ -6,6 +6,7 @@
 #if !NETFRAMEWORK
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Datadog.Trace.AppSec;
 using Datadog.Trace.AppSec.Coordinator;
@@ -74,29 +75,24 @@ private PropagationContext ExtractPropagatedContext(Tracer tracer, HttpRequest r
             return default;
         }
 
-        private void AddHeaderTagsToSpan(ISpan span, HttpRequest request, Tracer tracer)
+        private void AddHeaderTagsToSpan(ISpan span, HttpRequest request, Tracer tracer, ReadOnlyDictionary<string, string> headerTagsInternal)
         {
-            var headerTagsInternal = tracer.CurrentTraceSettings.Settings.HeaderTags;
-
-            if (!headerTagsInternal.IsNullOrEmpty())
+            try
             {
-                try
-                {
-                    // extract propagation details from http headers
-                    if (request.Headers is { } requestHeaders)
-                    {
-                        tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(
-                            span,
-                            new HeadersCollectionAdapter(requestHeaders),
-                            headerTagsInternal,
-                            defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
-                    }
-                }
-                catch (Exception ex)
+                // extract propagation details from http headers
+                if (request.Headers is { } requestHeaders)
                 {
-                    _log.Error(ex, "Error extracting propagated HTTP headers.");
+                    tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(
+                        span,
+                        new HeadersCollectionAdapter(requestHeaders),
+                        headerTagsInternal,
+                        defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
                 }
             }
+            catch (Exception ex)
+            {
+                _log.Error(ex, "Error extracting propagated HTTP headers.");
+            }
         }
 
         public Scope StartAspNetCorePipelineScope(Tracer tracer, Security security, Iast.Iast iast, HttpContext httpContext, string resourceName)
@@ -125,7 +121,13 @@ public Scope StartAspNetCorePipelineScope(Tracer tracer, Security security, Iast
 
             var scope = tracer.StartActiveInternal(_requestInOperationName, extractedContext.SpanContext, tags: tags, links: extractedContext.Links);
             scope.Span.DecorateWebServerSpan(resourceName, httpMethod, host, url, userAgent, tags);
-            AddHeaderTagsToSpan(scope.Span, request, tracer);
+
+            var headerTagsInternal = tracer.CurrentTraceSettings.Settings.HeaderTags;
+            if (!headerTagsInternal.IsNullOrEmpty())
+            {
+                AddHeaderTagsToSpan(scope.Span, request, tracer, headerTagsInternal);
+            }
+
             tracer.TracerManager.SpanContextPropagator.AddBaggageToSpanAsTags(scope.Span, extractedContext.Baggage, tracer.Settings.BaggageTagKeys);
 
             var originalPath = request.PathBase.HasValue ? request.PathBase.Add(request.Path) : request.Path;