Refactored event listeners handling

Author: allflame

src/Bridge/BackgroundFinishListener.php

@@ -5,6 +5,7 @@
 
 use Jaeger\Http\HttpMethodTag;
 use Jaeger\Http\HttpUriTag;
+use Jaeger\Span\Span;
 use Jaeger\Symfony\Tag\SymfonyBackgroundTag;
 use Jaeger\Symfony\Tag\SymfonyComponentTag;
 use Jaeger\Symfony\Tag\SymfonyVersionTag;
@@ -14,6 +15,9 @@
 
 class BackgroundSpanHandler
 {
+    /**
+     * @var Span
+     */
     private $span;
 
     private $tracer;
@@ -23,7 +27,7 @@ public function __construct(TracerInterface $tracer)
         $this->tracer = $tracer;
     }
 
-    public function start(Request $request)
+    public function start(Request $request): BackgroundSpanHandler
     {
         $this->span = $this->tracer->start(
             'background',
@@ -36,9 +40,11 @@ public function start(Request $request)
                 new SymfonyBackgroundTag(),
             ]
         );
+
+        return $this;
     }
 
-    public function finish()
+    public function flush(): BackgroundSpanHandler
     {
         if (null === $this->span) {
             return $this;

src/Bridge/BackgroundSpanHandler.php

@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Bridge;
+
+use Jaeger\Http\HttpMethodTag;
+use Jaeger\Http\HttpUriTag;
+use Jaeger\Span\Span;
+use Jaeger\Symfony\Name\Generator\NameGeneratorInterface;
+use Jaeger\Symfony\Tag\SymfonyComponentTag;
+use Jaeger\Symfony\Tag\SymfonyVersionTag;
+use Jaeger\Tag\SpanKindServerTag;
+use Jaeger\Tracer\TracerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class GlobalSpanHandler
+{
+    /**
+     * @var Span
+     */
+    private $span;
+
+    private $durationUsec;
+
+    private $tracer;
+
+    private $nameGenerator;
+
+    public function __construct(TracerInterface $tracer, NameGeneratorInterface $nameGenerator)
+    {
+        $this->tracer = $tracer;
+        $this->nameGenerator = $nameGenerator;
+    }
+
+    public function start(Request $request): GlobalSpanHandler
+    {
+        $this->span = $this->tracer->start(
+            $this->nameGenerator->generate(),
+            [
+                new HttpMethodTag($request->getMethod()),
+                new HttpUriTag($request->getRequestUri()),
+                new SpanKindServerTag(),
+                new SymfonyComponentTag(),
+                new SymfonyVersionTag()
+            ]
+        )->start((int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true))));
+
+        return $this;
+    }
+
+    public function finish(): GlobalSpanHandler
+    {
+        if (null === $this->span) {
+            return $this;
+        }
+        $this->durationUsec = (int)(microtime(true) * 1000000 - $this->span->startTime);
+
+        return $this;
+    }
+
+    public function flush(): GlobalSpanHandler
+    {
+        if (null === $this->span || null === $this->durationUsec) {
+            return $this;
+        }
+
+        $this->tracer->finish($this->span, $this->durationUsec);
+        $this->span = $this->durationUsec = null;
+
+        return $this;
+    }
+}

src/Bridge/GlobalSpanHandler.php

@@ -3,30 +3,18 @@
 
 namespace Jaeger\Symfony\Bridge;
 
-use Jaeger\Http\HttpMethodTag;
-use Jaeger\Http\HttpUriTag;
-use Jaeger\Symfony\Name\Generator\NameGeneratorInterface;
-use Jaeger\Symfony\Tag\SymfonyComponentTag;
-use Jaeger\Symfony\Tag\SymfonyVersionTag;
-use Jaeger\Tag\SpanKindServerTag;
-use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class GlobalSpanListener implements EventSubscriberInterface
 {
-    private $span;
+    private $handler;
 
-    private $nameGenerator;
-
-    private $tracer;
-
-    public function __construct(NameGeneratorInterface $nameGenerator, TracerInterface $tracer)
+    public function __construct(GlobalSpanHandler $handler)
     {
-        $this->nameGenerator = $nameGenerator;
-        $this->tracer = $tracer;
+        $this->handler = $handler;
     }
 
     public static function getSubscribedEvents()
@@ -39,10 +27,7 @@ public static function getSubscribedEvents()
 
     public function onTerminate()
     {
-        if (null === $this->span) {
-            return $this;
-        }
-        $this->tracer->finish($this->span);
+        $this->handler->finish();
 
         return $this;
     }
@@ -52,18 +37,7 @@ public function onRequest(GetResponseEvent $event)
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return $this;
         }
