Skip to content

Commit eb9bdb2

Browse files
authored
Merge pull request #26 from code-tool/fix-listeners-order
Fix symfony.start span pos by changing eventListeners order
2 parents 3c2ce3c + 292c518 commit eb9bdb2

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/Bridge/AppStartSpanListener.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ public function __construct(TracerInterface $tracer)
2222

2323
public static function getSubscribedEvents(): array
2424
{
25-
return [RequestEvent::class => ['onRequest', -1],];
25+
return [RequestEvent::class => ['onRequest', -1023],];
2626
}
2727

2828
public function onRequest(RequestEvent $event)
2929
{
30-
$request = $event->getRequest();
3130
if (false === $this->isMainRequestEvent($event)) {
3231
return $this;
3332
}
33+
3434
$this->tracer
3535
->start('symfony.start')
3636
->addTag(new SpanKindServerTag())
3737
->addTag(new SymfonyComponentTag())
3838
->addTag(new SymfonyVersionTag())
39-
->start((int)(1000000 * $request->server->get('REQUEST_TIME_FLOAT', microtime(true))))
39+
->start((int)(1000000 * $event->getRequest()->server->get('REQUEST_TIME_FLOAT', microtime(true))))
4040
->finish();
4141

4242
return $this;

src/Bridge/GlobalSpanListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function __construct(GlobalSpanHandler $handler)
2020
public static function getSubscribedEvents(): array
2121
{
2222
return [
23-
RequestEvent::class => ['onRequest', 30],
23+
RequestEvent::class => ['onRequest', 25],
2424
TerminateEvent::class => ['onTerminate', 4096],
2525
];
2626
}

src/Bridge/RequestSpanListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(\SplStack $stack, NameGeneratorInterface $nameGenera
3737
public static function getSubscribedEvents(): array
3838
{
3939
return [
40-
RequestEvent::class => ['onRequest', 29],
40+
RequestEvent::class => ['onRequest', -1024],
4141
ResponseEvent::class => ['onResponse', -1024],
4242
ExceptionEvent::class => ['onKernelException', 0],
4343
];

src/Name/Generator/ControllerNameGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static function getSubscribedEvents(): array
1515
{
1616
return [
1717
// Subscribe after route was resolved and request attributes were set
18-
RequestEvent::class => ['onRequest', 31],
18+
RequestEvent::class => ['onRequest', 30],
1919
TerminateEvent::class => ['onTerminate', -16384],
2020
];
2121
}

src/Name/Generator/DefaultNameGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static function getSubscribedEvents(): array
1717
{
1818
return [
1919
// Subscribe after route was resolved and request attributes were set
20-
RequestEvent::class => ['onRequest', 31],
20+
RequestEvent::class => ['onRequest', 30],
2121
ConsoleCommandEvent::class => ['onCommand', 31],
2222
TerminateEvent::class => ['onTerminate', -16384],
2323
ConsoleTerminateEvent::class => ['onTerminate'],

src/Name/Generator/RequestNameGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static function getSubscribedEvents(): array
3535
{
3636
return [
3737
// Subscribe after route was resolved and request attributes were set
38-
RequestEvent::class => ['onRequest', 31],
38+
RequestEvent::class => ['onRequest', 30],
3939
TerminateEvent::class => ['onTerminate', -16384],
4040
];
4141
}

0 commit comments

Comments
 (0)