Skip to content

Commit 2b81358

Browse files
committed
Split shorten to be able to disable it by using max_length: ~
1 parent 345bc29 commit 2b81358

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/DependencyInjection/JaegerExtension.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ public function load(array $configs, ContainerBuilder $container)
2727
}
2828

2929
if ($this->isConfigEnabled($container, $config['name_generator'])) {
30-
$container->setParameter('jaeger.name.max_length', $config['name_generator']['max_length']);
30+
if ($config['name_generator']['max_length']) {
31+
$loader->load('shorten.yml');
32+
$container->setParameter('jaeger.name.max_length', $config['name_generator']['max_length']);
33+
}
3134
foreach ($config['name_generator']['request'] as $item => $customGeneratorId) {
3235
$regexp = \sprintf('/%s/', $item);
3336
$shortenedGeneratorId = \sprintf('jaeger.name.generator.%s', $customGeneratorId);

src/Resources/services.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ parameters:
1212
env(JAEGER_DEBUG_COOKIE): 'debug'
1313
env(JAEGER_SERVICE_NAME): '%service_name%'
1414
env(JAEGER_SPAN_BATCH): '16'
15-
jaeger.name.max_length: 64
1615

1716
services:
1817
spl.stack:
@@ -152,10 +151,6 @@ services:
152151
- '@spl.priority.queue'
153152
jaeger.name.generator:
154153
alias: 'jaeger.name.generator.chain'
155-
jaeger.name.generator.shorten:
156-
class: Jaeger\Symfony\Name\Generator\ShortenGeneratorDecorator
157-
decorates: jaeger.name.generator
158-
arguments: ['@jaeger.name.generator.shorten.inner', '%jaeger.name.max_length%']
159154
jaeger.span.handler.background:
160155
class: Jaeger\Symfony\Bridge\BackgroundSpanHandler
161156
arguments: ['@jaeger.tracer']

src/Resources/shorten.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
parameters:
2+
jaeger.name.max_length: 64
3+
services:
4+
jaeger.name.generator.shorten:
5+
class: Jaeger\Symfony\Name\Generator\ShortenGeneratorDecorator
6+
decorates: jaeger.name.generator
7+
arguments: [ '@jaeger.name.generator.shorten.inner', '%jaeger.name.max_length%' ]

0 commit comments

Comments
 (0)