Merge branch '2.0.x' into 1.0.x

Author: allflame

src/Bridge/RequestSpanListener.php

@@ -54,6 +54,7 @@ public function onTerminate(PostResponseEvent $event)
             return $this;
         }
 
+        $this->tracer->finish($this->spans->pop());
         $this->tracer->finish(
             $this->spans->pop()->addTag(new HttpCodeTag($event->getResponse()->getStatusCode()))
         );
@@ -76,16 +77,18 @@ public function onResponse(FilterResponseEvent $event)
         }
 
         $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(),
-            ]
+        $this->spans->push(
+            $this->tracer->start(
+                'background',
+                [
+                    new HttpMethodTag($request->getMethod()),
+                    new HttpUriTag($request->getRequestUri()),
+                    new SpanKindServerTag(),
+                    new SymfonyComponentTag(),
+                    new SymfonyVersionTag(),
+                    new SymfonyBackgroundTag(),
+                ]
+            )
         );
 
         return $this;