Extend test to check link tracestate, traceflags, and span origin

Author: mcculls

dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java

@@ -17,6 +17,7 @@
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.WireFormat;
 import datadog.trace.api.DD128bTraceId;
+import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;
@@ -173,20 +174,43 @@ SpanSpec use128BitTraceId() {
       this.use128BitTraceId = true;
       return this;
     }
+
+    /**
+     * Sets the origin propagated via an {@link ExtractedContext} parent so that {@code
+     * metadata.getOrigin()} is non-null and the {@code _dd.origin} attribute is written.
+     */
+    SpanSpec origin(String origin) {
+      this.origin = origin;
+      return this;
+    }
+
+    /** Trace origin carried in the extracted parent context; {@code null} = no origin. */
+    String origin;
   }
 
-  /** Descriptor for a single span link: the index of the target span and optional attributes. */
+  /**
+   * Descriptor for a single span link: target span index, optional attributes, tracestate, and
+   * flags.
+   */
   static final class LinkSpec {
     final int targetIndex;
     final SpanAttributes attributes;
+    final String traceState;
+    final byte traceFlags;
 
     LinkSpec(int targetIndex) {
-      this(targetIndex, SpanAttributes.EMPTY);
+      this(targetIndex, SpanAttributes.EMPTY, "", SpanLink.DEFAULT_FLAGS);
     }
 
     LinkSpec(int targetIndex, SpanAttributes attributes) {
+      this(targetIndex, attributes, "", SpanLink.DEFAULT_FLAGS);
+    }
+
+    LinkSpec(int targetIndex, SpanAttributes attributes, String traceState, byte traceFlags) {
       this.targetIndex = targetIndex;
       this.attributes = attributes;
+      this.traceState = traceState;
+      this.traceFlags = traceFlags;
     }
   }
 
@@ -329,6 +353,10 @@ private static SpanSpec linkedSpan(String resourceName, int... targetIndices) {
         links);
   }
 
+  /**
+   * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
+   * given {@link SpanAttributes}.
+   */
   /**
    * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
    * given {@link SpanAttributes}.
@@ -351,6 +379,44 @@ private static SpanSpec linkedSpanWithAttrs(
         new LinkSpec(targetIndex, attributes));
   }
 
+  /** A span with one {@link SpanLink} carrying the given W3C tracestate string. */
+  private static SpanSpec linkedSpanWithTracestate(
+      String resourceName, int targetIndex, String traceState) {
+    return new SpanSpec(
+        resourceName,
+        "op.linked",
+        "web",
+        null,
+        BASE_MICROS,
+        BASE_MICROS + DURATION_MICROS,
+        false,
+        null,
+        0,
+        null,
+        new HashMap<>(),
+        -1,
+        new LinkSpec(targetIndex, SpanAttributes.EMPTY, traceState, SpanLink.DEFAULT_FLAGS));
+  }
+
+  /** A span with one {@link SpanLink} carrying the given trace flags. */
+  private static SpanSpec linkedSpanWithFlags(
+      String resourceName, int targetIndex, byte traceFlags) {
+    return new SpanSpec(
+        resourceName,
+        "op.linked",
+        "web",
+        null,
+        BASE_MICROS,
+        BASE_MICROS + DURATION_MICROS,
+        false,
+        null,
+        0,
+        null,
+        new HashMap<>(),
+        -1,
+        new LinkSpec(targetIndex, SpanAttributes.EMPTY, "", traceFlags));
+  }
+
   private static Map<String, Object> tags(Object... keyValues) {
     Map<String, Object> map = new HashMap<>();
     for (int i = 0; i < keyValues.length; i += 2) {
@@ -441,6 +507,16 @@ static Stream<Arguments> cases() {
                     "attr.linked",
                     0,
                     SpanAttributes.builder().put("link.source", "test").build()))),
