Merge pull request #656 from einorler/issue616

implemented the display of ongr_es performance in Symfony profiler

Author: saimaz

DependencyInjection/ONGRElasticsearchExtension.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -49,6 +50,12 @@ public function load(array $configs, ContainerBuilder $container)
             ]
         );
         $definition->addMethodCall('setEventDispatcher', [new Reference('event_dispatcher')]);
+        $definition->addMethodCall(
+            'setStopwatch',
+            [
+                new Reference('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE)
+            ]
+        );
         $container->setDefinition('es.manager_factory', $definition);
     }
 }

ONGRElasticsearchBundle.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\ElasticsearchBundle;
 
+use ONGR\ElasticsearchBundle\DependencyInjection\Compiler\ManagerFactoryPass;
 use ONGR\ElasticsearchBundle\DependencyInjection\Compiler\MappingPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

Service/Manager.php

@@ -25,6 +25,7 @@
 use ONGR\ElasticsearchBundle\Result\Result;
 use ONGR\ElasticsearchDSL\Search;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Manager class.
@@ -103,6 +104,11 @@ class Manager
      */
     private $eventDispatcher;
 
+    /**
+     * @var Stopwatch
+     */
+    private $stopwatch;
+
     /**
      * @param string            $name              Manager name
      * @param array             $config            Manager configuration
@@ -161,6 +167,14 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
         $this->eventDispatcher = $eventDispatcher;
     }
 
+    /**
+     * @param Stopwatch $stopwatch
+     */
+    public function setStopwatch(Stopwatch $stopwatch)
+    {
+        $this->stopwatch = $stopwatch;
+    }
+
     /**
      * Returns repository by document class.
      *
@@ -270,7 +284,11 @@ public function search(array $types, array $query, array $queryStringParams = []
             $params = array_merge($queryStringParams, $params);
         }
 
-        return $this->client->search($params);
+        $this->stopwatch('start', 'search');
+        $result = $this->client->search($params);
+        $this->stopwatch('stop', 'search');
+
+        return $result;
     }
 
     /**
@@ -347,10 +365,15 @@ public function commit(array $params = [])
                 new CommitEvent($this->getCommitMode(), $bulkQueries)
             );
 
+            $this->stopwatch('start', 'bulk');
             $bulkResponse = $this->client->bulk($bulkQueries);
+            $this->stopwatch('stop', 'bulk');
+
             $this->bulkQueries = [];
             $this->bulkCount = 0;
 
+            $this->stopwatch('start', 'refresh');
+
             switch ($this->getCommitMode()) {
                 case 'flush':
                     $this->flush($params);
@@ -365,6 +388,8 @@ public function commit(array $params = [])
                 new CommitEvent($this->getCommitMode(), $bulkResponse)
             );
 
+            $this->stopwatch('stop', 'refresh');
+
             return $bulkResponse;
         }
 
@@ -424,6 +449,7 @@ public function bulk($operation, $type, array $query)
         $this->bulkCount++;
 
         $response = null;
+
         if ($this->bulkCommitSize === $this->bulkCount) {
             $response = $this->commit();
         }
@@ -703,4 +729,17 @@ private function resolveTypeName($className)
 
         return $className;
     }
+
+    /**
+     * Starts and stops an event in the stopwatch
+     *
+     * @param string $action   only 'start' and 'stop'
+     * @param string $name     name of the event
+     */
+    private function stopwatch($action, $name)
+    {
+        if (isset($this->stopwatch)) {
+            $this->stopwatch->$action('ongr_es: '.$name, 'ongr_es');
+        }
+    }
 }

Service/ManagerFactory.php

@@ -16,6 +16,7 @@
 use ONGR\ElasticsearchBundle\Result\Converter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Elasticsearch Manager factory class.
@@ -47,6 +48,11 @@ class ManagerFactory
      */
     private $eventDispatcher;
 
+    /**
+     * @var Stopwatch
+     */
+    private $stopwatch;
+
     /**
      * @param MetadataCollector $metadataCollector Metadata collector service.
      * @param Converter         $converter         Converter service to transform arrays to objects and visa versa.
@@ -69,6 +75,14 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
         $this->eventDispatcher = $eventDispatcher;
     }
 
+    /**
+     * @param Stopwatch $stopwatch
+     */
+    public function setStopwatch(Stopwatch $stopwatch)
+    {
+        $this->stopwatch = $stopwatch;
+    }
+
     /**
      * Factory function to create a manager instance.
      *
@@ -125,6 +139,10 @@ public function createManager($managerName, $connection, $analysis, $managerConf
             $this->converter
         );
 
+        if (isset($this->stopwatch)) {
+            $manager->setStopwatch($this->stopwatch);
+        }
+
         $manager->setCommitMode($managerConfig['commit_mode']);
         $manager->setEventDispatcher($this->eventDispatcher);
         $manager->setBulkCommitSize($managerConfig['bulk_size']);