[APM] Update ES archive for tests

x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/archives_metadata.ts

@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-/* eslint-disable import/no-default-export*/
-export default {
+/* eslint-disable-next-line*/
+    export default {
   'apm_8.0.0': {
-    start: '2020-12-08T13:57:56.135Z',
-    end: '2020-12-08T14:27:56.135Z',
+    start: '2021-07-27T08:08:11.069Z',
+    end: '2021-07-27T08:38:11.069Z',
   },
 };

x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts

@@ -37,8 +37,14 @@ async function run() {
       bool: {
         must_not: [
           {
-            term: {
-              'service.name': 'elastic-co-frontend',
+            terms: {
+              'service.name': [
+                'elastic-co-frontend',
+                'filebeat',
+                'metricbeat',
+                'heartbeat',
+                'apm-server',
+              ],
             },
           },
         ],
@@ -153,15 +159,22 @@ async function run() {
       (bucket) => bucket.key as string
     ) ?? [];
 
+  const indicesToArchive = indicesWithDocs
+    .filter((index) => !index.startsWith('.kibana'))
+    .concat('.kibana')
+    .join(',');
+
+  console.log({
+    indicesToArchive,
+  });
+
   // create the archive
   const tmpDir = path.join(__dirname, 'tmp/');
   execSync(
-    `node scripts/es_archiver save ${archiveName} ${indicesWithDocs
-      .filter((index) => !index.startsWith('.kibana'))
-      .concat('.kibana')
-      .join(
-        ','
-      )} --dir=${tmpDir} --kibana-url=${kibanaUrl} --es-url=${esUrl} --query='${JSON.stringify(
+    `node scripts/es_archiver save ${path.join(
+      tmpDir,
+      archiveName
+    )} ${indicesToArchive} --kibana-url=${kibanaUrl} --es-url=${esUrl} --query='${JSON.stringify(
       query
     )}'`,
     {
@@ -192,17 +205,11 @@ async function run() {
   fs.writeFileSync(
     configFilePath,
     `
-    /* eslint-disable import/no-default-export*/
+    /* eslint-disable-next-line*/
     export default ${JSON.stringify(newConfig, null, 2)}`,
     { encoding: 'utf-8' }
   );
 
-  // run ESLint on the generated metadata files
-  execSync('node scripts/eslint **/*/archives_metadata.ts --fix', {
-    cwd: root,
-    stdio: 'inherit',
-  });
-
   const esArchiverDir = 'fixtures/es_archiver/';
 
   const apiIntegrationDir = path.join(
@@ -220,6 +227,12 @@ async function run() {
 
   // Delete tmp folder
   execSync(`rm -rf ${tmpDir}`);
+
+  // run ESLint on the generated metadata files
+  execSync('node scripts/eslint x-pack/**/*/archives_metadata.ts --fix', {
+    cwd: root,
+    stdio: 'inherit',
+  });
 }
 
 run()

x-pack/plugins/apm/scripts/shared/get_es_client.ts

@@ -30,11 +30,13 @@ export function getEsClient({
     auth,
   });
 
+  const originalSearch = client.search.bind(client);
+
   async function search<
     TDocument = unknown,
     TSearchRequest extends ESSearchRequest = ESSearchRequest
   >(request: TSearchRequest) {
-    const response = await client.search<TDocument>(request);
+    const response = await originalSearch<TDocument>(request);
 
     return {
       ...response,

x-pack/test/apm_api_integration/common/apm_api_supertest.ts

@@ -44,6 +44,8 @@ export function createApmApiSupertest(st: supertest.SuperTest<supertest.Test>) {
   };
 }
 
+export type ApmApiSupertest = ReturnType<typeof createApmApiSupertest>;
+
 export class ApmApiError extends Error {
   res: request.Response;