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.5"
+    "code-tool/jaeger-client-php": "~1.6"
   },
   "require-dev": {
     "php-ds/php-ds": "@stable",

src/Bridge/RequestSpanListener.php

@@ -36,7 +36,7 @@ public function __construct(\SplStack $stack, NameGeneratorInterface $nameGenera
     public static function getSubscribedEvents()
     {
         return [
-            KernelEvents::REQUEST => ['onRequest', 8],
+            KernelEvents::REQUEST => ['onRequest', 29],
             KernelEvents::RESPONSE => ['onResponse'],
         ];
     }

src/Name/Generator/DefaultNameGenerator.php

@@ -15,8 +15,8 @@ class DefaultNameGenerator implements NameGeneratorInterface, EventSubscriberInt
     public static function getSubscribedEvents()
     {
         return [
-            KernelEvents::REQUEST => ['onRequest', 8],
-            ConsoleEvents::COMMAND => ['onCommand', 8],
+            KernelEvents::REQUEST => ['onRequest', 30],
+            ConsoleEvents::COMMAND => ['onCommand', 30],
             KernelEvents::TERMINATE => ['onTerminate'],
             ConsoleEvents::TERMINATE => ['onTerminate'],
         ];