feat(core): Simplify context propagation

Avoid adding terminated contexts as span links and clearing them if not needed.

Author: PerfectSlayer

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -4,6 +4,7 @@
 import static datadog.trace.api.DDTags.DJM_ENABLED;
 import static datadog.trace.api.DDTags.DSM_ENABLED;
 import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
+import static datadog.trace.api.TracePropagationBehaviorExtract.RESTART;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.BAGGAGE_CONCERN;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.TRACING_CONCERN;
@@ -31,7 +32,6 @@
 import datadog.trace.api.IdGenerationStrategy;
 import datadog.trace.api.StatsDClient;
 import datadog.trace.api.TraceConfig;
-import datadog.trace.api.TracePropagationBehaviorExtract;
 import datadog.trace.api.config.GeneralConfig;
 import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
 import datadog.trace.api.datastreams.PathwayContext;
@@ -1333,7 +1333,6 @@ public CoreSpanBuilder ignoreActiveSpan() {
     }
 
     private DDSpan buildSpan() {
-      addTerminatedContextAsLinks();
       DDSpan span = DDSpan.create(instrumentationName, timestampMicro, buildSpanContext(), links);
       if (span.isLocalRootSpan()) {
         EndpointTracker tracker = tracer.onRootSpanStarted(span);
@@ -1344,6 +1343,22 @@ private DDSpan buildSpan() {
       return span;
     }
 
+    private void addParentContextAsLinks(AgentSpanContext parentContext) {
+      SpanLink link;
+      if (parentContext instanceof ExtractedContext) {
+        String headers = ((ExtractedContext) parentContext).getPropagationStyle().toString();
+        SpanAttributes attributes =
+            SpanAttributes.builder()
+                .put("reason", "propagation_behavior_extract")
+                .put("context_headers", headers)
+                .build();
+        link = DDSpanLink.from((ExtractedContext) parentContext, attributes);
+      } else {
+        link = SpanLink.from(parentContext);
+      }
+      withLink(link);
+    }
+
     private void addTerminatedContextAsLinks() {
       if (this.parent instanceof TagContext) {
         List<AgentSpanLink> terminatedContextLinks =
@@ -1511,6 +1526,7 @@ private DDSpanContext buildSpanContext() {
         spanId = this.spanId;
       }
 
+      // Find the parent context
       AgentSpanContext parentContext = parent;
       if (parentContext == null && !ignoreScope) {
         // use the Scope as parent unless overridden or ignored.
@@ -1519,35 +1535,18 @@ private DDSpanContext buildSpanContext() {
           parentContext = activeSpan.context();
         }
       }
-
-      String parentServiceName = null;
-      boolean isRemote = false;
-
-      TracePropagationBehaviorExtract behaviorExtract =
-          Config.get().getTracePropagationBehaviorExtract();
+      // Handle remote terminated context as span links
       if (parentContext != null && parentContext.isRemote()) {
-        if (behaviorExtract == TracePropagationBehaviorExtract.IGNORE) {
-          // reset links that may have come terminated span links
-          links = new ArrayList<>();
-          parentContext = null;
-        } else if (behaviorExtract == TracePropagationBehaviorExtract.RESTART) {
-          links = new ArrayList<>();
-          SpanLink link =
-              (parentContext instanceof ExtractedContext)
-                  ? DDSpanLink.from(
-                      (ExtractedContext) parentContext,
-                      SpanAttributes.builder()
-                          .put("reason", "propagation_behavior_extract")
-                          .put(
-                              "context_headers",
-                              ((ExtractedContext) parentContext).getPropagationStyle().toString())
-                          .build())
-                  : SpanLink.from(parentContext);
-          links.add(link);
+        if (Config.get().getTracePropagationBehaviorExtract() == RESTART) {
+          addParentContextAsLinks(parentContext);
           parentContext = null;
+        } else {
+          addTerminatedContextAsLinks();
         }
       }
 
+      String parentServiceName = null;
+      boolean isRemote = false; // TODO Simplify?
       // Propagate internal trace.
       // Note: if we are not in the context of distributed tracing and we are starting the first
       // root span, parentContext will be null at this point.