[Usage Counters] Enhancements to the APIs

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/search_dsl.test.ts

@@ -103,7 +103,8 @@ describe('getSearchDsl', () => {
         mappings,
         opts.type,
         opts.sortField,
-        opts.sortOrder
+        opts.sortOrder,
+        opts.pit
       );
     });
 

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/search_dsl.ts

@@ -86,7 +86,7 @@ export function getSearchDsl(
       hasNoReferenceOperator,
       kueryNode,
     }),
-    ...getSortingParams(mappings, type, sortField, sortOrder),
+    ...getSortingParams(mappings, type, sortField, sortOrder, pit),
     ...(pit ? getPitParams(pit) : {}),
     search_after: searchAfter,
   };

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/sorting_params.test.ts

@@ -238,4 +238,12 @@ describe('searchDsl/getSortParams', () => {
       });
     });
   });
+
+  describe('pit, no sortField', () => {
+    it('defaults to natural storage order sorting', () => {
+      expect(getSortingParams(MAPPINGS, 'saved', undefined, undefined, { id: 'abc123' })).toEqual({
+        sort: ['_shard_doc'],
+      });
+    });
+  });
 });

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/sorting_params.ts

@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import Boom from '@hapi/boom';
+import type { SortOrder, SortCombinations } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SavedObjectsPitParams } from '@kbn/core-saved-objects-api-server/src/apis';
 import { getProperty, type IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 
 const TOP_LEVEL_FIELDS = ['_id', '_score'];
@@ -16,10 +17,15 @@ export function getSortingParams(
   mappings: IndexMapping,
   type: string | string[],
   sortField?: string,
-  sortOrder?: estypes.SortOrder
-): { sort?: estypes.SortCombinations[] } {
+  sortOrder?: SortOrder,
+  pit?: SavedObjectsPitParams
+): { sort?: SortCombinations[] } {
   if (!sortField) {
-    return {};
+    // if we are performing a PIT search, we must sort by some criteria
+    // in order to get the 'sort' property for each of the results.
+    // Defaulting to '_shard_doc' tells ES to sort by the natural stored order,
+    // giving the best performance
+    return pit ? { sort: ['_shard_doc'] } : {};
   }
 
   const types = Array.isArray(type) ? type : [type];

src/plugins/data_views/server/rest_api_routes/public/test_utils.ts

@@ -7,5 +7,6 @@
  */
 
 export const getUsageCollection = () => ({
+  domainId: 'abc123',
   incrementCounter: jest.fn(),
 });

src/plugins/kibana_usage_collection/server/collectors/index.ts

@@ -20,8 +20,5 @@ export { registerCoreUsageCollector } from './core';
 export { registerLocalizationUsageCollector } from './localization';
 export { registerConfigUsageCollector } from './config_usage';
 export { registerUiCountersUsageCollector } from './ui_counters';
-export {
-  registerUsageCountersRollups,
-  registerUsageCountersUsageCollector,
-} from './usage_counters';
+export { registerUsageCountersUsageCollector } from './usage_counters';
 export { registerEventLoopDelaysCollector } from './event_loop_delays';

src/plugins/kibana_usage_collection/server/collectors/usage_counters/index.ts

@@ -7,4 +7,3 @@
  */
 
 export { registerUsageCountersUsageCollector } from './register_usage_counters_collector';
-export { registerUsageCountersRollups } from './rollups';