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

allflame · allflame · commit 7c48c968b0a8 · 2021-04-22T12:57:27.000+03:00
diff --git a/src/Bridge/BackgroundSpanHandler.php b/src/Bridge/BackgroundSpanHandler.php
@@ -15,7 +15,7 @@
 
 class BackgroundSpanHandler
 {
-    private ?SpanInterface $span;
+    private ?SpanInterface $span = null;
 
     private TracerInterface $tracer;
 
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -31,7 +31,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('name_generator')
                     ->canBeEnabled()
                     ->children()
-                        ->scalarNode('max_length')->defaultValue(64)->end()
+                        ->integerNode('max_length')->defaultValue(64)->end()
                         ->arrayNode('command')
                             ->useAttributeAsKey('name')
                             ->scalarPrototype()->end()

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class BackgroundSpanHandler`
`17`	`17`	`{`
`18`		`- private ?SpanInterface $span;`
	`18`	`+ private ?SpanInterface $span = null;`
`19`	`19`
`20`	`20`	`private TracerInterface $tracer;`
`21`	`21`