+        Arguments.of(
+            "span link with tracestate — Link.trace_state field written",
+            asList(
+                span("anchor.op", "anchor.op", "web"),
+                linkedSpanWithTracestate("tracestate.linked", 0, "vendor=abc;p=123"))),
+        Arguments.of(
+            "span link with non-default flags — extra flag bit preserved alongside SAMPLED",
+            asList(
+                span("anchor.op", "anchor.op", "web"),
+                linkedSpanWithFlags("flags.linked", 0, (byte) 0x02))),
 
         // ── metadata paths ────────────────────────────────────────────────────
         Arguments.of(
@@ -449,6 +525,9 @@ static Stream<Arguments> cases() {
         Arguments.of(
             "span with http status code — http.status_code written via setHttpStatusCode",
             asList(span("GET /resource", "servlet.request", "web").httpStatusCode(404))),
+        Arguments.of(
+            "span with origin — _dd.origin attribute written",
+            asList(span("GET /api", "servlet.request", "web").origin("rum"))),
         Arguments.of(
             "span with 128-bit trace ID — high-order trace_id bytes non-zero",
             asList(span("GET /api", "servlet.request", "web").use128BitTraceId())),
@@ -560,6 +639,17 @@ private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
                 PropagationTags.factory().empty(),
                 TracePropagationStyle.DATADOG);
         agentSpan = TRACER.startSpan("test", spec.operationName, parent128, spec.startMicros);
+      } else if (spec.origin != null) {
+        ExtractedContext parentWithOrigin =
+            new ExtractedContext(
+                DDTraceId.from(1L),
+                0L,
+                PrioritySampling.UNSET,
+                spec.origin,
+                PropagationTags.factory().empty(),
+                TracePropagationStyle.DATADOG);
+        agentSpan =
+            TRACER.startSpan("test", spec.operationName, parentWithOrigin, spec.startMicros);
       } else if (spec.parentIndex >= 0) {
         agentSpan =
             TRACER.startSpan(
@@ -606,13 +696,11 @@ private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
 
       for (LinkSpec link : spec.links) {
         agentSpan.addLink(
-            link.attributes.isEmpty()
-                ? SpanLink.from(spans.get(link.targetIndex).context())
-                : SpanLink.from(
-                    spans.get(link.targetIndex).context(),
-                    SpanLink.DEFAULT_FLAGS,
-                    "",
-                    link.attributes));
+            SpanLink.from(
+                spans.get(link.targetIndex).context(),
+                link.traceFlags,
+                link.traceState,
+                link.attributes));
       }
 
       agentSpan.finish(spec.finishMicros);
@@ -859,6 +947,11 @@ private static void verifySpan(CodedInputStream sp, DDSpan span, SpanSpec spec,
               + caseName
               + "]");
     }
+    if (spec.origin != null) {
+      assertTrue(
+          attrKeys.contains("_dd.origin"),
+          "attributes must include '_dd.origin' when origin is set [" + caseName + "]");
+    }
 
     // ── status (field 15) ─────────────────────────────────────────────────────
     if (spec.error) {
@@ -892,7 +985,9 @@ private static void verifyLink(CodedInputStream link, LinkSpec linkSpec, String
       throws IOException {
     byte[] traceId = null;
     byte[] spanId = null;
+    String parsedTraceState = null;
     Set<String> linkAttrKeys = new HashSet<>();
+    int parsedFlags = 0;
     while (!link.isAtEnd()) {
       int tag = link.readTag();
       switch (WireFormat.getTagFieldNumber(tag)) {
@@ -902,9 +997,15 @@ private static void verifyLink(CodedInputStream link, LinkSpec linkSpec, String
         case 2:
           spanId = link.readBytes().toByteArray();
           break;
+        case 3:
+          parsedTraceState = link.readString();
+          break;
         case 4:
           linkAttrKeys.add(readKeyValueKey(link.readBytes().newCodedInput()));
           break;
+        case 6:
+          parsedFlags = link.readFixed32();
+          break;
         default:
           link.skipField(tag);
       }
@@ -913,6 +1014,14 @@ private static void verifyLink(CodedInputStream link, LinkSpec linkSpec, String
     assertEquals(16, traceId.length, "Link.trace_id must be 16 bytes [" + caseName + "]");
     assertNotNull(spanId, "Link.span_id must be present [" + caseName + "]");
     assertEquals(8, spanId.length, "Link.span_id must be 8 bytes [" + caseName + "]");
+    if (!linkSpec.traceState.isEmpty()) {
+      assertEquals(
+          linkSpec.traceState, parsedTraceState, "Link.trace_state mismatch [" + caseName + "]");
+    }
+    // SpanLink.from() ORs in the SAMPLED_FLAG (0x01) when the target context has positive
+    // sampling priority, which all test anchor spans have via the default tracer sampler.
+    int expectedFlags = Byte.toUnsignedInt((byte) (linkSpec.traceFlags | 0x01));
+    assertEquals(expectedFlags, parsedFlags, "Link.flags mismatch [" + caseName + "]");
     for (String expectedKey : linkSpec.attributes.asMap().keySet()) {
       assertTrue(
           linkAttrKeys.contains(expectedKey),