Merge branch '2.0.x' into 1.0.x

Author: allflame

src/Bridge/RequestSpanListener.php

@@ -5,6 +5,7 @@
 use Jaeger\Http\HttpMethodTag;
 use Jaeger\Http\HttpUriTag;
 use Jaeger\Symfony\Name\Generator\NameGeneratorInterface;
+use Jaeger\Symfony\Tag\SymfonyBackgroundTag;
 use Jaeger\Symfony\Tag\SymfonyComponentTag;
 use Jaeger\Symfony\Tag\SymfonyVersionTag;
 use Jaeger\Symfony\Tag\TimeMicroTag;
@@ -15,6 +16,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -37,23 +39,58 @@ public static function getSubscribedEvents()
     {
         return [
             KernelEvents::REQUEST => ['onRequest', 29],
-            KernelEvents::RESPONSE => ['onResponse'],
+            KernelEvents::RESPONSE => ['onResponse', -1024],
+            KernelEvents::TERMINATE => ['onTerminate', -1024],
         ];
     }
 
-    public function onResponse(FilterResponseEvent $event)
+    public function onTerminate(PostResponseEvent $event)
     {
         if ($this->spans->isEmpty()) {
             return $this;
         }
 
+        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+            return $this;
+        }
+
         $this->tracer->finish(
             $this->spans->pop()->addTag(new HttpCodeTag($event->getResponse()->getStatusCode()))
         );
 
         return $this;
     }
 
+    public function onResponse(FilterResponseEvent $event)
+    {
+        if ($this->spans->isEmpty()) {
+            return $this;
+        }
+
+        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+            $this->tracer->finish(
+                $this->spans->pop()->addTag(new HttpCodeTag($event->getResponse()->getStatusCode()))
+            );
+
+            return $this;
+        }
+
+        $request = $event->getRequest();
+        $this->tracer->start(
+            $this->nameGenerator->generate() . ':background',
+            [
+                new HttpMethodTag($request->getMethod()),
+                new HttpUriTag($request->getRequestUri()),
+                new SpanKindServerTag(),
+                new SymfonyComponentTag(),
+                new SymfonyVersionTag(),
+                new SymfonyBackgroundTag(),
+            ]
+        );
+
+        return $this;
+    }
+
     public function onRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();

src/Bridge/TracerBridge.php

@@ -18,8 +18,8 @@ public function __construct(FlushableInterface $tracer)
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::TERMINATE => ['onTerminate'],
-            KernelEvents::TERMINATE => ['onTerminate'],
+            ConsoleEvents::TERMINATE => ['onTerminate', -65536],
+            KernelEvents::TERMINATE => ['onTerminate', -65536],
         ];
     }
 

src/Tag/SymfonyBackgroundTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Tag;
+
+use Jaeger\Tag\BoolTag;
+
+class SymfonyBackgroundTag extends BoolTag
+{
+    public function __construct()
+    {
+        parent::__construct('symfony.background', true);
+    }
+}