Refactored processTagsAndBaggage for v1 protocol.

Author: AlexeyKuznetsov-DD

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

@@ -83,7 +83,7 @@ public TraceMapperV1() {
   @Override
   public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
     CoreSpan<?> firstSpan = trace.get(0);
-    firstSpan.processTagsAndBaggage(spanMetadata, false);
+    firstSpan.processTagsAndBaggage(spanMetadata, false, false);
     Metadata firstSpanMeta = spanMetadata.metadata;
 
     // encoded fields: 1..7, but skipping #5, as not required by tracers and set by the agent.
@@ -125,7 +125,7 @@ private void encodeSpans(Writable writable, int fieldId, List<? extends CoreSpan
     Metadata meta = spanMetadata.metadata;
     for (CoreSpan<?> span : spans) {
       if (meta == null) {
-        span.processTagsAndBaggage(spanMetadata, false);
+        span.processTagsAndBaggage(spanMetadata, false, false);
         meta = spanMetadata.metadata;
       }
       TagMap tags = meta.getTags();

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

@@ -91,16 +91,8 @@ default <U> U unsafeGetTag(CharSequence name) {
 
   void processTagsAndBaggage(MetadataConsumer consumer);
 
-  /**
-   * Runs tag/baggage processing with optional serialization of span links into legacy {@code
-   * _dd.span_links} string tag.
-   *
-   * <p>Callers that need structured span links can pass {@code false} and consume links from {@link
-   * Metadata#getSpanLinks()}.
-   */
-  default void processTagsAndBaggage(MetadataConsumer consumer, boolean spanLinksAsTag) {
-    processTagsAndBaggage(consumer);
-  }
+  void processTagsAndBaggage(
+      MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags);
 
   T setSamplingPriority(int samplingPriority, int samplingMechanism);
 

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

@@ -769,12 +769,14 @@ public void processServiceTags() {
 
   @Override
   public void processTagsAndBaggage(final MetadataConsumer consumer) {
-    processTagsAndBaggage(consumer, true);
+    processTagsAndBaggage(consumer);
   }
 
   @Override
-  public void processTagsAndBaggage(final MetadataConsumer consumer, boolean spanLinksAsTag) {
-    context.processTagsAndBaggage(consumer, longRunningVersion, this, spanLinksAsTag);
+  public void processTagsAndBaggage(
+      final MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {
+    context.processTagsAndBaggage(
+        consumer, longRunningVersion, this, injectLinksAsTags, injectBaggageAsTags);
   }
 
   @Override

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

@@ -1172,11 +1172,18 @@ void earlyProcessTags(AppendableSpanLinks links) {
     }
   }
 
+  void processTagsAndBaggage(
+      final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) {
+    processTagsAndBaggage(
+        consumer, longRunningVersion, restrictedSpan, injectLinksAsTags, injectBaggageAsTags);
+  }
+
   void processTagsAndBaggage(
       final MetadataConsumer consumer,
       int longRunningVersion,
       DDSpan restrictedSpan,
-      boolean spanLinksAsTag) {
+      boolean injectLinksAsTags,
+      boolean injectBaggageAsTags) {
     // NOTE: The span is passed for the sole purpose of allowing updating & reading of the span
     // links
     // This is a compromise to avoid...
@@ -1187,7 +1194,7 @@ void processTagsAndBaggage(
       TagsPostProcessorFactory.lazyProcessor().processTags(unsafeTags, this, restrictedSpan);
 
       // Links
-      if (injectLinksAsTags || spanLinksAsTag) {
+      if (injectLinksAsTags) {
         String linksTag = DDSpanLink.toTag(restrictedSpan.getLinks());
         if (linksTag != null) {
           unsafeTags.set(SPAN_LINKS, linksTag);

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy

@@ -222,6 +222,9 @@ class SimpleSpan implements CoreSpan<SimpleSpan> {
   @Override
   void processTagsAndBaggage(MetadataConsumer consumer) {}
 
+  @Override
+  void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {}
+
   @Override
   SimpleSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
     return this

dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceGenerator.groovy

@@ -352,6 +352,11 @@ class TraceGenerator {
       consumer.accept(metadata)
     }
 
+    @Override
+    void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {
+      consumer.accept(metadata)
+    }
+
     @Override
     PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) {
       return this

dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy

@@ -1663,6 +1663,12 @@ class TraceMapperV1PayloadTest extends DDSpecification {
       processTagsAndBaggageCount++
       super.processTagsAndBaggage(consumer)
     }
+
+    @Override
+    void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {
+      processTagsAndBaggageCount++
+      super.processTagsAndBaggage(consumer, injectLinksAsTags, injectBaggageAsTags)
+    }
   }
 
   private static class ByteArrayChannel implements WritableByteChannel {