Skip to content

Commit 0ff0e54

Browse files
committed
More clear alternative in configuration parsing
1 parent 4393596 commit 0ff0e54

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

src/DependencyInjection/JaegerExtension.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,39 @@ public function load(array $configs, ContainerBuilder $container)
2020
$loader->load('services.yml');
2121
$configuration = new Configuration();
2222
$config = $this->processConfiguration($configuration, $configs);
23+
2324
if ($this->isConfigEnabled($container, $config['denylist'])) {
2425
$container->setParameter('jaeger.sampler.operation_denylist', $config['denylist']['operation_names']);
2526
$loader->load('denylist.yml');
2627
}
28+
2729
if ($this->isConfigEnabled($container, $config['name_generator'])) {
2830
$container->setParameter('jaeger.name.max_length', (int)$config['name_generator']['max_length']);
29-
foreach ($config['name_generator']['request'] as $item => $alias) {
30-
if ($container->has(\sprintf('jaeger.name.generator.%s', $alias))) {
31+
foreach ($config['name_generator']['request'] as $item => $customGeneratorId) {
32+
$shortenedGeneratorId = \sprintf('jaeger.name.generator.%s', $customGeneratorId);
33+
if ($container->has($shortenedGeneratorId)) {
3134
$container->getDefinition('jaeger.name.generator.request')->addMethodCall(
3235
'add',
33-
[$item, new Reference(\sprintf('jaeger.name.generator.%s', $alias))]
36+
[$item, new Reference($shortenedGeneratorId)]
3437
);
3538
} else {
3639
$container->getDefinition('jaeger.name.generator.request')->addMethodCall(
3740
'add',
38-
[$item, new Reference($alias)]
41+
[$item, new Reference($customGeneratorId)]
3942
);
4043
}
4144
}
42-
foreach ($config['name_generator']['command'] as $item => $alias) {
43-
if ($container->has(\sprintf('jaeger.name.generator.%s', $alias))) {
45+
foreach ($config['name_generator']['command'] as $item => $customGeneratorId) {
46+
$shortenedGeneratorId = \sprintf('jaeger.name.generator.%s', $customGeneratorId);
47+
if ($container->has($shortenedGeneratorId)) {
4448
$container->getDefinition('jaeger.name.generator.command')->addMethodCall(
4549
'add',
46-
[$item, new Reference(\sprintf('jaeger.name.generator.%s', $alias))]
50+
[$item, new Reference($shortenedGeneratorId)]
4751
);
4852
} else {
4953
$container->getDefinition('jaeger.name.generator.command')->addMethodCall(
5054
'add',
51-
[$item, new Reference($alias)]
55+
[$item, new Reference($customGeneratorId)]
5256
);
5357
}
5458
}

0 commit comments

Comments
 (0)