Merge branch '2.0.x' into 1.0.x

Author: allflame

src/Bridge/GlobalSpanListener.php

@@ -52,7 +52,7 @@ public function onRequest(GetResponseEvent $event)
         }
 
         $request = $event->getRequest();
-        $requestSpan = $this->tracer->start(
+        $this->span = $this->tracer->start(
             $this->nameGenerator->generate(),
             [
                 new HttpMethodTag($request->getMethod()),
@@ -61,10 +61,7 @@ public function onRequest(GetResponseEvent $event)
                 new SymfonyComponentTag(),
                 new SymfonyVersionTag()
             ]
-        );
-        $this->span = $requestSpan->start(
-            (int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true)))
-        );
+        )->start((int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true))));
 
         return $this;
     }

src/Bridge/RequestSpanListener.php

@@ -40,6 +40,10 @@ public static function getSubscribedEvents()
 
     public function onResponse(FilterResponseEvent $event)
     {
+        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+            return $this;
+        }
+
         if ($this->spans->isEmpty()) {
             return $this;
         }
@@ -50,22 +54,23 @@ public function onResponse(FilterResponseEvent $event)
 
     public function onRequest(GetResponseEvent $event)
     {
-        $request = $event->getRequest();
-        $requestSpan = $this->tracer->start(
-            $this->nameGenerator->generate(),
-            [
-                new HttpMethodTag($request->getMethod()),
-                new HttpUriTag($request->getRequestUri()),
-                new SpanKindServerTag(),
-                new SymfonyComponentTag(),
-                new SymfonyVersionTag()
-            ]
-        );
         if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
-            $requestSpan->start((int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true))));
+            return $this;
         }
 
-        $this->spans->push($requestSpan);
+        $request = $event->getRequest();
+        $this->spans->push(
+            $this->tracer->start(
+                $this->nameGenerator->generate(),
+                [
+                    new HttpMethodTag($request->getMethod()),
+                    new HttpUriTag($request->getRequestUri()),
+                    new SpanKindServerTag(),
+                    new SymfonyComponentTag(),
+                    new SymfonyVersionTag()
+                ]
+            )
+        );
 
         return $this;
     }