serialize status restore fix

basis-company · Feb 13, 2020 · 8d835c5 · 8d835c5
1 parent 44df6b7
commit 8d835c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/src/Exporter/BasisExporter.php b/src/Exporter/BasisExporter.php
@@ -38,6 +38,10 @@ public function restoreSpan(array $source): Span
 
         $span->setInterval($start, $end);
 
+        if ($end !== null && !$span->getStatus()) {
+            $span->setStatus(new Status(Status::OK));
+        }
+
         if ($statusCode) {
             $span->setStatus(new Status($statusCode));
         }

diff --git a/tests/TracingTest.php b/tests/TracingTest.php
@@ -249,24 +249,8 @@ public function testBasisConverter()
 
         $exporter = new BasisExporter();
         $row = $exporter->convertSpan($span);
-        $this->assertSame($row['traceId'], $span->getSpanContext()->getTraceId());
-        $this->assertSame($row['spanId'], $span->getSpanContext()->getSpanId());
-        $this->assertSame($row['parentSpanId'], $span->getParentSpanContext()->getSpanId());
-
-        $this->assertNotNull($row['body']);
-        $unserialized = unserialize($row['body']);
-        $this->assertSame($unserialized->getName(), $span->getName());
-        $this->assertSame($unserialized->getAttributes(), $span->getAttributes());
-
-        $this->assertSame(
-            $unserialized->getEvents()[0]->getName(),
-            $span->getEvents()[0]->getName()
-        );
-
-        $this->assertSame(
-            $unserialized->getEvents()[0]->getTimestamp(),
-            $span->getEvents()[0]->getTimestamp()
-        );
+        $span2 = $exporter->restoreSpan($row);
+        $this->assertSame(serialize($span), serialize($span2));
     }
 
     public function testZipkinConverter()