Merge branch '2.0.x' into 1.0.x

Author: allflame

src/Bridge/ContextInjector.php

@@ -5,6 +5,7 @@
 use Jaeger\Tracer\InjectableInterface;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class ContextInjector implements EventSubscriberInterface
@@ -24,8 +25,8 @@ public function __construct(
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::COMMAND => ['onCommand', 1024],
-            KernelEvents::REQUEST => ['onRequest', 1024],
+            ConsoleEvents::COMMAND => ['onCommand', 4096],
+            KernelEvents::REQUEST => ['onRequest', 4096],
         ];
     }
 
@@ -44,8 +45,12 @@ public function inject()
         return $this;
     }
 
-    public function onRequest()
+    public function onRequest(GetResponseEvent $event)
     {
+        if (false === $event->isMasterRequest()) {
+            return $this;
+        }
+
         return $this->inject();
     }
 }

src/Context/Extractor/EnvContextExtractor.php

@@ -46,7 +46,7 @@ public function extract()
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::COMMAND => ['onCommand', 2048],
+            ConsoleEvents::COMMAND => ['onCommand', 8192],
         ];
     }
 

src/Context/Extractor/HeaderContextExtractor.php

@@ -47,7 +47,7 @@ public function extract()
     public static function getSubscribedEvents()
     {
         return [
-            KernelEvents::REQUEST => ['onRequest', 2048],
+            KernelEvents::REQUEST => ['onRequest', 8192],
         ];
     }