Merge pull request #11 from code-tool/alternative-128bit-support

Alternative 128bit support

Author: allflame

composer.json

@@ -7,7 +7,7 @@
     }
   },
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.4",
     "ext-sockets": "*",
     "apache/thrift": ">=0.11, <0.16"
   },

src/Codec/TextCodec.php

@@ -9,16 +9,18 @@ class TextCodec implements CodecInterface
 {
     public function decode($data): ?SpanContext
     {
-        if (false === is_string($data)) {
+        if (false === \is_string($data)) {
             return null;
         }
-        $elements = explode(':', $data);
-        if (4 !== count($elements)) {
+        $elements = \explode(':', $data);
+        if (4 !== \count($elements)) {
             return null;
         }
+        [$traceIdHigh, $traceIdLow] = $this->convertInt128($elements[0]);
 
         return new SpanContext(
-            $this->convertInt64($elements[0]),
+            $traceIdHigh,
+            $traceIdLow,
             $this->convertInt64($elements[1]),
             $this->convertInt64($elements[2]),
             $this->convertInt64($elements[3])
@@ -27,16 +29,27 @@ public function decode($data): ?SpanContext
 
     public function convertInt64(string $hex): int
     {
-        $hex8byte = str_pad($hex, 16, '0', STR_PAD_LEFT);
+        $hex8byte = \str_pad($hex, 16, '0', STR_PAD_LEFT);
 
-        return unpack('Jint64', pack('H*', $hex8byte))['int64'];
+        return \unpack('Jint64', pack('H*', $hex8byte))['int64'];
     }
 
-    public function encode(SpanContext $context)
+    public function convertInt128(string $hex): array
     {
-        return sprintf(
-            '%x:%x:%x:%x',
-            $context->getTraceId(),
+        $hex16byte = \str_pad($hex, 32, '0', STR_PAD_LEFT);
+
+        return [
+            $this->convertInt64(substr($hex16byte, 0, 16)),
+            $this->convertInt64(substr($hex16byte, 16, 16)),
+        ];
+    }
+
+    public function encode(SpanContext $context): string
+    {
+        return \sprintf(
+            '%x%x:%x:%x:%x',
+            $context->getTraceIdHigh(),
+            $context->getTraceIdLow(),
             $context->getSpanId(),
             $context->getParentId(),
             $context->getFlags()

src/Span/Context/SpanContext.php

@@ -5,24 +5,28 @@
 
 class SpanContext implements \IteratorAggregate
 {
-    private $traceId;
+    private int $traceIdHigh;
 
-    private $spanId;
+    private int $traceIdLow;
 
-    private $parentId;
+    private int $spanId;
 
-    private $flags;
+    private int $parentId;
 
-    private $baggage;
+    private int $flags;
+
+    private array $baggage;
 
     public function __construct(
-        int $traceId,
-        int $spanId,
-        int $parentId,
-        int $flags = 0,
+        int   $traceIdHigh,
+        int   $traceIdLow,
+        int   $spanId,
+        int   $parentId,
+        int   $flags = 0,
         array $baggage = []
     ) {
-        $this->traceId = $traceId;
+        $this->traceIdHigh = $traceIdHigh;
+        $this->traceIdLow = $traceIdLow;
         $this->spanId = $spanId;
         $this->parentId = $parentId;
         $this->flags = $flags;
@@ -31,7 +35,17 @@ public function __construct(
 
     public function getTraceId(): int
     {
-        return $this->traceId;
+        return $this->traceIdLow;
+    }
+
+    public function getTraceIdHigh(): int
+    {
+        return $this->traceIdHigh;
+    }
+
+    public function getTraceIdLow(): int
+    {
+        return $this->traceIdLow;
     }
 
     public function getSpanId(): int

src/Span/Factory/SpanFactory.php

@@ -12,22 +12,25 @@
 
 class SpanFactory implements SpanFactoryInterface
 {
-    private $idGenerator;
+    private IdGeneratorInterface $idGenerator;
 
-    private $sampler;
+    private SamplerInterface $sampler;
 
-    public function __construct(IdGeneratorInterface $idGenerator, SamplerInterface $sampler)
+    private bool $trace128;
+
+    public function __construct(IdGeneratorInterface $idGenerator, SamplerInterface $sampler, bool $trace128 = false)
     {
         $this->idGenerator = $idGenerator;
         $this->sampler = $sampler;
+        $this->trace128 = $trace128;
     }
 
     public function parent(
         TracerInterface $tracer,
-        string $operationName,
-        string $debugId,
-        array $tags = [],
-        array $logs = []
+        string          $operationName,
+        string          $debugId,
+        array           $tags = [],
+        array           $logs = []
     ): SpanInterface {
         $spanId = $this->idGenerator->next();
         $traceId = $spanId;
@@ -36,8 +39,9 @@ public function parent(
         return new Span(
             $tracer,
             new SpanContext(
-                (int)$traceId,
-                (int)$spanId,
+                $this->trace128 ? $this->idGenerator->next() : 0,
+                $this->idGenerator->next(),
+                $this->idGenerator->next(),
                 0,
                 (int)$samplerResult->getFlags()
             ),
@@ -50,15 +54,16 @@ public function parent(
 
     public function child(
         TracerInterface $tracer,
-        string $operationName,
-        SpanContext $parentContext,
-        array $tags = [],
-        array $logs = []
+        string          $operationName,
+        SpanContext     $parentContext,
+        array           $tags = [],
+        array           $logs = []
     ): SpanInterface {
         return new Span(
             $tracer,
             new SpanContext(
-                $parentContext->getTraceId(),
+                $parentContext->getTraceIdHigh(),
+                $parentContext->getTraceIdLow(),
                 $this->idGenerator->next(),
                 $parentContext->getSpanId(),
                 $parentContext->getFlags(),

src/Span/Span.php

@@ -12,22 +12,22 @@
 
 class Span extends \Jaeger\Thrift\Span implements SpanInterface
 {
-    private $tracer;
+    private FinishableInterface $tracer;
 
-    private $context;
+    private SpanContext $context;
 
     public function __construct(
         FinishableInterface $tracer,
-        SpanContext $context,
-        string $operationName,
-        int $startTime,
-        array $tags = [],
-        array $logs = []
+        SpanContext         $context,
+        string              $operationName,
+        int                 $startTime,
+        array               $tags = [],
+        array               $logs = []
     ) {
         $this->tracer = $tracer;
         $this->context = $context;
-        $this->traceIdLow = $context->getTraceId();
-        $this->traceIdHigh = 0;
+        $this->traceIdLow = $context->getTraceIdLow();
+        $this->traceIdHigh = $context->getTraceIdHigh();
         $this->spanId = $context->getSpanId();
         $this->parentSpanId = $context->getParentId();
         $this->flags = $context->getFlags();