Added missing baggage. Fixed smoke tests.

Author: AlexeyKuznetsov-DD

dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/AbstractApmTracingDisabledSmokeTest.groovy

@@ -6,6 +6,8 @@ import datadog.trace.test.agent.decoder.DecodedTrace
 
 abstract class AbstractApmTracingDisabledSmokeTest extends AbstractServerSmokeTest {
 
+  protected abstract String traceAgentProtocolVersion()
+
   @Override
   File createTemporaryFile(int processIndex) {
     return null
@@ -32,6 +34,7 @@ abstract class AbstractApmTracingDisabledSmokeTest extends AbstractServerSmokeTe
     List<String> command = []
     command.add(javaPath())
     command.addAll(defaultJavaProperties)
+    command.add("-Ddd.trace.agent.protocol.version=${traceAgentProtocolVersion()}".toString())
     command.addAll(properties)
     command.addAll((String[]) ['-jar', springBootShadowJar, "--server.port=${port}"])
     ProcessBuilder processBuilder = new ProcessBuilder(command)
@@ -57,12 +60,16 @@ abstract class AbstractApmTracingDisabledSmokeTest extends AbstractServerSmokeTe
     }
   }
 
+  protected Object samplingPriority(DecodedTrace trace) {
+    return trace.spans[0].metrics['_sampling_priority_v1']
+  }
+
   protected checkRootSpanPrioritySampling(DecodedTrace trace, byte priority) {
-    return trace.spans[0].metrics['_sampling_priority_v1'] == priority
+    return samplingPriority(trace) == priority
   }
 
   protected isSampledBySampler(DecodedTrace trace) {
-    def samplingPriority = trace.spans[0].metrics['_sampling_priority_v1']
+    def samplingPriority = samplingPriority(trace)
     return samplingPriority == PrioritySampling.SAMPLER_KEEP || samplingPriority == PrioritySampling.SAMPLER_DROP
   }
 

dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledMatrixSmokeTest.groovy

@@ -1,9 +1,10 @@
 package datadog.smoketest.apmtracingdisabled
 
 import datadog.trace.api.sampling.PrioritySampling
+import datadog.trace.test.agent.decoder.DecodedTrace
 import okhttp3.Request
 
-class ApmTracingDisabledMatrixSmokeTest extends AbstractApmTracingDisabledSmokeTest {
+abstract class ApmTracingDisabledMatrixSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
   static final String APM_TRACING_DISABLED_SERVICE_NAME = "apm-tracing-disabled-matrix-smoketest-app"
   static final String APM_TRACING_DISABLED_SERVICE_NAME_2 = "apm-tracing-disabled-matrix-smoketest-app2"
@@ -316,3 +317,22 @@ class ApmTracingDisabledMatrixSmokeTest extends AbstractApmTracingDisabledSmokeT
     standAloneBillingTraceId == downstreamTraceId //There is propagation
   }
 }
+
+class ApmTracingDisabledMatrixSmokeV04Test extends ApmTracingDisabledMatrixSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '0.4'
+  }
+}
+
+class ApmTracingDisabledMatrixSmokeV1Test extends ApmTracingDisabledMatrixSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '1.0'
+  }
+
+  @Override
+  protected Object samplingPriority(DecodedTrace trace) {
+    return trace.samplingPriority
+  }
+}

dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledSamplingSmokeTest.groovy

@@ -1,12 +1,12 @@
 package datadog.smoketest.apmtracingdisabled
 
 import datadog.trace.api.sampling.PrioritySampling
+import datadog.trace.test.agent.decoder.DecodedTrace
 import datadog.trace.test.util.Flaky
 import groovy.json.JsonSlurper
 import okhttp3.Request
 
-@Flaky
-class ApmTracingDisabledSamplingSmokeTest extends AbstractApmTracingDisabledSmokeTest {
+abstract class ApmTracingDisabledSamplingSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
   @Override
   ProcessBuilder createProcessBuilder(){
@@ -135,3 +135,24 @@ class ApmTracingDisabledSamplingSmokeTest extends AbstractApmTracingDisabledSmok
     downstreamHeaders["x-datadog-sampling-priority"] == "2"
   }
 }
