Skip to content

Commit 8d23c87

Browse files
committed
Merge branch '2.0.x' into 1.0.x
# Conflicts: # src/Bridge/AppStartSpanListener.php
2 parents 79911f3 + aabafdc commit 8d23c87

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/Bridge/AppStartSpanListener.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
22
namespace Jaeger\Symfony\Bridge;
33

4+
use Jaeger\Tag\DoubleTag;
5+
use Jaeger\Tag\LongTag;
6+
use Jaeger\Tag\StringTag;
47
use Jaeger\Tracer\TracerInterface;
58
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
6-
use Symfony\Component\HttpFoundation\Request;
79
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
810
use Symfony\Component\HttpKernel\HttpKernelInterface;
911
use Symfony\Component\HttpKernel\KernelEvents;
@@ -17,16 +19,6 @@ public function __construct(TracerInterface $tracer)
1719
$this->tracer = $tracer;
1820
}
1921

20-
/**
21-
* @param Request $request
22-
*
23-
* @return int
24-
*/
25-
public function getStartTime(Request $request)
26-
{
27-
return (int)($request->server->get('REQUEST_TIME_FLOAT', microtime(true)) * 1000000);
28-
}
29-
3022
public static function getSubscribedEvents()
3123
{
3224
return [
@@ -38,7 +30,16 @@ public function onRequest(GetResponseEvent $event)
3830
{
3931
$request = $event->getRequest();
4032
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
41-
$this->tracer->finish($this->tracer->start('app.start')->start($this->getStartTime($request)));
33+
$source = $request->server->has('REQUEST_TIME_FLOAT') ? 'header' : 'microtime';
34+
$value = $request->server->get('REQUEST_TIME_FLOAT', microtime(true));
35+
$startTime = (int)($value * 1000000);
36+
$this->tracer->finish(
37+
$this->tracer->start('app.start')
38+
->addTag(new StringTag('time.source', $source))
39+
->addTag(new DoubleTag('time.value', $value))
40+
->addTag(new LongTag('time.micro', $startTime))
41+
->start($startTime)
42+
);
4243
}
4344

4445
return $this;

0 commit comments

Comments
 (0)