Added controller name generator, some minor fixes

Author: allflame

src/DependencyInjection/JaegerExtension.php

@@ -27,16 +27,30 @@ public function load(array $configs, ContainerBuilder $container)
         if ($this->isConfigEnabled($container, $config['name_generator'])) {
             $container->setParameter('jaeger.name.max_length', (int)$config['name_generator']['max_length']);
             foreach ($config['name_generator']['request'] as $item => $alias) {
-                $container->getDefinition('jaeger.name.generator.request')->addMethodCall(
-                    'add',
-                    [$item, new Reference($alias)]
-                );
+                if ($container->has(\sprintf('jaeger.name.generator.%s', $alias))) {
+                    $container->getDefinition('jaeger.name.generator.request')->addMethodCall(
+                        'add',
+                        [$item, new Reference(\sprintf('jaeger.name.generator.%s', $alias))]
+                    );
+                } else {
+                    $container->getDefinition('jaeger.name.generator.request')->addMethodCall(
+                        'add',
+                        [$item, new Reference($alias)]
+                    );
+                }
             }
             foreach ($config['name_generator']['command'] as $item => $alias) {
-                $container->getDefinition('jaeger.name.generator.command')->addMethodCall(
-                    'add',
-                    [$item, new Reference($alias)]
-                );
+                if ($container->has(\sprintf('jaeger.name.generator.%s', $alias))) {
+                    $container->getDefinition('jaeger.name.generator.command')->addMethodCall(
+                        'add',
+                        [$item, new Reference(\sprintf('jaeger.name.generator.%s', $alias))]
+                    );
+                } else {
+                    $container->getDefinition('jaeger.name.generator.command')->addMethodCall(
+                        'add',
+                        [$item, new Reference($alias)]
+                    );
+                }
             }
         }
     }

src/Name/Generator/ControllerNameGenerator.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Jaeger\Symfony\Name\Generator;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+
+class ControllerNameGenerator implements NameGeneratorInterface, EventSubscriberInterface
+{
+    private string $controller;
+
+    public static function getSubscribedEvents(): array
+    {
+        return [RequestEvent::class => ['onRequest', 30], TerminateEvent::class => ['onTerminate', -16384],];
+    }
+
+    public function onRequest(RequestEvent $event): void
+    {
+        $this->controller = $event->getRequest()->attributes->get('_controller', '');
+    }
+
+    public function onTerminate(): void
+    {
+        $this->controller = '';
+    }
+
+    public function generate(): string
+    {
+        return $this->controller;
+    }
+}

src/Name/Generator/NameGeneratorChain.php

@@ -23,8 +23,8 @@ public function generate(): string
     {
         $queue = clone $this->queue;
         while (false === $queue->isEmpty()) {
-            if ('' !== ($debugId = $queue->extract()->generate())) {
-                return $debugId;
+            if ('' !== ($name = $queue->extract()->generate())) {
+                return $name;
             }
         }
 

src/Resources/services.yml

@@ -127,6 +127,10 @@ services:
       - '@spl.priority.queue'
   jaeger.debug.extractor:
     alias: 'jaeger.debug.extractor.chain'
+  jaeger.name.generator.controller:
+    class: Jaeger\Symfony\Name\Generator\ControllerNameGenerator
+    tags:
+      - {name: 'kernel.event_subscriber' }
   jaeger.name.generator.default:
     class: Jaeger\Symfony\Name\Generator\DefaultNameGenerator
     tags: