testing

Author: mhlidd

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -229,7 +229,7 @@ public final class ConfigDefaults {
   static final int DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE = 100000;
 
   static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
-  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = false;
+  static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;
   static final boolean DEFAULT_SECURE_RANDOM = false;
 
   public static final int DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH = 512;

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

@@ -75,6 +75,7 @@ public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span
     writer.name("meta");
     writer.beginObject();
     final Map<String, Object> tags = span.getTags();
+    System.out.println("Writing tags!!!");
     for (final Map.Entry<String, String> entry : span.context().getBaggageItems().entrySet()) {
       if (!tags.containsKey(entry.getKey())) {
         writer.name(entry.getKey());
@@ -83,6 +84,8 @@ public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span
     }
     for (final Map.Entry<String, Object> entry : tags.entrySet()) {
       if (!(entry.getValue() instanceof Number)) {
+        System.out.println("key: " + entry.getKey());
+        System.out.println("value: " + String.valueOf(entry.getValue()));
         writer.name(entry.getKey());
         writer.value(String.valueOf(entry.getValue()));
       }

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

@@ -710,6 +710,7 @@ public CharSequence getType() {
 
   @Override
   public void processTagsAndBaggage(final MetadataConsumer consumer) {
+    System.out.println("Context.toString(): " + context.toString());
     context.processTagsAndBaggage(consumer, longRunningVersion, links);
   }
 

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

@@ -367,7 +367,9 @@ public DDSpanContext(
         propagationTags != null
             ? propagationTags
             : traceCollector.getTracer().getPropagationTagsFactory().empty();
-    this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
+    if (parentId == 0) { // higher bits of traceID are only used in root span
+      this.propagationTags.updateTraceIdHighOrderBits(this.traceId.toHighOrderLong());
+    }
     this.injectBaggageAsTags = injectBaggageAsTags;
     if (origin != null) {
       setOrigin(origin);
@@ -766,6 +768,8 @@ void setAllTags(final Map<String, ?> map) {
   }
 
   void unsafeSetTag(final String tag, final Object value) {
+    //    System.out.println("Tag: " + tag);
+    //    System.out.println("Value: " + value);
     unsafeTags.put(tag, value);
   }
 

dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy

@@ -23,6 +23,7 @@ class DDSpanContextTest extends DDCoreSpecification {
   def profilingContextIntegration
 
   def setup() {
+    injectSysConfig("trace.128.bit.traceid.generation.enabled", "true")
     writer = new ListWriter()
     profilingContextIntegration = Mock(ProfilingContextIntegration)
     tracer = tracerBuilder().writer(writer)
@@ -285,6 +286,24 @@ class DDSpanContextTest extends DDCoreSpecification {
     span.context.encodedResourceName == -2
   }
 
+  def "higher order bits of 128bit traceID is only set as PTag in root span"() {
+    when:
+    def parent = tracer.buildSpan("fakeOperation")
+      .withServiceName("fakeService")
+      .withResourceName("fakeResource")
+      .start()
+
+    def child = tracer.buildSpan("fakeOperation")
+      .withServiceName("fakeService")
+      .withResourceName("fakeResource")
+      .asChildOf(parent)
+      .start()
+
+    then:
+    parent.context().getPropagationTags().getTraceIdHighOrderBits() != 0
+    //    child.context().getPropagationTags().getTraceIdHighOrderBits() == 0
+  }
+
   private static String dataTag(String tag) {
     "_dd.${tag}.json"
   }