Add stopwatch

Author: GromNaN

src/DataCollector/DriverEventSubscriber.php

@@ -20,11 +20,11 @@
 
 namespace MongoDB\Bundle\DataCollector;
 
-use MongoDB\Client;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
+use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Contracts\Service\ResetInterface;
 
 /** @internal */
@@ -34,10 +34,12 @@ final class DriverEventSubscriber implements CommandSubscriber, ResetInterface
      * @var list<CommandFailedEvent|CommandStartedEvent|CommandSucceededEvent>
      */
     private array $events = [];
+    private array $stopwatchEvents = [];
 
-    public function subscribe(Client $client): void
-    {
-        $client->getManager()->addSubscriber($this);
+    public function __construct(
+        private string $clientName,
+        private ?Stopwatch $stopwatch = null,
+    ) {
     }
 
     /**
@@ -51,16 +53,33 @@ public function getEvents(): array
     public function commandFailed(CommandFailedEvent $event): void
     {
         $this->events[] = $event;
+
+        if (isset($this->stopwatchEvents[$event->getRequestId()])) {
+            $this->stopwatchEvents[$event->getRequestId()]->stop();
+            unset($this->stopwatchEvents[$event->getRequestId()]);
+        }
     }
 
     public function commandStarted(CommandStartedEvent $event): void
     {
         $this->events[] = $event;
+
+        if ($this->stopwatch) {
+            $this->stopwatchEvents[$event->getRequestId()] = $this->stopwatch->start(
+                'mongodb.'.$this->clientName.'.'.$event->getCommandName(),
+                'mongodb',
+            );
+        }
     }
 
     public function commandSucceeded(CommandSucceededEvent $event): void
     {
         $this->events[] = $event;
+
+        if (isset($this->stopwatchEvents[$event->getRequestId()])) {
+            $this->stopwatchEvents[$event->getRequestId()]->stop();
+            unset($this->stopwatchEvents[$event->getRequestId()]);
+        }
     }
 
     public function reset(): void

src/DependencyInjection/Compiler/DataCollectorPass.php

@@ -23,6 +23,7 @@
 use MongoDB\Bundle\DataCollector\DriverEventSubscriber;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -40,7 +41,13 @@ public function process(ContainerBuilder $container): void
         // Add a subscriber to each client to collect driver events, and register the client to the data collector.
         foreach ($container->findTaggedServiceIds('mongodb.client', true) as $clientId => $attributes) {
             $subscriberId = sprintf('%s.subscriber', $clientId);
-            $container->setDefinition($subscriberId, new Definition(DriverEventSubscriber::class));
+            $subscriber = new Definition(DriverEventSubscriber::class);
+            $subscriber->setArguments([
+                $attributes[0]['name'] ?? $clientId,
+                new Reference('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+            ]);
+            $container->setDefinition($subscriberId, $subscriber);
+
             $container->getDefinition($clientId)->addMethodCall('addSubscriber', [new Reference($subscriberId)]);
             $dataCollector->addMethodCall('addClient', [
                 $attributes[0]['name'] ?? $clientId,