Remove redundant event listener

Author: greeflas

src/Bridge/ExceptionListener.php

@@ -3,13 +3,12 @@
 
 namespace Jaeger\Symfony\Bridge;
 
-use Jaeger\Span\SpanManagerInterface;
+use Jaeger\Span\SpanAwareInterface;
 use Jaeger\Tag\ErrorTag;
 use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\Event\TerminateEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class ExceptionListener implements EventSubscriberInterface
@@ -21,7 +20,7 @@ class ExceptionListener implements EventSubscriberInterface
 
     public function __construct(
         TracerInterface $tracer,
-        SpanManagerInterface $spanManager,
+        SpanAwareInterface $spanManager,
         GlobalSpanHandler $globalSpanHandler
     ) {
         $this->tracer = $tracer;
@@ -35,40 +34,25 @@ public static function getSubscribedEvents(): array
         return [
             ExceptionEvent::class => ['onKernelException', 0],
             RequestEvent::class => ['onRequest', 28],
-            TerminateEvent::class => ['onTerminate', 4097],
         ];
     }
 
     public function onKernelException(ExceptionEvent $event): void
     {
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
-            return;
-        }
-
         $span = $this->spanManager->getSpan();
 
-        if (null !== $span) {
-            $span->addTag(new ErrorTag());
-            $this->exceptionExist = true;
-        }
-    }
-
-    public function onRequest(RequestEvent $event): void
-    {
-        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+        if (null === $span) {
             return;
         }
 
-        if ($this->exceptionExist) {
-            $span = $this->spanManager->getSpan();
-            $span->addTag(new ErrorTag());
-        }
+        $span->addTag(new ErrorTag());
+        $this->exceptionExist = true;
     }
 
-    public function onTerminate(): void
+    public function onRequest(RequestEvent $event): void
     {
         if ($this->exceptionExist) {
-            $this->globalSpanHandler->addTag(new ErrorTag());
+            $this->spanManager->getSpan()->addTag(new ErrorTag());
         }
     }
 }

src/Bridge/GlobalSpanHandler.php

@@ -65,9 +65,4 @@ public function flush(): void
         $this->span->finish((int)$this->durationUsec);
         $this->span = $this->durationUsec = null;
     }
-
-    public function addTag(Tag $tag): void
-    {
-        $this->span->addTag($tag);
-    }
 }