Merge remote-tracking branch 'origin/name-generator' into name-generator

Author: allflame

README.md

@@ -40,7 +40,12 @@ jaeger:
 
 ## Name generation options
 
-You can specify just the suffix, if you name generator service is named as `jaeger.name.generator.*` or if you have any other naming scheme you can put the whole name into the configuration.
+You can configure custom name generators based on regular expression pattern, which will be evaluated for operation name.
+
+Configuration for this feature looks like key-value list, where key - regexp pattern, value - custom name generator DI service id (see details below).
+
+Name generator should implement an 'TODO' interface.
+As a custom name generator you can specify a full DI service id, or just the suffix if your name generator service is named as `jaeger.name.generator.*`.
 Keys are considered body of the regular expression pattern, do not put any modifiers (e.g. `/i`, `/g`) or slashes; `route` of the request or `name` of the command should match to use alternative generator.
 Expressions are checked top to bottom, if no match is found, default generator will be used
 
@@ -52,6 +57,7 @@ jaeger:
   name_generator:
     max_length: 32
     command:  
+      '^app:report:.+': 'my_service_generator_alias'
       .* : 'controller'
     request:
       'user_routes_\w+': 'my_service_generator_alias'

src/DependencyInjection/JaegerExtension.php

@@ -43,7 +43,7 @@ public function load(array $configs, ContainerBuilder $container)
                     );
                 }
             }
-            foreach ($config['name_generator']['command'] as $item => $customGeneratorId) {
+            foreach ($config['name_generator']['command'] as $pattern => $customGeneratorId) {
                 $regexp = \sprintf('/%s/', $item);
                 $shortenedGeneratorId = \sprintf('jaeger.name.generator.%s', $customGeneratorId);
                 if ($container->has($shortenedGeneratorId)) {

src/Name/Generator/NameGeneratorChain.php

@@ -23,7 +23,10 @@ public function generate(): string
     {
         $queue = clone $this->queue;
         while (false === $queue->isEmpty()) {
-            if ('' !== ($name = $queue->extract()->generate())) {
+            /** @var NameGeneratorInterface $generator */
+            $generator = $queue->extract();
+            $name = $generator->generate()
+            if ('' !== $name) {
                 return $name;
             }
         }