Merge branch '2.0.x' into 1.0.x

# Conflicts:
#	src/Bridge/DebugListener.php
#	src/Context/Extractor/HeaderContextExtractor.php

Author: allflame

src/Bridge/DebugListener.php

@@ -5,6 +5,7 @@
 use Jaeger\Tracer\DebuggableInterface;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class DebugListener implements EventSubscriberInterface
@@ -28,8 +29,8 @@ public function __construct(DebuggableInterface $debuggable, DebugExtractorInter
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::COMMAND => ['onStart', 8192],
-            KernelEvents::REQUEST => ['onStart', 8192],
+            ConsoleEvents::COMMAND => ['onCommand', 8192],
+            KernelEvents::REQUEST => ['onRequest', 8192],
             ConsoleEvents::TERMINATE => ['onTerminate'],
             KernelEvents::TERMINATE => ['onTerminate'],
         ];
@@ -48,7 +49,7 @@ public function onTerminate()
     /**
      * @return DebugListener
      */
-    public function onStart()
+    public function onCommand()
     {
         if ('' === ($debugId = $this->extractor->getDebug())) {
             return $this;
@@ -57,4 +58,23 @@ public function onStart()
 
         return $this;
     }
+
+    /**
+     * @param GetResponseEvent $event
+     *
+     * @return DebugListener
+     */
+    public function onRequest(GetResponseEvent $event)
+    {
+        if (false === $event->isMasterRequest()) {
+            return $this;
+        }
+
+        if ('' === ($debugId = $this->extractor->getDebug())) {
+            return $this;
+        }
+        $this->debuggable->enable($debugId);
+
+        return $this;
+    }
 }

src/Context/Extractor/HeaderContextExtractor.php

@@ -6,7 +6,7 @@
 use Jaeger\Span\Context\SpanContext;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class HeaderContextExtractor implements ContextExtractorInterface, EventSubscriberInterface
@@ -55,8 +55,11 @@ public static function getSubscribedEvents()
     /**
      * @return HeaderContextExtractor
      */
-    public function onTerminate()
+    public function onTerminate(PostResponseEvent $event)
     {
+        if (false === $event->isMasterRequest()) {
+            return $this;
+        }
         $this->context = null;
 
         return $this;
@@ -69,15 +72,11 @@ public function onTerminate()
      */
     public function onRequest(GetResponseEvent $event)
     {
-        $request = $event->getRequest();
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
-            $this->context = null;
-
+        if (false === $event->isMasterRequest()) {
             return $this;
         }
-
-        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()
-            && $request->headers->has($this->headerName)
+        $request = $event->getRequest();
+        if ($request->headers->has($this->headerName)
             && ($context = $this->registry[$this->format]->decode($request->headers->get($this->headerName)))) {
             $this->context = $context;
 

src/Debug/Extractor/CookieDebugExtractor.php

@@ -3,7 +3,7 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class CookieDebugExtractor implements DebugExtractorInterface, EventSubscriberInterface
@@ -24,7 +24,7 @@ public function __construct($cookieName)
 
     public function onRequest(GetResponseEvent $event)
     {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+        if (false === $event->isMasterRequest()) {
             return $this;
         }
 
@@ -38,8 +38,11 @@ public function onRequest(GetResponseEvent $event)
         return $this;
     }
 
-    public function onTerminate()
+    public function onTerminate(PostResponseEvent $event)
     {
+        if (false === $event->isMasterRequest()) {
+            return $this;
+        }
         $this->debugId = '';
 
         return $this;