chore: make logging context keys configurable

worldia · Aug 30, 2022 · 4e33863 · 4e33863
1 parent a3c1623
commit 4e33863
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -58,6 +58,14 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->booleanNode('enabled')->defaultTrue()->end()
+                        ->arrayNode('handlers')
+                            ->defaultValue([
+                                'main',
+                                'console',
+                            ])
+                            ->scalarPrototype()->end()
+                            ->info('Handlers to which the trace context processor should be bound')
+                        ->end()
                         ->arrayNode('keys')
                             ->addDefaultsIfNotSet()
                             ->children()

diff --git a/src/DependencyInjection/Extension.php b/src/DependencyInjection/Extension.php
@@ -265,6 +265,11 @@ protected function loadLogging(array $config, ContainerBuilder $container): void
             $map[$property] = $keys;
         }
 
+        foreach ($config['handlers'] as $handler) {
+            $container->getDefinition(\Instrumentation\Logging\Processor\TraceContextProcessor::class)
+                ->addTag('monolog.processor', ['handler' => $handler]);
+        }
+
         $container->setParameter('logging.trace_context_keys', $map);
     }
 

diff --git a/src/DependencyInjection/config/logging/logging.php b/src/DependencyInjection/config/logging/logging.php
@@ -28,5 +28,5 @@
 
         ->set(Logging\Processor\TraceContextProcessor::class)
         ->args([param('logging.trace_context_keys')])
-        ->tag('monolog.processor');
+    ;
 };
diff --git a/src/Tracing/Instrumentation/LogHandler/TracingHandler.php b/src/Tracing/Instrumentation/LogHandler/TracingHandler.php
@@ -46,7 +46,7 @@ protected function write(array $record): void
         if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) {
             $span->recordException($record['context']['exception'], ['raw_stacktrace' => $record['context']['exception']->getTraceAsString()]);
         } else {
-            $span->addEvent($record['message'], ['_severity' => $record['level_name'], '_category' => $record['channel']]);
+            $span->addEvent($record['message']);
         }
     }
 }