-
-        $request = $event->getRequest();
-        $this->span = $this->tracer->start(
-            $this->nameGenerator->generate(),
-            [
-                new HttpMethodTag($request->getMethod()),
-                new HttpUriTag($request->getRequestUri()),
-                new SpanKindServerTag(),
-                new SymfonyComponentTag(),
-                new SymfonyVersionTag()
-            ]
-        )->start((int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true))));
+        $this->handler->start($event->getRequest());
 
         return $this;
     }

src/Bridge/GlobalSpanListener.php

@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Bridge;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class HandlerFlushListener implements EventSubscriberInterface
+{
+    private $backgroundHandler;
+
+    private $globalHandler;
+
+    public function __construct(BackgroundSpanHandler $backgroundHandler, GlobalSpanHandler $globalHandler)
+    {
+        $this->backgroundHandler = $backgroundHandler;
+        $this->globalHandler = $globalHandler;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [KernelEvents::TERMINATE => ['onTerminate', -16384],];
+    }
+
+    public function onTerminate()
+    {
+        $this->backgroundHandler->flush();
+        $this->globalHandler->flush();
+
+        return $this;
+    }
+}

src/Bridge/HandlerFlushListener.php

@@ -131,6 +131,12 @@ services:
       - '@spl.priority.queue'
   jaeger.name.generator:
     alias: 'jaeger.name.generator.chain'
+  jaeger.span.handler.background:
+    class: Jaeger\Symfony\Bridge\BackgroundSpanHandler
+    arguments: ['@jaeger.tracer']
+  jaeger.span.handler.gloabal:
+    class: Jaeger\Symfony\Bridge\GlobalSpanHandler
+    arguments: ['@jaeger.tracer', '@jaeger.name.generator']
   jaeger.debug.listener:
     class: Jaeger\Symfony\Bridge\DebugListener
     arguments:
@@ -155,9 +161,7 @@ services:
       - {name: 'kernel.event_subscriber' }
   jaeger.global.span.listener:
     class: Jaeger\Symfony\Bridge\GlobalSpanListener
-    arguments:
-      - '@jaeger.name.generator'
-      - '@jaeger.tracer'
+    arguments: ['@jaeger.span.handler.gloabal']
     tags:
       - {name: 'kernel.event_subscriber' }
   jaeger.app.start.listener:
@@ -170,16 +174,13 @@ services:
     arguments: ['@jaeger.tracer']
     tags:
       - {name: 'kernel.event_subscriber' }
-  jaeger.span.handler.background:
-    class: Jaeger\Symfony\Bridge\BackgroundSpanHandler
-    arguments: ['@jaeger.tracer']
-  jaeger.span.background.listener.finish:
-    class: Jaeger\Symfony\Bridge\BackgroundFinishListener
-    arguments: ['@jaeger.span.handler.background']
-    tags:
-      - {name: 'kernel.event_subscriber' }
   jaeger.span.background.listener.start:
     class: Jaeger\Symfony\Bridge\BackgroundStartListener
     arguments: ['@jaeger.span.handler.background']
     tags:
       - {name: 'kernel.event_subscriber' }
+  jaeger.span.handler.listener.flush:
+    class: Jaeger\Symfony\Bridge\HandlerFlushListener
+    arguments: ['@jaeger.span.handler.background', '@jaeger.span.handler.gloabal']
+    tags:
+      - {name: 'kernel.event_subscriber' }