changing test cases to support id generator (#109)

* changing test cases to support id generator

* removing unneccesary imports

* adding test case to test id propagation for span

* Update SpanBuilderTest.java

Author: nsahai8

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

@@ -25,6 +25,8 @@
 import io.opentracing.propagation.Format;
 import io.opentracing.tag.Tags;
 import java.util.Map;
+import java.util.UUID;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +49,6 @@ public void testBasic() {
         Assert.assertEquals("test-operation", span.getOperationName());
     }
 
-
     @Test
     public void testReferences() {
         Span parent = tracer.buildSpan("parent").start();
@@ -218,4 +219,15 @@ public void testWithTags() {
         Assert.assertTrue(tags.containsKey("number-key"));
         Assert.assertEquals(1L, tags.get("number-key"));
     }
+
+    @Test
+    public void testLongIdPropagationThroughoutTheTrace() {
+        Span parent = tracer.buildSpan("parent").start();
+        Span following = tracer.buildSpan("following").start();
+        Span child = tracer.buildSpan("child")
+                .asChildOf(parent)
+                .addReference(References.FOLLOWS_FROM, following.context())
+                .start();
+        Assert.assertTrue(child.context().getSpanId().getClass() == Long.class);
+    }
 }

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

@@ -18,8 +18,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
+import com.expedia.www.haystack.client.idgenerators.IdGenerator;
+import com.expedia.www.haystack.client.idgenerators.RandomUUIDGenerator;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,9 +43,10 @@ public void setUp() {
 
     @Test(expected=IllegalArgumentException.class)
     public void testInjectInvalidFormat() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         String carrier = "";
 
@@ -53,11 +55,13 @@ public void testInjectInvalidFormat() {
         tracer.inject(context, new Format<String>() {}, carrier);
     }
 
+
     @Test
     public void testInject() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         TextMap carrier = new TextMapInjectAdapter(carrierValues);
@@ -76,9 +80,10 @@ public void testInject() {
 
     @Test
     public void testInjectURLEncoded() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         TextMap carrier = new TextMapInjectAdapter(carrierValues);
@@ -98,9 +103,10 @@ public void testInjectURLEncoded() {
 
     @Test
     public void testExtract() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         carrierValues.put("Baggage-TEST", "TEXT");
@@ -119,11 +125,13 @@ public void testExtract() {
         Assert.assertEquals(context.getBaggageItem("TEST"), "TEXT");
     }
 
+
     @Test
     public void testExtractIgnoreUnknowns() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         carrierValues.put("Trace-ID", traceId.toString());
@@ -145,8 +153,9 @@ public void testExtractIgnoreUnknowns() {
 
     @Test
     public void testExtractInvalid() {
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         carrierValues.put("Span-ID", spanId.toString());
@@ -159,11 +168,13 @@ public void testExtractInvalid() {
         Assert.assertEquals(context, null);
     }
 
+
     @Test
     public void testExtractURLEncoded() {
-        UUID traceId = UUID.randomUUID();
-        UUID spanId = UUID.randomUUID();
-        UUID parentId = UUID.randomUUID();
+        IdGenerator idGenerator = new RandomUUIDGenerator();
+        Object traceId = idGenerator.generate();
+        Object spanId = idGenerator.generate();
+        Object parentId = idGenerator.generate();
 
         Map<String, String> carrierValues = new HashMap<>();
         carrierValues.put("Baggage-TEST", "!%40%23%23*%5E%20%25%5E%26%26(*");

core/src/test/java/com/expedia/www/haystack/client/dispatchers/clients/HttpCollectorClientTest.java

@@ -21,6 +21,7 @@
 import com.expedia.www.haystack.client.SpanContext;
 import com.expedia.www.haystack.client.Tracer;
 import com.expedia.www.haystack.client.dispatchers.InMemoryDispatcher;
+import com.expedia.www.haystack.client.idgenerators.RandomUUIDGenerator;
 import com.expedia.www.haystack.client.metrics.NoopMetricsRegistry;
 import com.expedia.www.haystack.remote.clients.ClientException;
 import org.apache.http.ProtocolVersion;
@@ -46,8 +47,8 @@ public class HttpCollectorClientTest {
 
     private Tracer tracer;
     private final static String serviceName = "dummy-service";
-    private final static UUID traceId = UUID.randomUUID();
-    private final static UUID spanId = UUID.randomUUID();
+    private final static Object traceId = new RandomUUIDGenerator().generate();
+    private final static Object spanId = new RandomUUIDGenerator().generate();
     private final static SpanContext spanContext = new SpanContext(traceId, spanId, null);
 
     @Before