Add span links to the StartActiveInternal and propagate it into our S…

…pan constructor, since it is a first-class field
DataDog · Jan 9, 2025 · eeb0838 · eeb0838
1 parent 5d3f014
commit eeb0838
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs b/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs
@@ -112,16 +112,10 @@ public Scope StartAspNetCorePipelineScope(Tracer tracer, Security security, Http
             var routeTemplateResourceNames = tracer.Settings.RouteTemplateResourceNamesEnabled;
             var tags = routeTemplateResourceNames ? new AspNetCoreEndpointTags() : new AspNetCoreTags();
 
-            var scope = tracer.StartActiveInternal(_requestInOperationName, extractedContext.SpanContext, tags: tags);
+            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);
 
-            foreach (var link in extractedContext.Links)
-            {
-                // TODO: We should probably just add this as another argument in StartActiveInternal
-                scope.Span.AddLink(link);
-            }
-
             var originalPath = request.PathBase.HasValue ? request.PathBase.Add(request.Path) : request.Path;
             httpContext.Features.Set(new RequestTrackingFeature(originalPath, scope));
 

diff --git a/tracer/src/Datadog.Trace/Span.cs b/tracer/src/Datadog.Trace/Span.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Datadog.Trace.Debugger.ExceptionAutoInstrumentation;
@@ -37,12 +38,17 @@ internal Span(SpanContext context, DateTimeOffset? start)
         {
         }
 
-        internal Span(SpanContext context, DateTimeOffset? start, ITags tags)
+        internal Span(SpanContext context, DateTimeOffset? start, ITags tags, IEnumerable<SpanLink> links = null)
         {
             Tags = tags ?? new CommonTags();
             Context = context;
             StartTime = start ?? Context.TraceContext.Clock.UtcNow;
 
+            foreach (var link in links ?? Enumerable.Empty<SpanLink>())
+            {
+                AddLink(link);
+            }
+
             if (IsLogLevelDebugEnabled)
             {
                 WriteCtorDebugMessage();

diff --git a/tracer/src/Datadog.Trace/Tracer.cs b/tracer/src/Datadog.Trace/Tracer.cs
@@ -482,9 +482,10 @@ internal SpanContext CreateSpanContext(ISpanContext parent = null, string servic
         /// and the span count metric is incremented. Alternatively, if this is not being called from an
         /// automatic integration, call <c>TelemetryFactory.Metrics.RecordCountSpanCreated()</c> directory instead.
         /// </remarks>
-        internal Scope StartActiveInternal(string operationName, ISpanContext parent = null, string serviceName = null, DateTimeOffset? startTime = null, bool finishOnClose = true, ITags tags = null)
+        internal Scope StartActiveInternal(string operationName, ISpanContext parent = null, string serviceName = null, DateTimeOffset? startTime = null, bool finishOnClose = true, ITags tags = null, IEnumerable<SpanLink> links = null)
         {
-            var span = StartSpan(operationName, tags, parent, serviceName, startTime);
+            var span = StartSpan(operationName, tags, parent, serviceName, startTime, links: links);
+
             return TracerManager.ScopeManager.Activate(span, finishOnClose);
         }
 
@@ -494,7 +495,7 @@ internal Scope StartActiveInternal(string operationName, ISpanContext parent = n
         /// and the span count metric is incremented. Alternatively, if this is not being called from an
         /// automatic integration, call <c>TelemetryFactory.Metrics.RecordCountSpanCreated()</c> directly instead.
         /// </remarks>
-        internal Span StartSpan(string operationName, ITags tags = null, ISpanContext parent = null, string serviceName = null, DateTimeOffset? startTime = null, TraceId traceId = default, ulong spanId = 0, string rawTraceId = null, string rawSpanId = null, bool addToTraceContext = true)
+        internal Span StartSpan(string operationName, ITags tags = null, ISpanContext parent = null, string serviceName = null, DateTimeOffset? startTime = null, TraceId traceId = default, ulong spanId = 0, string rawTraceId = null, string rawSpanId = null, bool addToTraceContext = true, IEnumerable<SpanLink> links = null)
         {
             var spanContext = CreateSpanContext(parent, serviceName, traceId, spanId, rawTraceId, rawSpanId);