Fixing binary propagation (#130)

opentracing · Aug 7, 2019 · a3d9912 · a3d9912
1 parent 15cfeeb
commit a3d9912
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/global.json b/global.json
diff --git a/src/OpenTracing/Mock/Propagators.cs b/src/OpenTracing/Mock/Propagators.cs
@@ -75,20 +75,18 @@ public MockSpanContext Extract<TCarrier>(IFormat<TCarrier> format, TCarrier carr
 
         public MemoryStream Serialize(BinaryContext ctx)
         {
-            using (var ms = new MemoryStream())
+            var ms = new MemoryStream();
+            using (var writer = new BinaryWriter(ms, System.Text.Encoding.UTF8, true))
             {
-                using (var writer = new BinaryWriter(ms))
-                {
-                    writer.Write(ctx.SpanId);
-                    writer.Write(ctx.TraceId);
-                }
-
-                return ms;
+                writer.Write(ctx.SpanId);
+                writer.Write(ctx.TraceId);
             }
+            return ms;
         }
 
         public BinaryContext Deserialize(MemoryStream stream)
         {
+            stream.Position = 0;
             var res = new BinaryContext();
             using (var reader = new BinaryReader(stream))
             {

diff --git a/src/OpenTracing/Propagation/BinaryExtractAdapter.cs b/src/OpenTracing/Propagation/BinaryExtractAdapter.cs
@@ -12,7 +12,7 @@ namespace OpenTracing.Propagation
     /// <seealso cref="ITracer.Extract{TCarrier}"/>
     public class BinaryExtractAdapter : IBinary
     {
-        private readonly MemoryStream _stream;
+        private MemoryStream _stream;
 
         public BinaryExtractAdapter(MemoryStream stream)
         {

diff --git a/src/OpenTracing/Propagation/BinaryInjectAdapter.cs b/src/OpenTracing/Propagation/BinaryInjectAdapter.cs
@@ -19,7 +19,8 @@ public BinaryInjectAdapter(MemoryStream stream)
         /// <inheritdoc />
         public void Set(MemoryStream stream)
         {
-            _stream = stream;
+            stream.Position = 0;
+            stream.CopyTo(_stream);
         }
 
         /// <inheritdoc />

diff --git a/test/OpenTracing.Tests/Mock/MockTracerTests.cs b/test/OpenTracing.Tests/Mock/MockTracerTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using OpenTracing.Mock;
@@ -132,6 +133,27 @@ public void TestStartExplicitTimestamp()
             Assert.Equal(startTimestamp, finishedSpans[0].StartTimestamp);
         }
 
+        [Fact]
+        public void TestBinaryPropagator()
+        {
+            MockTracer tracer = new MockTracer(propagator: Propagators.Binary);
+            var parentSpan = tracer.BuildSpan("foo").Start();
+            parentSpan.Finish();
+            var ms = new MemoryStream();
+            tracer.Inject(parentSpan.Context, BuiltinFormats.Binary, new BinaryInjectAdapter(ms));
+
+            var sc = tracer.Extract(BuiltinFormats.Binary, new BinaryExtractAdapter(ms));
+
+            var childSpan = tracer.BuildSpan("bar").AsChildOf(sc).Start();
+            childSpan.Finish();
+
+            var finishedSpans = tracer.FinishedSpans();
+
+            Assert.Equal(2, finishedSpans.Count);
+            Assert.Equal(finishedSpans[0].Context.TraceId, finishedSpans[1].Context.TraceId);
+            Assert.Equal(finishedSpans[0].Context.SpanId, finishedSpans[1].ParentId);
+        }
+
         [Fact]
         public void TestTextMapPropagatorTextMap()
         {