Fix spy

src/kibana/components/courier/fetch/_call_client.js

@@ -67,7 +67,15 @@ define(function (require) {
 
       // Now that all of THAT^^^ is out of the way, lets actually
       // call out to elasticsearch
-      Promise.resolve(strategy.convertReqsToBody(executable))
+      Promise.map(executable, function (req) {
+        return Promise.try(req.getFetchParams, void 0, req)
+        .then(function (fetchParams) {
+          return (req.fetchParams = fetchParams);
+        });
+      })
+      .then(function (reqsFetchParams) {
+        return strategy.reqsFetchParamsToBody(reqsFetchParams);
+      })
       .then(function (body) {
         // while the strategy was converting, our request was aborted
         if (esPromise === ABORTED) {

src/kibana/components/courier/fetch/request/request.js

@@ -37,7 +37,8 @@ define(function (require) {
       }
 
       if (source.history) {
-        source.history = _.first(source.history.concat(this), 20);
+        source.history.push(this);
+        source.history = _.last(source.history, 20);
       }
     };
 

src/kibana/components/courier/fetch/strategy/doc.js

@@ -8,15 +8,10 @@ define(function (require) {
        * @param  {array} requests - an array of flattened requests
        * @return {string} - the request body
        */
-      convertReqsToBody: function (reqs) {
-        return Promise.map(reqs, function (req) {
-          return req.getFetchParams();
-        })
-        .then(function (reqsParams) {
-          return {
-            docs: reqsParams
-          };
-        });
+      reqsFetchParamsToBody: function (reqsFetchParams) {
+        return {
+          docs: reqsFetchParams
+        };
       },
 
       /**

src/kibana/components/courier/fetch/strategy/search.js

@@ -11,29 +11,23 @@ define(function (require) {
        * @param  {array} requests - the requests to serialize
        * @return {string} - the request body
        */
-      convertReqsToBody: function (reqs) {
-        return Promise.map(reqs, function (req) {
-          return req.getFetchParams();
-        })
-        .then(function (reqsParams) {
-          return reqsParams.map(function (reqParams) {
-            var indexList = reqParams.index;
+      reqsFetchParamsToBody: function (reqsFetchParams) {
+        return reqsFetchParams.map(function (fetchParams) {
+          var indexList = fetchParams.index;
 
-            if (_.isFunction(_.deepGet(indexList, 'toIndexList'))) {
-              var timeBounds = timefilter.getBounds();
-              indexList = indexList.toIndexList(timeBounds.min, timeBounds.max);
-            }
+          if (_.isFunction(_.deepGet(indexList, 'toIndexList'))) {
+            var timeBounds = timefilter.getBounds();
+            indexList = indexList.toIndexList(timeBounds.min, timeBounds.max);
+          }
 
-            return JSON.stringify({
-              index: indexList,
-              type: reqParams.type,
-              ignore_unavailable: true
-            })
-            + '\n'
-            + JSON.stringify(reqParams.body || {});
-
-          }).join('\n') + '\n';
-        });
+          return JSON.stringify({
+            index: indexList,
+            type: fetchParams.type,
+            ignore_unavailable: true
+          })
+          + '\n'
+          + JSON.stringify(fetchParams.body || {});
+        }).join('\n') + '\n';
       },
 
       /**

src/kibana/components/visualize/spy/_req_resp_stats.js

@@ -19,29 +19,25 @@ define(function (require) {
 
       if (!$scope.searchSource) return;
 
-      var searchHistory = $scope.searchSource.history;
-      if (!searchHistory) return;
+      var req = $scope.entry = _.last(_.deepGet($scope, 'searchSource.history'));
+      if (!req) return;
 
-      var entry = $scope.entry = _.find(searchHistory, 'state');
-      if (!entry) return;
-
-      var state = entry.state;
-      var resp = entry.resp;
+      var resp = req.resp;
       var meta = [];
 
       if (resp && resp.took != null) meta.push(['Query Duration', resp.took + 'ms']);
-      if (entry && entry.ms != null) meta.push(['Request Duration', entry.ms + 'ms']);
+      if (req && req.ms != null) meta.push(['Request Duration', req.ms + 'ms']);
       if (resp && resp.hits) meta.push(['Hits', resp.hits.total]);
 
-      if (state.index) meta.push(['Index', state.index]);
-      if (state.type) meta.push(['Type', state.type]);
-      if (state.id) meta.push(['Id', state.id]);
+      if (req.fetchParams.index) meta.push(['Index', req.fetchParams.index]);
+      if (req.fetchParams.type) meta.push(['Type', req.fetchParams.type]);
+      if (req.fetchParams.id) meta.push(['Id', req.fetchParams.id]);
 
       $scope.history = {
         meta: meta,
-        req: state.body,
-        resp: entry.resp,
-        complete: entry.complete
+        req: req.fetchParams.body,
+        resp: req.resp,
+        complete: req.complete
       };
     });
   };