Merge branch 'master' into search-session-user

x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts

@@ -845,15 +845,15 @@ describe('SearchSessionService', () => {
       savedObjectsClient.update.mockResolvedValue(mockUpdateSavedObject);
 
       await Promise.all([
-        service.trackId({ savedObjectsClient }, searchRequest1, searchId1, {
+        service.trackId({ savedObjectsClient }, mockUser1, searchRequest1, searchId1, {
           sessionId: sessionId1,
           strategy: MOCK_STRATEGY,
         }),
-        service.trackId({ savedObjectsClient }, searchRequest2, searchId2, {
+        service.trackId({ savedObjectsClient }, mockUser1, searchRequest2, searchId2, {
           sessionId: sessionId1,
           strategy: MOCK_STRATEGY,
         }),
-        service.trackId({ savedObjectsClient }, searchRequest3, searchId3, {
+        service.trackId({ savedObjectsClient }, mockUser1, searchRequest3, searchId3, {
           sessionId: sessionId2,
           strategy: MOCK_STRATEGY,
         }),

x-pack/plugins/data_enhanced/server/search/session/session_service.ts

@@ -6,6 +6,7 @@
  */
 
 import { notFound } from '@hapi/boom';
+import { debounce } from 'lodash';
 import {
   CoreSetup,
   CoreStart,
@@ -54,6 +55,7 @@ const DEBOUNCE_UPDATE_OR_CREATE_MAX_WAIT = 5000;
 
 interface UpdateOrCreateQueueEntry {
   deps: SearchSessionDependencies;
+  user: AuthenticatedUser | null;
   sessionId: string;
   attributes: Partial<SearchSessionSavedObjectAttributes>;
   resolve: () => void;
@@ -123,7 +125,12 @@ export class SearchSessionService
 
       Object.keys(batchedSessionAttributes).forEach((sessionId) => {
         const thisSession = queue.filter((s) => s.sessionId === sessionId);
-        this.updateOrCreate(thisSession[0].deps, sessionId, batchedSessionAttributes[sessionId])
+        this.updateOrCreate(
+          thisSession[0].deps,
+          thisSession[0].user,
+          sessionId,
+          batchedSessionAttributes[sessionId]
+        )
           .then(() => {
             thisSession.forEach((s) => s.resolve());
           })
@@ -137,11 +144,12 @@ export class SearchSessionService
   );
   private scheduleUpdateOrCreate = (
     deps: SearchSessionDependencies,
+    user: AuthenticatedUser | null,
     sessionId: string,
     attributes: Partial<SearchSessionSavedObjectAttributes>
   ): Promise<void> => {
     return new Promise((resolve, reject) => {
-      this.updateOrCreateBatchQueue.push({ deps, sessionId, attributes, resolve, reject });
+      this.updateOrCreateBatchQueue.push({ deps, user, sessionId, attributes, resolve, reject });
       // TODO: this would be better if we'd debounce per sessionId
       this.processUpdateOrCreateBatchQueue();
     });
@@ -378,7 +386,7 @@ export class SearchSessionService
       idMapping = { [requestHash]: searchInfo };
     }
 
-    await this.updateOrCreate(deps, user, sessionId, { idMapping });
+    await this.scheduleUpdateOrCreate(deps, user, sessionId, { idMapping });
   };
 
   public async getSearchIdMapping(

x-pack/test/api_integration/apis/search/session.ts

@@ -13,6 +13,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const security = getService('security');
+  const retry = getService('retry');
 
   describe('search session', () => {
     describe('session management', () => {