Merge pull request #10 from andrew-demb/simplify-check-master-request

Simplify check for master request

Author: allflame

src/Bridge/AppStartSpanListener.php

@@ -9,7 +9,6 @@
 use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class AppStartSpanListener implements EventSubscriberInterface
 {
@@ -28,7 +27,7 @@ public static function getSubscribedEvents(): array
     public function onRequest(RequestEvent $event)
     {
         $request = $event->getRequest();
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+        if (false === $event->isMasterRequest()) {
             return $this;
         }
         $this->tracer

src/Bridge/GlobalSpanListener.php

@@ -6,7 +6,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class GlobalSpanListener implements EventSubscriberInterface
 {
@@ -34,7 +33,7 @@ public function onTerminate()
 
     public function onRequest(RequestEvent $event)
     {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+        if (false === $event->isMasterRequest()) {
             return $this;
         }
         $this->handler->start($event->getRequest());

src/Bridge/RequestSpanListener.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class RequestSpanListener implements EventSubscriberInterface
 {
@@ -45,7 +44,7 @@ public static function getSubscribedEvents(): array
 
     public function onResponse(ResponseEvent $event): void
     {
-        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+        if ($event->isMasterRequest()) {
             return;
         }
         if ($this->spans->isEmpty()) {
@@ -56,7 +55,7 @@ public function onResponse(ResponseEvent $event): void
 
     public function onRequest(RequestEvent $event): void
     {
-        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+        if ($event->isMasterRequest()) {
             return;
         }
         $request = $event->getRequest();