Fix LongIdGenerator not being properly supported (#106)

* Replace hardcoded spanId generation with the "idGenerator" provided in "tracer"

* Stop converting traceId, spanId and parentId to UUID's

Author: amcghie

core/src/main/java/com/expedia/www/haystack/client/Tracer.java

@@ -324,7 +324,7 @@ protected SpanContext createDependentContext() {
             }
 
             return createContext(parent.getContext().getTraceId(),
-                    UUID.randomUUID(),
+                    tracer.idGenerator.generate(),
                     parent.getContext().getSpanId(),
                     baggage);
         }

core/src/main/java/com/expedia/www/haystack/client/propagation/TextMapPropagator.java

@@ -98,10 +98,7 @@ public SpanContext extract(TextMap carrier) {
             return null;
         }
 
-        SpanContext context = new SpanContext(UUID.fromString(traceId),
-                                              UUID.fromString(spanId),
-                                              parentId == null ? null : UUID.fromString(parentId),
-                                              true);
+        SpanContext context = new SpanContext(traceId, spanId, parentId, true);
         return context.addBaggage(baggage);
     }
 

core/src/test/java/com/expedia/www/haystack/client/TracerPropagationTest.java

@@ -36,7 +36,7 @@ public class TracerPropagationTest {
     private Tracer tracer;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         tracer = new Tracer.Builder(new NoopMetricsRegistry(), "TestTracer", new NoopDispatcher()).build();
     }
 
@@ -46,7 +46,7 @@ public void testInjectInvalidFormat() {
         UUID spanId = UUID.randomUUID();
         UUID parentId = UUID.randomUUID();
 
-        String carrier = new String();
+        String carrier = "";
 
         SpanContext context = new SpanContext(traceId, spanId, parentId).addBaggage("TEST", "TEXT");
 
@@ -112,9 +112,9 @@ public void testExtract() {
 
         SpanContext context = tracer.extract(Format.Builtin.TEXT_MAP, carrier);
 
-        Assert.assertEquals(context.getTraceId(), traceId);
-        Assert.assertEquals(context.getSpanId(), spanId);
-        Assert.assertEquals(context.getParentId(), parentId);
+        Assert.assertEquals(context.getTraceId(), traceId.toString());
+        Assert.assertEquals(context.getSpanId(), spanId.toString());
+        Assert.assertEquals(context.getParentId(), parentId.toString());
         Assert.assertEquals(context.getBaggage().size(), 1);
         Assert.assertEquals(context.getBaggageItem("TEST"), "TEXT");
     }
@@ -137,9 +137,9 @@ public void testExtractIgnoreUnknowns() {
 
         SpanContext context = tracer.extract(Format.Builtin.HTTP_HEADERS, carrier);
 
-        Assert.assertEquals(context.getTraceId(), traceId);
-        Assert.assertEquals(context.getSpanId(), spanId);
-        Assert.assertEquals(context.getParentId(), parentId);
+        Assert.assertEquals(context.getTraceId(), traceId.toString());
+        Assert.assertEquals(context.getSpanId(), spanId.toString());
+        Assert.assertEquals(context.getParentId(), parentId.toString());
         Assert.assertEquals(context.getBaggage().size(), 0);
     }
 
@@ -176,9 +176,9 @@ public void testExtractURLEncoded() {
 
         SpanContext context = tracer.extract(Format.Builtin.HTTP_HEADERS, carrier);
 
-        Assert.assertEquals(context.getTraceId(), traceId);
-        Assert.assertEquals(context.getSpanId(), spanId);
-        Assert.assertEquals(context.getParentId(), parentId);
+        Assert.assertEquals(context.getTraceId(), traceId.toString());
+        Assert.assertEquals(context.getSpanId(), spanId.toString());
+        Assert.assertEquals(context.getParentId(), parentId.toString());
         Assert.assertEquals(context.getBaggage().size(), 2);
         Assert.assertEquals(context.getBaggageItem("TEST"), "!@##*^ %^&&(*");
         Assert.assertEquals(context.getBaggageItem("!@##*^ %^&&(*"), "TEST");

core/src/test/java/com/expedia/www/haystack/client/propagation/TextMapPropagatorTest.java

@@ -6,6 +6,7 @@
 import org.junit.Test;
 
 public class TextMapPropagatorTest {
+
     @Test
     public void propagatorExtractsSpanContextIdentitiesAsExpected() {
         final KeyConvention keyConvention = new DefaultKeyConvention();
@@ -26,6 +27,56 @@ public void propagatorExtractsSpanContextIdentitiesAsExpected() {
                             "3a0bc1c1-504f-4f5d-907b-9b4522453bcf", spanContext.getParentId().toString());
     }
 
+    @Test
+    public void propagatorExtractsNonUUIDSpanContextIdentitiesAsExpected() {
+        final KeyConvention keyConvention = new DefaultKeyConvention();
+        final TextMapPropagator propagator = new TextMapPropagator.Builder().withKeyConvention(keyConvention).build();
+        final MapBackedTextMap carrier = new MapBackedTextMap();
+
+        carrier.put(keyConvention.traceIdKey(), "1234");
+        carrier.put(keyConvention.spanIdKey(), "5678");
+        carrier.put(keyConvention.parentIdKey(), "9012");
+
+        final SpanContext spanContext = propagator.extract(carrier);
+
+        Assert.assertEquals("trace-id was not extracted correctly",
+                "1234", spanContext.getTraceId().toString());
+        Assert.assertEquals("span-id was not extracted correctly",
+                "5678", spanContext.getSpanId().toString());
+        Assert.assertEquals("parent-id was not extracted correctly",
+                "9012", spanContext.getParentId().toString());
+    }
+
+    @Test
+    public void nullSpanContextIsReturnedIfTraceIdIsNull() {
+        final KeyConvention keyConvention = new DefaultKeyConvention();
+        final TextMapPropagator propagator = new TextMapPropagator.Builder().withKeyConvention(keyConvention).build();
+        final MapBackedTextMap carrier = new MapBackedTextMap();
+
+        carrier.put(keyConvention.traceIdKey(), null);
+        carrier.put(keyConvention.spanIdKey(), "5678");
+        carrier.put(keyConvention.parentIdKey(), "9012");
+
+        final SpanContext spanContext = propagator.extract(carrier);
+
+        Assert.assertNull("Expected a null spanContext", spanContext);
+    }
+
+    @Test
+    public void nullSpanContextIsReturnedIfSpanIdIsNull() {
+        final KeyConvention keyConvention = new DefaultKeyConvention();
+        final TextMapPropagator propagator = new TextMapPropagator.Builder().withKeyConvention(keyConvention).build();
+        final MapBackedTextMap carrier = new MapBackedTextMap();
+
+        carrier.put(keyConvention.traceIdKey(), "1234");
+        carrier.put(keyConvention.spanIdKey(), null);
+        carrier.put(keyConvention.parentIdKey(), "9012");
+
+        final SpanContext spanContext = propagator.extract(carrier);
+
+        Assert.assertNull("Expected a null spanContext", spanContext);
+    }
+
     @Test
     public void propagatorExtractsSpanContextIdentitiesAsExpectedRegardlessOfCase() {
         final KeyConvention keyConvention = new DefaultKeyConvention();