1st attempt at unit test

Author: mhlidd

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java

@@ -23,7 +23,7 @@ public class OtelContext implements Context {
 
   private static final String OTEL_CONTEXT_SPAN_KEY = "opentelemetry-trace-span-key";
   private static final String OTEL_CONTEXT_ROOT_SPAN_KEY = "opentelemetry-traces-local-root-span";
-  private static final String OTEL_CONTEXT_BAGGAGE_KEY = "opentelemetry-baggage";
+  private static final String OTEL_CONTEXT_BAGGAGE_KEY = "opentelemetry-baggage-key";
 
   /** Keep track of propagated context that has not been captured on the scope stack. */
   private static final ThreadLocal<OtelContext> lastPropagated = new ThreadLocal<>();
@@ -42,7 +42,8 @@ public OtelContext(Span currentSpan, Span rootSpan, BaggageContext baggageContex
     this(currentSpan, rootSpan, baggageContext, NO_ENTRIES);
   }
 
-  public OtelContext(Span currentSpan, Span rootSpan, BaggageContext baggageContext, Object[] entries) {
+  public OtelContext(
+      Span currentSpan, Span rootSpan, BaggageContext baggageContext, Object[] entries) {
     this.currentSpan = currentSpan;
     this.rootSpan = rootSpan;
     this.baggageContext = baggageContext;
@@ -57,7 +58,7 @@ public <V> V get(ContextKey<V> key) {
       return (V) this.currentSpan;
     } else if (OTEL_CONTEXT_ROOT_SPAN_KEY.equals(key.toString())) {
       return (V) this.rootSpan;
-    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())){
+    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
       return (V) this.baggageContext;
     }
     for (int i = 0; i < this.entries.length; i += 2) {
@@ -74,7 +75,7 @@ public <V> Context with(ContextKey<V> key, V value) {
       return new OtelContext((Span) value, this.rootSpan, null, this.entries);
     } else if (OTEL_CONTEXT_ROOT_SPAN_KEY.equals(key.toString())) {
       return new OtelContext(this.currentSpan, (Span) value, null, this.entries);
-    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())){
+    } else if (OTEL_CONTEXT_BAGGAGE_KEY.equals(key.toString())) {
       return new OtelContext(null, null, this.baggageContext, this.entries);
     }
     Object[] newEntries = null;
@@ -170,7 +171,7 @@ public static Context lastPropagated() {
     return lastPropagated.get();
   }
 
-  public static String getOtelContextBaggageKey(){
+  public static String getOtelContextBaggageKey() {
     return OTEL_CONTEXT_BAGGAGE_KEY;
   }
 

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java

@@ -3,7 +3,6 @@
 import static datadog.context.propagation.Propagators.defaultPropagator;
 import static datadog.opentelemetry.shim.trace.OtelSpanContext.fromRemote;
 import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
-import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 
 import datadog.context.propagation.Propagators;
 import datadog.opentelemetry.shim.context.OtelContext;
@@ -16,7 +15,6 @@
 import datadog.trace.bootstrap.instrumentation.api.BaggageContext;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.util.PropagationUtils;
-import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.TraceState;
@@ -51,19 +49,25 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
       return context;
     }
 
-    datadog.context.Context extracted = Propagators.defaultPropagator().extract(datadog.context.Context.root(), carrier, (carrier1, classifier) -> {
-      for (String key : getter.keys(carrier1)) {
-        classifier.accept(key, getter.get(carrier1, key));
-      }
-    });
+    datadog.context.Context extracted =
+        Propagators.defaultPropagator()
+            .extract(
+                datadog.context.Context.root(),
+                carrier,
+                (carrier1, classifier) -> {
+                  for (String key : getter.keys(carrier1)) {
+                    classifier.accept(key, getter.get(carrier1, key));
+                  }
+                });
     if (extracted == null) {
       return context;
-    }else{
+    } else {
       AgentSpan extractedSpan = AgentSpan.fromContext(extracted);
-      Extracted extractedSpanContext = extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context();
+      Extracted extractedSpanContext =
+          extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context();
 
       SpanContext spanContext = null;
-      if (extractedSpanContext != null){
+      if (extractedSpanContext != null) {
         TraceState traceState = extractTraceState(extractedSpanContext, carrier, getter);
         spanContext = fromRemote(extractedSpanContext, traceState);
       }
@@ -78,7 +82,11 @@ private static datadog.context.Context convertContext(Context context) {
     // context if baggage
     AgentSpanContext extract = OtelExtractedContext.extract(context);
     AgentSpan agentSpan = AgentSpan.fromSpanContext(extract);
-    return agentSpan.with(BaggageContext.getContextKey(), context.get(ContextKey.named(OtelContext.getOtelContextBaggageKey())));
+    datadog.context.Context c =
+        agentSpan.with(
+            BaggageContext.getContextKey(),
+            context.get(ContextKey.named(OtelContext.getOtelContextBaggageKey())));
+    return c;
   }
 
   /**

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/groovy/opentelemetry14/context/propagation/BaggagePropagatorTest.groovy

@@ -0,0 +1,39 @@
+package opentelemetry14.context.propagation
+
+
+import datadog.trace.api.DDTraceId
+
+import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP
+import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP
+import static datadog.trace.api.sampling.PrioritySampling.UNSET
+import static java.lang.Long.parseLong
+
+class BaggagePropagatorTest extends AgentPropagatorTest {
+  @Override
+  String style() {
+    return 'baggage'
+  }
+
+  def values() {
+    // spotless:off
+    return [
+      [["baggage": "key1=val1,key2=val2,foo=bar"], '00000000000000001111111111111111', '2222222222222222', UNSET],
+    ]
+    // spotless:on
+  }
+
+  void assertInjectedHeaders(Map<String, String> headers, String traceId, String spanId, byte sampling) {
+    assert headers['x-datadog-trace-id'] == Long.toString(DDTraceId.fromHex(traceId).toLong())
+    assert headers['x-datadog-parent-id'] == spanId.replaceAll('^0+(?!$)', '')
+    def tags = []
+    def samplingPriority = sampling == SAMPLER_DROP ? '0' : '1' // Deterministic sampler with rate to 1 if not explicitly dropped
+    if (sampling == UNSET) {
+      tags+= '_dd.p.dm=-1'
+    }
+    if (traceId.length() == 32) {
+      tags+= '_dd.p.tid='+ traceId.substring(0, 16)
+    }
+    assert headers['x-datadog-tags'] == tags.join(',')
+    assert headers['x-datadog-sampling-priority'] == samplingPriority
+  }
+}

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BaggageContext.java

@@ -63,7 +63,7 @@ public Map<String, String> asMap() {
     return new HashMap<>(baggage);
   }
 
-  public static ContextKey<BaggageContext> getContextKey(){
+  public static ContextKey<BaggageContext> getContextKey() {
     return CONTEXT_KEY;
   }