Merge pull request #2676 from tomaszdurka/include-index-names-in-es-s…

…tats CM-CR-115 FB-1038 Move stat logging to ES client, log index names and types
cargomedia · Jul 17, 2017 · 6e3f133 · 6e3f133
2 parents 00ebd86 + 6f0144e
commit 6e3f133
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/library/CM/Elasticsearch/Client.php b/library/CM/Elasticsearch/Client.php
@@ -5,11 +5,16 @@ class CM_Elasticsearch_Client {
     /** @var Elasticsearch\Client */
     protected $_client;
 
+    /** @var CM_Debug|null */
+    private $_debug;
+
     /**
      * @param \Elasticsearch\Client $client
+     * @param CM_Debug|null         $debug
      */
-    public function __construct(Elasticsearch\Client $client) {
+    public function __construct(Elasticsearch\Client $client, CM_Debug $debug = null) {
         $this->_client = $client;
+        $this->_debug = $debug;
     }
 
     /**
@@ -234,7 +239,7 @@ public function putIndexSettings($indexName, array $settings) {
             'index' => $paramIndex,
             'body'  => [
                 'settings' => $settings,
-            ]
+            ],
         ]);
     }
 
@@ -264,12 +269,16 @@ public function search($indexNameList, $typeNameList, array $data) {
             'type'  => self::_prepareIndexNameParam($typeNameList),
             'body'  => $data,
         ];
+
+        if ($debug = $this->_getDebug()) {
+            $debug->incStats('search', json_encode($params));
+        }
         return $this->_getClient()->search($params);
     }
 
     public function awaitReady() {
         $this->_client->cluster()->health([
-            'wait_for_status' => 'yellow'
+            'wait_for_status' => 'yellow',
         ]);
     }
 
@@ -295,7 +304,7 @@ protected function _processBulkResponse(array $response) {
 
             throw new CM_Exception_Invalid('Error(s) in bulk request action(s)', null, [
                 'errorsCount' => count($response['items']),
-                'message'     => $message
+                'message'     => $message,
             ]);
         }
     }
@@ -314,6 +323,13 @@ protected function _getIndices() {
         return $this->_client->indices();
     }
 
+    /**
+     * @return CM_Debug|null
+     */
+    protected function _getDebug() {
+        return $this->_debug;
+    }
+
     /**
      * @param string[]|string $indexName
      * @return string

diff --git a/library/CM/Elasticsearch/Cluster.php b/library/CM/Elasticsearch/Cluster.php
@@ -24,7 +24,7 @@ public function __construct(array $servers, $disabled = null) {
         $elasticsearchClient = \Elasticsearch\ClientBuilder::create()->setHosts($hosts)->build();
         //By default it uses RoundRobinSelector and number of retries equals to nodes quantity
 
-        $this->_client = new CM_Elasticsearch_Client($elasticsearchClient);
+        $this->_client = new CM_Elasticsearch_Client($elasticsearchClient, $this->getServiceManager()->getDebug());
     }
 
     /**
@@ -67,15 +67,12 @@ public function query(array $types, array $data = null) {
         if (!$this->getEnabled()) {
             return array();
         }
-        $this->getServiceManager()->getDebug()->incStats('search', json_encode($data));
-
         $indexNameList = [];
         $typeNameList = [];
         foreach ($types as $type) {
             $indexNameList[] = $type->getIndexName();
             $typeNameList[] = $type->getTypeName();
         }
-
         return $this->getClient()->search($indexNameList, $typeNameList, $data);
     }
 }