Fix context propagation

Author: allflame

src/Context/Extractor/HeaderContextExtractor.php

@@ -8,7 +8,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
@@ -44,24 +44,23 @@ public function extract(): ?SpanContext
         return $this->context;
     }
 
-    public function onTerminate()
+    public function onTerminate(PostResponseEvent $event)
     {
+        if (false === $event->isMasterRequest()) {
+            return $this;
+        }
         $this->context = null;
 
         return $this;
     }
 
     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

@@ -5,7 +5,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
@@ -21,7 +21,7 @@ public function __construct(string $cookieName)
 
     public function onRequest(GetResponseEvent $event)
     {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+        if (false === $event->isMasterRequest()) {
             return $this;
         }
 
@@ -35,8 +35,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;