+
+@Flaky
+class ApmTracingDisabledSamplingSmokeV04Test extends ApmTracingDisabledSamplingSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '0.4'
+  }
+}
+
+@Flaky
+class ApmTracingDisabledSamplingSmokeV1Test extends ApmTracingDisabledSamplingSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '1.0'
+  }
+
+  @Override
+  protected Object samplingPriority(DecodedTrace trace) {
+    return trace.samplingPriority
+  }
+}

dd-smoke-tests/apm-tracing-disabled/src/test/groovy/datadog/smoketest/apmtracingdisabled/ApmTracingDisabledSmokeTest.groovy

@@ -2,7 +2,7 @@ package datadog.smoketest.apmtracingdisabled
 
 import okhttp3.Request
 
-class ApmTracingDisabledSmokeTest extends AbstractApmTracingDisabledSmokeTest {
+abstract class ApmTracingDisabledSmokeTest extends AbstractApmTracingDisabledSmokeTest {
 
   private static final String APM_TRACING_DISABLED_SERVICE_NAME = "asm-standalone-billing-smoketest-app"
   private static final String APM_ENABLED_SERVICE_NAME = "apm-enabled-smoketest-app"
@@ -91,3 +91,17 @@ class ApmTracingDisabledSmokeTest extends AbstractApmTracingDisabledSmokeTest {
     ]
   }
 }
+
+class ApmTracingDisabledSmokeV04Test extends ApmTracingDisabledSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '0.4'
+  }
+}
+
+class ApmTracingDisabledSmokeV1Test extends ApmTracingDisabledSmokeTest {
+  @Override
+  protected String traceAgentProtocolVersion() {
+    return '1.0'
+  }
+}

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java

