Separate error tagging logic

Author: greeflas

src/Bridge/ExceptionListener.php

@@ -3,37 +3,25 @@
 
 namespace Jaeger\Symfony\Bridge;
 
+use Jaeger\Log\ErrorLog;
 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\HttpKernelInterface;
 
 class ExceptionListener implements EventSubscriberInterface
 {
-    private $tracer;
     private $spanManager;
-    private $globalSpanHandler;
-    private $exceptionExist;
-
-    public function __construct(
-        TracerInterface $tracer,
-        SpanAwareInterface $spanManager,
-        GlobalSpanHandler $globalSpanHandler
-    ) {
-        $this->tracer = $tracer;
+
+    public function __construct(SpanAwareInterface $spanManager)
+    {
         $this->spanManager = $spanManager;
-        $this->globalSpanHandler = $globalSpanHandler;
-        $this->exceptionExist = false;
     }
 
     public static function getSubscribedEvents(): array
     {
         return [
             ExceptionEvent::class => ['onKernelException', 0],
-            RequestEvent::class => ['onRequest', 28],
         ];
     }
 
@@ -45,14 +33,11 @@ public function onKernelException(ExceptionEvent $event): void
             return;
         }
 
-        $span->addTag(new ErrorTag());
-        $this->exceptionExist = true;
-    }
+        $exception = $event->getThrowable();
 
-    public function onRequest(RequestEvent $event): void
-    {
-        if ($this->exceptionExist) {
-            $this->spanManager->getSpan()->addTag(new ErrorTag());
-        }
+        $span
+            ->addTag(new ErrorTag())
+            ->addLog(new ErrorLog($exception->getMessage(), $exception->getTraceAsString()))
+        ;
     }
 }

src/Bridge/RequestSpanListener.php

@@ -6,12 +6,15 @@
 use Jaeger\Http\HttpCodeTag;
 use Jaeger\Http\HttpMethodTag;
 use Jaeger\Http\HttpUriTag;
+use Jaeger\Log\ErrorLog;
 use Jaeger\Symfony\Name\Generator\NameGeneratorInterface;
 use Jaeger\Symfony\Tag\SymfonyComponentTag;
 use Jaeger\Symfony\Tag\SymfonyVersionTag;
+use Jaeger\Tag\ErrorTag;
 use Jaeger\Tag\SpanKindServerTag;
 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\ResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -36,6 +39,7 @@ public static function getSubscribedEvents(): array
         return [
             RequestEvent::class => ['onRequest', 29],
             ResponseEvent::class => ['onResponse', -1024],
+            ExceptionEvent::class => ['onKernelException', 0],
         ];
     }
 
@@ -69,4 +73,18 @@ public function onRequest(RequestEvent $event): void
             )
         );
     }
+
+    public function onKernelException(ExceptionEvent $event): void
+    {
+        if ($this->spans->isEmpty()) {
+            return;
+        }
+
+        $exception = $event->getThrowable();
+
+        $this->spans->current()
+            ->addTag(new ErrorTag())
+            ->addLog(new ErrorLog($exception->getMessage(), $exception->getTraceAsString()))
+        ;
+    }
 }

src/Resources/services.yml

@@ -189,12 +189,9 @@ services:
     arguments: ['@jaeger.span.handler.background', '@jaeger.span.handler.gloabal']
     tags:
       - {name: 'kernel.event_subscriber' }
-
   jaeger.exception.listener:
     class: Jaeger\Symfony\Bridge\ExceptionListener
     arguments:
-      - '@jaeger.tracer'
       - '@jaeger.span.manager'
-      - '@jaeger.span.handler.gloabal'
     tags:
       - {name: 'kernel.event_subscriber'}