refactor(DependencyInjection): remove services definitions from exten…

…sion (#124)
FriendsOfOpenTelemetry · Jan 25, 2025 · cf88e33 · cf88e33
1 parent c280b2c
commit cf88e33
Show file tree

Hide file tree

Showing 21 changed files with 226 additions and 478 deletions.
diff --git a/src/DependencyInjection/Compiler/CacheInstrumentationPass.php b/src/DependencyInjection/Compiler/CacheInstrumentationPass.php
@@ -2,7 +2,6 @@
 
 namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -13,18 +12,10 @@ class CacheInstrumentationPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (false === $container->hasParameter('open_telemetry.instrumentation.cache.tracing.enabled')
-            || false === $container->getParameter('open_telemetry.instrumentation.cache.tracing.enabled')) {
-            $container->removeDefinition('open_telemetry.instrumentation.cache.trace.tag_aware_adapter');
-            $container->removeDefinition('open_telemetry.instrumentation.cache.trace.adapter');
-
+        if (!$container->getParameter('open_telemetry.instrumentation.cache.tracing.enabled')) {
             return;
         }
 
-        if (!class_exists(CacheItem::class)) {
-            throw new \LogicException('Cache instrumentation cannot be enabled because the symfony/cache package is not installed.');
-        }
-
         foreach ($container->findTaggedServiceIds('cache.pool') as $serviceId => $tags) {
             $cachePoolDefinition = $container->getDefinition($serviceId);
             if ($cachePoolDefinition->isAbstract()) {

diff --git a/src/DependencyInjection/Compiler/ConsoleInstrumentationPass.php b/src/DependencyInjection/Compiler/ConsoleInstrumentationPass.php
diff --git a/src/DependencyInjection/Compiler/DoctrineInstrumentationPass.php b/src/DependencyInjection/Compiler/DoctrineInstrumentationPass.php
diff --git a/src/DependencyInjection/Compiler/HttpClientInstrumentationPass.php b/src/DependencyInjection/Compiler/HttpClientInstrumentationPass.php
@@ -5,23 +5,15 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpClient\HttpClient;
 
 class HttpClientInstrumentationPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (false === $container->hasParameter('open_telemetry.instrumentation.http_client.tracing.enabled')
-            || false === $container->getParameter('open_telemetry.instrumentation.http_client.tracing.enabled')) {
-            $container->removeDefinition('open_telemetry.instrumentation.http_client.trace.client');
-
+        if (!$container->getParameter('open_telemetry.instrumentation.http_client.tracing.enabled')) {
             return;
         }
 
-        if (!class_exists(HttpClient::class)) {
-            throw new \LogicException('Http client instrumentation cannot be enabled because the symfony/http-client package is not installed.');
-        }
-
         $decoratedService = $this->getDecoratedService($container);
         if (null === $decoratedService) {
             $container->removeDefinition('open_telemetry.instrumentation.http_client.trace.client');

diff --git a/src/DependencyInjection/Compiler/HttpKernelInstrumentationPass.php b/src/DependencyInjection/Compiler/HttpKernelInstrumentationPass.php
diff --git a/src/DependencyInjection/Compiler/MailerInstrumentationPass.php b/src/DependencyInjection/Compiler/MailerInstrumentationPass.php
diff --git a/src/DependencyInjection/Compiler/MessengerInstrumentationPass.php b/src/DependencyInjection/Compiler/MessengerInstrumentationPass.php
diff --git a/src/DependencyInjection/Compiler/TracerLocatorPass.php b/src/DependencyInjection/Compiler/TracerLocatorPass.php
@@ -15,11 +15,11 @@ public function process(ContainerBuilder $container): void
         $tracers = $container->findTaggedServiceIds('open_telemetry.tracer');
 
         if (0 < count($tracers)) {
-            if ($container->has('open_telemetry.instrumentation.console.trace.event_subscriber')) {
+            if ($container->hasDefinition('open_telemetry.instrumentation.console.trace.event_subscriber')) {
                 $traceableConsoleEventSubscriber = $container->getDefinition('open_telemetry.instrumentation.console.trace.event_subscriber');
                 $this->setTracerLocatorArgument($container, $traceableConsoleEventSubscriber, $tracers);
             }
-            if ($container->has('open_telemetry.instrumentation.http_kernel.trace.event_subscriber')) {
+            if ($container->hasDefinition('open_telemetry.instrumentation.http_kernel.trace.event_subscriber')) {
                 $traceableHttpKernelEventSubscriber = $container->getDefinition('open_telemetry.instrumentation.http_kernel.trace.event_subscriber');
                 $this->setTracerLocatorArgument($container, $traceableHttpKernelEventSubscriber, $tracers);
             }

diff --git a/src/DependencyInjection/Compiler/TwigInstrumentationPass.php b/src/DependencyInjection/Compiler/TwigInstrumentationPass.php