@@ -354,6 +354,7 @@ private Long asLong(Object value) {
   private void encodeSpanAttributes(
       Writable writable, int fieldId, Metadata meta, Map<String, Object> metaStruct) {
     TagMap tags = meta.getTags();
+    Map<String, String> baggage = meta.getBaggage();
     String httpStatusCode =
         meta.getHttpStatusCode() == null ? null : meta.getHttpStatusCode().toString();
     boolean writeHttpStatus = httpStatusCode != null && tags.getString(HTTP_STATUS) == null;
@@ -365,7 +366,12 @@ private void encodeSpanAttributes(
     }
 
     writable.writeInt(fieldId);
-    writable.startArray((tagCount + metaStruct.size() + (writeHttpStatus ? 1 : 0)) * 3);
+    writable.startArray(
+        (baggage.size() + tagCount + metaStruct.size() + (writeHttpStatus ? 1 : 0)) * 3);
+
+    for (Map.Entry<String, String> entry : baggage.entrySet()) {
+      writeAttribute(writable, entry.getKey(), entry.getValue());
+    }
 
     for (TagMap.EntryReader entry : tags) {
       if (DDTags.SPAN_EVENTS.equals(entry.tag())) {

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/DecodedTrace.java

@@ -4,4 +4,9 @@
 
 public interface DecodedTrace {
   List<DecodedSpan> getSpans();
+
+  // Payload v1.0 has sampling priority on trace level.
+  default Integer getSamplingPriority() {
+    return null;
+  }
 }

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java

@@ -8,35 +8,11 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import org.msgpack.core.MessageFormat;
 import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageUnpacker;
 import org.msgpack.value.ValueType;
 
-/**
- * MessageV1 decodes V1.0 trace payload format.
- *
- * <p>The V1.0 raw buffer format (from FlushingBuffer.dump()) is a concatenation of traces, where
- * each trace is an array of spans:
- *
- * <pre>
- * [span1, span2, ...]    // trace 1 (array of spans)
- * [span3, span4, ...]    // trace 2 (array of spans)
- * ...
- * </pre>
- *
- * <p>Note: The dump() may include padding (zeros) after the actual data.
- *
- * <p>The full payload format wraps this in a map with field 11 (FIELD_CHUNKS).
- *
- * <p>Key features:
- *
- * <ul>
- *   <li>Integer field IDs instead of string keys
- *   <li>Streaming string encoding (string table)
- *   <li>Attributes as flat array of triplets (key, type, value)
- * </ul>
- */
+/** MessageV1 decodes V1.0 trace payload format. */
 public class MessageV1 implements DecodedMessage {
   // Tracer Payload field IDs
   static final int FIELD_CHUNKS = 11;
@@ -65,7 +41,7 @@ static MessageV1 unpack(MessageUnpacker unpacker) {
       List<DecodedTrace> traces = new ArrayList<>();
 
       if (firstType == ValueType.MAP) {
-        // Full payload format: map with FIELD_CHUNKS containing traces
+        // Full payload format: map with FIELD_CHUNKS containing trace chunks.
         int mapSize = unpacker.unpackMapHeader();
 
         for (int i = 0; i < mapSize; i++) {
@@ -79,24 +55,9 @@ static MessageV1 unpack(MessageUnpacker unpacker) {
             skipPayloadField(unpacker, fieldId, stringTable);
           }
         }
-      } else if (firstType == ValueType.ARRAY) {
-        // Raw buffer format: concatenated traces (each trace is an array of spans)
-        // Read traces one by one until we exhaust the buffer or hit padding
-        while (unpacker.hasNext()) {
-          MessageFormat format = unpacker.getNextFormat();
-          ValueType valueType = format.getValueType();
-
-          // Stop if we hit padding (zeros or other non-array values)
-          if (valueType != ValueType.ARRAY) {
-            break;
-          }
-
-          DecodedTrace trace = TraceV1.unpack(unpacker, stringTable);
-          traces.add(trace);
-        }
       } else {
         throw new IllegalArgumentException(
-            "Expected Map or Array at start of V1.0 payload, got: " + firstType);
+            "Expected Map at start of V1.0 payload, got: " + firstType);
       }
 
       return new MessageV1(traces.toArray(new DecodedTrace[0]));

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java

@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Map;
 import org.msgpack.core.MessageUnpacker;
-import org.msgpack.value.ValueType;
 
 /**
  * TraceV1 represents a decoded trace in V1.0 format.
@@ -34,17 +33,7 @@ public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, List<String>
       }
       DecodedTrace[] traces = new TraceV1[size];
       for (int i = 0; i < size; i++) {
-        ValueType valueType = unpacker.getNextFormat().getValueType();
-        if (valueType == ValueType.ARRAY) {
-          // Legacy expectation: chunks field contains traces directly.
-          traces[i] = unpack(unpacker, stringTable);
-        } else if (valueType == ValueType.MAP) {
-          // Current V1 payload: chunks field contains chunk maps, each with spans in field 4.
-          traces[i] = unpackChunk(unpacker, stringTable);
-        } else {
-          throw new IllegalArgumentException(
-              "Expected trace/chunk entry as ARRAY or MAP, got " + valueType);
-        }
+        traces[i] = unpackChunk(unpacker, stringTable);
       }
       return traces;
     } catch (Throwable t) {
@@ -56,17 +45,6 @@ public static DecodedTrace[] unpackTraces(MessageUnpacker unpacker, List<String>
     }
   }
 
-  /**
-   * Unpacks a single trace (array of spans) from the unpacker.
-   *
-   * @param unpacker the message unpacker
-   * @param stringTable the shared string table for streaming string decoding
-   * @return the decoded trace
-   */
-  public static TraceV1 unpack(MessageUnpacker unpacker, List<String> stringTable) {
-    return new TraceV1(SpanV1.unpackSpans(unpacker, stringTable));
-  }
-
   private static TraceV1 unpackChunk(MessageUnpacker unpacker, List<String> stringTable)
       throws IOException {
     int fieldCount = unpacker.unpackMapHeader();
@@ -102,7 +80,7 @@ private static TraceV1 unpackChunk(MessageUnpacker unpacker, List<String> string
       }
     }
 
-    return new TraceV1(withChunkFields(spans, traceId, samplingPriority));
+    return new TraceV1(withChunkFields(spans, traceId, samplingPriority), samplingPriority);
   }
 
   private static long unpackTraceId(MessageUnpacker unpacker) throws IOException {
@@ -182,9 +160,11 @@ private static void skipAttributes(MessageUnpacker unpacker, List<String> string
   }
 
   private final DecodedSpan[] spans;
+  private final Integer chunkSamplingPriority;
 
-  private TraceV1(DecodedSpan[] spans) {
+  private TraceV1(DecodedSpan[] spans, Integer chunkSamplingPriority) {
     this.spans = spans;
+    this.chunkSamplingPriority = chunkSamplingPriority;
   }
 
   @Override
@@ -194,4 +174,9 @@ public List<DecodedSpan> getSpans() {
     }
     return Collections.unmodifiableList(Arrays.asList(spans));
   }
+
+  @Override
+  public Integer getSamplingPriority() {
+    return chunkSamplingPriority;
+  }
 }