Merge branch '2.0.x' into 1.0.x

allflame · allflame · commit 1071e53dff91 · 2017-12-19T15:11:18.000+02:00
diff --git a/src/Bridge/ContextInjector.php b/src/Bridge/ContextInjector.php
@@ -133,7 +133,7 @@ public function onRequest(GetResponseEvent $event)
         );
 
         if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
-            $startTime = (int)($request->server->get('REQUEST_TIME_FLOAT', time()) * 1000000);
+            $startTime = (int)($request->server->get('REQUEST_TIME_FLOAT', microtime(true)) * 1000000);
             $requestSpan->start($startTime);
             $this->tracer->finish($this->tracer->start('app.start')->start($startTime));
         }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function onRequest(GetResponseEvent $event)`
`133`	`133`	`);`
`134`	`134`
`135`	`135`	`if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {`
`136`		`- $startTime = (int)($request->server->get('REQUEST_TIME_FLOAT', time()) * 1000000);`
	`136`	`+ $startTime = (int)($request->server->get('REQUEST_TIME_FLOAT', microtime(true)) * 1000000);`
`137`	`137`	`$requestSpan->start($startTime);`
`138`	`138`	`$this->tracer->finish($this->tracer->start('app.start')->start($startTime));`
`139`	`139`	`}`