clean logging

readme.md

@@ -38,6 +38,12 @@ OTEL_EXPORTER_OTLP_ENDPOINT=http://<your-telemetry-collector>:4318
 Enable the extension. See the complete [configuration reference here](./docs/config-reference.md) or run ```bin/console config:dump-reference instrumentation```.
 ```yaml
 instrumentation: ~
+
+monolog:
+  handlers:
+    otel:
+      type: service
+      id: Instrumentation\Logging\OtelHandler
 ```
 
 ### Usage

src/DependencyInjection/Extension.php

@@ -9,7 +9,6 @@
 
 namespace Instrumentation\DependencyInjection;
 
-use Instrumentation\Logging\OtelHandler;
 use Instrumentation\Tracing\Bridge\TraceUrlGenerator;
 use Instrumentation\Tracing\Bridge\TraceUrlGeneratorInterface;
 use Instrumentation\Tracing\Doctrine\Instrumentation\DBAL\Middleware as InstrumentationMiddleware;
@@ -41,8 +40,10 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('service.name', $config['resource']['service.name']);
 
         $this->loadSemConv($config['resource'], $container);
-        $this->loadLogging($config['logging'], $container);
 
+        if ($this->isConfigEnabled($container, $config['logging'])) {
+            $this->loadLogging($config['baggage'], $container);
+        }
         if ($this->isConfigEnabled($container, $config['baggage'])) {
             $this->loadBaggage($config['baggage'], $container);
         }
@@ -56,17 +57,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
     public function prepend(ContainerBuilder $container): void
     {
-        if ($container->hasExtension('monolog')) {
-            $container->prependExtensionConfig('monolog', [
-                'handlers' => [
-                    'otel' => [
-                        'type' => 'service',
-                        'id' => OtelHandler::class,
-                    ],
-                ],
-            ]);
-        }
-
         if ($container->hasExtension('twig')) {
             $container->prependExtensionConfig('twig', [
                 'paths' => [
@@ -200,8 +190,6 @@ protected function loadLogging(array $config, ContainerBuilder $container): void
     {
         $loader = $this->getLoader('logging', $container);
 
-        $container->setParameter('logging.enabled', $this->isConfigEnabled($container, $config));
-
         $loader->load('logging.php');
     }
 

src/DependencyInjection/config/logging/logging.php

@@ -16,7 +16,6 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $container) {
@@ -39,7 +38,6 @@
 
         ->set(Logging\OtelHandler::class)
         ->args([
-            '$enabled' => param('logging.enabled'),
             '$loggerProvider' => service(LoggerProviderInterface::class),
             '$level' => Level::Debug,
             '$bubble' => true,

src/Logging/OtelHandler.php

@@ -26,7 +26,7 @@ class OtelHandler extends AbstractProcessingHandler
      **/
     private array $loggers = [];
 
-    public function __construct(private readonly bool $enabled, private readonly API\LoggerProviderInterface $loggerProvider, Level $level, bool $bubble = true)
+    public function __construct(private readonly API\LoggerProviderInterface $loggerProvider, Level $level, bool $bubble = true)
     {
         parent::__construct($level, $bubble);
 
@@ -50,10 +50,6 @@ protected function getDefaultFormatter(): FormatterInterface
 
     protected function write(LogRecord $record): void
     {
-        if (!$this->enabled) {
-            return;
-        }
-
         $formatted = $record['formatted'];
         $logRecord = (new API\LogRecord())
             ->setTimestamp((int) $record['datetime']->format('Uu') * 1000) // @phpstan-ignore-line