Merge branch '2.0.x'

Author: allflame

src/Bridge/RequestSpanListener.php

@@ -6,12 +6,13 @@
 use Jaeger\Http\HttpCodeTag;
 use Jaeger\Http\HttpMethodTag;
 use Jaeger\Http\HttpUriTag;
+use Jaeger\Symfony\Tag\DebugRequestTag;
 use Jaeger\Symfony\Tag\SymfonyComponentTag;
 use Jaeger\Symfony\Tag\SymfonyVersionTag;
-use Jaeger\Tag\DoubleTag;
-use Jaeger\Tag\LongTag;
+use Jaeger\Symfony\Tag\TimeMicroTag;
+use Jaeger\Symfony\Tag\TimeSourceTag;
+use Jaeger\Symfony\Tag\TimeValueTag;
 use Jaeger\Tag\SpanKindServerTag;
-use Jaeger\Tag\StringTag;
 use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -88,11 +89,15 @@ public function onRequest(GetResponseEvent $event)
             $value = $request->server->get('REQUEST_TIME_FLOAT', microtime(true));
             $startTime = (int)($value * 1000000);
             $requestSpan
-                ->addTag(new StringTag('time.source', $source))
-                ->addTag(new DoubleTag('time.value', $value))
-                ->addTag(new LongTag('time.micro', $startTime))
+                ->addTag(new TimeSourceTag($source))
+                ->addTag(new TimeValueTag($value))
+                ->addTag(new TimeMicroTag($startTime))
                 ->start($startTime);
         }
+        if ($requestSpan->getContext()->isDebug()
+            && ($requestId = (string)$requestSpan->getItem('debug.request'))) {
+            $requestSpan->addTag(new DebugRequestTag($requestId));
+        }
         $this->spans->push($requestSpan);
 
         return $this;

src/Tag/DebugRequestTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\StringTag;
+
+class DebugRequestTag extends StringTag
+{
+    public function __construct(string $value)
+    {
+        parent::__construct('debug.request', $value);
+    }
+}

src/Tag/TimeMicroTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\LongTag;
+
+class TimeMicroTag extends LongTag
+{
+    public function __construct(int $value)
+    {
+        parent::__construct('time.micro', $value);
+    }
+}

src/Tag/TimeSourceTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\StringTag;
+
+class TimeSourceTag extends StringTag
+{
+    public function __construct(string $value)
+    {
+        parent::__construct('time.source', $value);
+    }
+}

src/Tag/TimeValueTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\DoubleTag;
+
+class TimeValueTag extends DoubleTag
+{
+    public function __construct(float $value)
+    {
+        parent::__construct('time.value', $value);
+    }
+}