Added support for 128bit to B3 decoder (jaegertracing#144)

Author: Falco20019

src/Jaeger/Propagation/B3TextMapCodec.cs

@@ -27,13 +27,13 @@ public class B3TextMapCodec : Codec<ITextMap>
 
         protected override void Inject(SpanContext spanContext, ITextMap carrier)
         {
-            carrier.Set(TraceIdName, HexCodec.ToLowerHex(spanContext.TraceId.High, spanContext.TraceId.Low));
+            carrier.Set(TraceIdName, spanContext.TraceId.ToString());
             if (spanContext.ParentId != 0L)
             {
                 // Conventionally, parent id == 0 means the root span
-                carrier.Set(ParentSpanIdName, HexCodec.ToLowerHex(spanContext.ParentId));
+                carrier.Set(ParentSpanIdName, spanContext.ParentId.ToString());
             }
-            carrier.Set(SpanIdName, HexCodec.ToLowerHex(spanContext.SpanId));
+            carrier.Set(SpanIdName, spanContext.SpanId.ToString());
             carrier.Set(SampledName, spanContext.IsSampled ? "1" : "0");
             if (spanContext.IsDebug)
             {
@@ -43,9 +43,9 @@ protected override void Inject(SpanContext spanContext, ITextMap carrier)
 
         protected override SpanContext Extract(ITextMap carrier)
         {
-            long? traceId = null;
-            long? spanId = null;
-            long? parentId = 0L; // Conventionally, parent id == 0 means the root span
+            TraceId? traceId = null;
+            SpanId? spanId = null;
+            SpanId parentId = new SpanId(0); // Conventionally, parent id == 0 means the root span
             SpanContextFlags flags = SpanContextFlags.None;
 
             foreach (var entry in carrier)
@@ -60,15 +60,15 @@ protected override SpanContext Extract(ITextMap carrier)
                 }
                 else if (string.Equals(entry.Key, TraceIdName, StringComparison.OrdinalIgnoreCase))
                 {
-                    traceId = HexCodec.LowerHexToUnsignedLong(entry.Value);
+                    traceId = TraceId.FromString(entry.Value);
                 }
                 else if (string.Equals(entry.Key, ParentSpanIdName, StringComparison.OrdinalIgnoreCase))
                 {
-                    parentId = HexCodec.LowerHexToUnsignedLong(entry.Value);
+                    parentId = SpanId.FromString(entry.Value);
                 }
                 else if (string.Equals(entry.Key, SpanIdName, StringComparison.OrdinalIgnoreCase))
                 {
-                    spanId = HexCodec.LowerHexToUnsignedLong(entry.Value);
+                    spanId = SpanId.FromString(entry.Value);
                 }
                 else if (string.Equals(entry.Key, FlagsName, StringComparison.OrdinalIgnoreCase))
                 {
@@ -79,9 +79,9 @@ protected override SpanContext Extract(ITextMap carrier)
                 }
             }
 
-            if (traceId != null && parentId != null && spanId != null)
+            if (traceId != null && spanId != null)
             {
-                return new SpanContext(new TraceId(traceId.Value), new SpanId(spanId.Value), new SpanId(parentId.Value), flags);
+                return new SpanContext(traceId.Value, spanId.Value, parentId, flags);
             }
             return null;
         }

src/Jaeger/Propagation/HexCodec.cs

@@ -138,7 +138,7 @@ public SpanContext WithFlags(SpanContextFlags flags)
 
         /// <summary>
         /// Returns <c>true</c> when the instance of the context is only used to return the debug/correlation ID
-        /// from <see cref="ITracer.Extract"/> method. This happens in the situation when "jaeger-debug-id" header is passed in
+        /// from <see cref="ITracer.Extract{TCarrier}"/> method. This happens in the situation when "jaeger-debug-id" header is passed in
         /// the carrier to the extract method, but the request otherwise has no span context in it.
         /// Previously this would've returned <c>null</c> from the extract method, but now it returns a dummy
         /// context with only debugId filled in.

src/Jaeger/SpanContext.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Jaeger.Propagation;
 using OpenTracing.Propagation;
@@ -28,10 +29,7 @@ public void ShouldFallbackWhenMaliciousInput(string headerName, string malicious
         {
             ITextMap maliciousCarrier = ValidHeaders();
             maliciousCarrier.Set(headerName, maliciousInput);
-            //when
-            SpanContext extract = _sut.Extract(maliciousCarrier);
-            //then
-            Assert.Null(extract);
+            Assert.ThrowsAny<Exception>(() => _sut.Extract(maliciousCarrier));
         }
 
         private ITextMap ValidHeaders()

test/Jaeger.Tests/Propagation/B3TextMapCodecResiliencyTests.cs

@@ -1,40 +1,57 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using Jaeger.Propagation;
 using OpenTracing.Propagation;
 using Xunit;
 
 namespace Jaeger.Tests.Propagation
 {
-    /**
-     * NOTE:
-     * These tests are based on the ones from jaeger-b3, and included to improve the test
-     * coverage. The main testing of the B3TextMapCodec is still performed via the tests
-     * in the jaeger-b3 module.
-     *
-     */
     public class B3TextMapCodecTest
     {
         B3TextMapCodec b3Codec = new B3TextMapCodec();
 
         [Fact]
-        public void Downgrades128BitTraceIdToLower64Bits()
+        public void Supports64BitTraceId()
+        {
+            string upper64Bits = "463ac35c9f6413ad";
+            string lower64Bits = "48485a3953bb6124";
+
+            DelegatingTextMap textMap = new DelegatingTextMap();
+            textMap.Set(B3TextMapCodec.TraceIdName, upper64Bits);
+            textMap.Set(B3TextMapCodec.SpanIdName, lower64Bits);
+            textMap.Set(B3TextMapCodec.ParentSpanIdName, "0");
+            textMap.Set(B3TextMapCodec.SampledName, "1");
+            textMap.Set(B3TextMapCodec.FlagsName, "1");
+
+            SpanContext context = b3Codec.Extract(textMap);
+
+            Assert.Equal(0L, context.TraceId.High);
+            Assert.Equal(long.Parse(upper64Bits, NumberStyles.HexNumber), context.TraceId.Low);
+            Assert.Equal(long.Parse(lower64Bits, NumberStyles.HexNumber), context.SpanId);
+            Assert.Equal(new SpanId(0), context.ParentId);
+            Assert.True(context.Flags.HasFlag(SpanContextFlags.Sampled));
+            Assert.True(context.Flags.HasFlag(SpanContextFlags.Debug));
+        }
+
+        [Fact]
+        public void Supports128BitTraceId()
         {
             string hex128Bits = "463ac35c9f6413ad48485a3953bb6124";
+            string upper64Bits = "463ac35c9f6413ad";
             string lower64Bits = "48485a3953bb6124";
 
             DelegatingTextMap textMap = new DelegatingTextMap();
             textMap.Set(B3TextMapCodec.TraceIdName, hex128Bits);
             textMap.Set(B3TextMapCodec.SpanIdName, lower64Bits);
-            textMap.Set(B3TextMapCodec.ParentSpanIdName, "0");
             textMap.Set(B3TextMapCodec.SampledName, "1");
             textMap.Set(B3TextMapCodec.FlagsName, "1");
 
             SpanContext context = b3Codec.Extract(textMap);
 
-            //Assert.NotNull(HexCodec.LowerHexToUnsignedLong(lower64Bits));
-            Assert.Equal(HexCodec.LowerHexToUnsignedLong(lower64Bits), context.TraceId.Low);
-            Assert.Equal(HexCodec.LowerHexToUnsignedLong(lower64Bits), context.SpanId);
+            Assert.Equal(long.Parse(upper64Bits, NumberStyles.HexNumber), context.TraceId.High);
+            Assert.Equal(long.Parse(lower64Bits, NumberStyles.HexNumber), context.TraceId.Low);
+            Assert.Equal(long.Parse(lower64Bits, NumberStyles.HexNumber), context.SpanId);
             Assert.Equal(new SpanId(0), context.ParentId);
             Assert.True(context.Flags.HasFlag(SpanContextFlags.Sampled));
             Assert.True(context.Flags.HasFlag(SpanContextFlags.Debug));