Merge branch '2.0.x' into 1.0.x

# Conflicts:
#	composer.json

Author: allflame

composer.json

@@ -12,7 +12,7 @@
     "symfony/console": "~2 || ~3",
     "symfony/http-kernel": "~2 || ~3",
     "symfony/dependency-injection": "~2 || ~3",
-    "code-tool/jaeger-client-php": "~1"
+    "code-tool/jaeger-client-php": "~1.1"
   },
   "require-dev": {
     "php-ds/php-ds": "@stable",

src/Bridge/AppStartSpanListener.php

@@ -1,8 +1,11 @@
 <?php
 namespace Jaeger\Symfony\Bridge;
 
+use Jaeger\Symfony\Tag\SymfonyComponentTag;
+use Jaeger\Symfony\Tag\SymfonyVersionTag;
 use Jaeger\Tag\DoubleTag;
 use Jaeger\Tag\LongTag;
+use Jaeger\Tag\SpanKindServerTag;
 use Jaeger\Tag\StringTag;
 use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -34,7 +37,10 @@ public function onRequest(GetResponseEvent $event)
             $value = $request->server->get('REQUEST_TIME_FLOAT', microtime(true));
             $startTime = (int)($value * 1000000);
             $this->tracer->finish(
-                $this->tracer->start('app.start')
+                $this->tracer->start('symfony.start')
+                    ->addTag(new SpanKindServerTag())
+                    ->addTag(new SymfonyComponentTag())
+                    ->addTag(new SymfonyVersionTag())
                     ->addTag(new StringTag('time.source', $source))
                     ->addTag(new DoubleTag('time.value', $value))
                     ->addTag(new LongTag('time.micro', $startTime))

src/Bridge/RequestSpanListener.php

@@ -4,8 +4,11 @@
 use Jaeger\Http\HttpCodeTag;
 use Jaeger\Http\HttpMethodTag;
 use Jaeger\Http\HttpUriTag;
+use Jaeger\Symfony\Tag\SymfonyComponentTag;
+use Jaeger\Symfony\Tag\SymfonyVersionTag;
 use Jaeger\Tag\DoubleTag;
 use Jaeger\Tag\LongTag;
+use Jaeger\Tag\SpanKindServerTag;
 use Jaeger\Tag\StringTag;
 use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -67,6 +70,9 @@ public function onRequest(GetResponseEvent $event)
             [
                 new HttpMethodTag($request->getMethod()),
                 new HttpUriTag($request->getRequestUri()),
+                new SpanKindServerTag(),
+                new SymfonyComponentTag(),
+                new SymfonyVersionTag()
             ]
         );
 
@@ -80,6 +86,7 @@ public function onRequest(GetResponseEvent $event)
                 ->addTag(new LongTag('time.micro', $startTime))
                 ->start($startTime);
         }
+
         $this->spans->push($requestSpan);
 
         return $this;

src/Tag/SymfonyComponentTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\ComponentTag;
+
+class SymfonyComponentTag extends ComponentTag
+{
+    public function __construct()
+    {
+        parent::__construct('symfony');
+    }
+}

src/Tag/SymfonyVersionTag.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\StringTag;
+use Symfony\Component\HttpKernel\Kernel;
+
+class SymfonyVersionTag extends StringTag
+{
+    public function __construct()
+    {
+        parent::__construct('symfony.version', Kernel::VERSION);
+    }
+}