Merge branch '2.0.x' into 1.0.x

Author: allflame

src/Bridge/ContextInjector.php

@@ -122,12 +122,6 @@ public function onRequest(GetResponseEvent $event)
             && $request->headers->has($this->headerName)
             && ($context = $this->registry[$this->format]->decode($request->headers->get($this->headerName)))) {
             $this->injectable->assign($context);
-
-            if ($request->server->has('REQUEST_TIME_FLOAT')) {
-                $span = $this->tracer->start('symfony.start')
-                    ->start((int)($request->server->get('REQUEST_TIME_FLOAT') * 1000000));
-                $this->tracer->finish($span);
-            }
         }
 
         $this->spans->push(
@@ -139,8 +133,16 @@ public function onRequest(GetResponseEvent $event)
                         new HttpUriTag($request->getRequestUri()),
                     ]
                 )
+                ->start((int)($request->server->get('REQUEST_TIME_FLOAT', time()) * 1000000))
         );
 
+        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+            $span = $this->tracer
+                ->start('app.start')
+                ->start((int)($request->server->get('REQUEST_TIME_FLOAT', time()) * 1000000));
+            $this->tracer->finish($span);
+        }
+
         return $this;
     }
 }