Revert changes to generators and add specialized methods to codex

Author: worldtiki

core/src/main/java/com/expedia/www/haystack/client/idgenerators/RandomUUIDGenerator.java

@@ -22,11 +22,8 @@
 /**
  * Generates UUIDs as ids for Traces and Spans.
  * <p/>
- * Given that the span only needs to be unique within a trace, the UUID for spans will only contain the least
- * significant bits and will be left padded with zeroes.
- * <p/>
  * Consider using the TimeBasedUUIDGenerator which is more performant.
- * <p/>
+ *
  * @see com.expedia.www.haystack.client.idgenerators.TimeBasedUUIDGenerator
  */
 public class RandomUUIDGenerator implements IdGenerator {
@@ -35,9 +32,4 @@ public class RandomUUIDGenerator implements IdGenerator {
     public UUID generate() {
         return UUID.randomUUID();
     }
-
-    @Override
-    public UUID generateSpanId() {
-        return new UUID(0, UUID.randomUUID().getLeastSignificantBits());
-    }
 }

core/src/main/java/com/expedia/www/haystack/client/idgenerators/TimeBasedUUIDGenerator.java

@@ -16,26 +16,17 @@
  */
 package com.expedia.www.haystack.client.idgenerators;
 
-
 import java.util.UUID;
 
 import static com.fasterxml.uuid.Generators.timeBasedGenerator;
 
 /**
  * Generates UUIDs as ids for Traces and Spans.
- * <p/>
- * Given that the span only needs to be unique within a trace, the UUID for spans will only contain the least
- * significant bits and will be left padded with zeroes.
  */
 public class TimeBasedUUIDGenerator implements IdGenerator {
 
     @Override
     public UUID generate() {
         return timeBasedGenerator().generate();
     }
-
-    @Override
-    public UUID generateSpanId() {
-        return new UUID(0, timeBasedGenerator().generate().getLeastSignificantBits());
-    }
 }

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

@@ -40,4 +40,19 @@ public interface Codex<R,T> {
      */
     T decode(R value);
 
+    default T decodeTraceId(R value) {
+        return decode(value);
+    }
+
+    default T decodeSpanId(R value) {
+        return decode(value);
+    }
+
+    default T decodeBaggage(R value) {
+        return decode(value);
+    }
+
+    default T decodeKey(R value) {
+        return decode(value);
+    }
 }

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

@@ -78,18 +78,18 @@ public SpanContext extract(TextMap carrier) {
         final Map<String, String> baggage = new HashMap<>();
 
         for (Map.Entry<String, String> entry : carrier) {
-            final String decodedKey = keyCodex.decode(entry.getKey());
+            final String decodedKey = keyCodex.decodeKey(entry.getKey());
             final String decodedKeyLowerCase = decodedKey.toLowerCase();
 
             if (decodedKeyLowerCase.startsWith(convention.baggagePrefix().toLowerCase(Locale.ROOT))) {
                 baggage.put(decodedKey.substring(convention.baggagePrefix().length()),
-                            valueCodex.decode(entry.getValue()));
+                            valueCodex.decodeBaggage(entry.getValue()));
             } else if (containsIgnoreCase(convention.traceIdKeyAliases(), decodedKeyLowerCase)) {
-                traceId = valueCodex.decode(entry.getValue());
+                traceId = valueCodex.decodeTraceId(entry.getValue());
             } else if (containsIgnoreCase(convention.parentIdKeyAliases(), decodedKeyLowerCase)) {
-                parentId = valueCodex.decode(entry.getValue());
+                parentId = valueCodex.decodeSpanId(entry.getValue());
             } else if (containsIgnoreCase(convention.spanIdKeyAliases(), decodedKeyLowerCase)) {
-                spanId = valueCodex.decode(entry.getValue());
+                spanId = valueCodex.decodeSpanId(entry.getValue());
             }
         }