From 821f56fa1d283e0c8906973ff07b20af38fdc334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Thu, 16 Feb 2023 13:51:51 +0100
Subject: [PATCH] Stop applying concurrency limits. We want to merge the extra
 tests

---
 .../server/collector/collector_set.ts              | 14 ++++----------
 src/plugins/usage_collection/server/config.ts      |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index ca9028226df29ac..9233916cfee5b15 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { withTimeout, asyncMapWithLimit } from '@kbn/std';
+import { withTimeout } from '@kbn/std';
 import { snakeCase } from 'lodash';
 
 import type {
@@ -42,13 +42,11 @@ export interface CollectorSetConfig {
 export class CollectorSet {
   private readonly logger: Logger;
   private readonly executionContext: ExecutionContextSetup;
-  private readonly collectorsFetchConcurrency: number;
   private readonly maximumWaitTimeForAllCollectorsInS: number;
   private readonly collectors: Map<string, AnyCollector>;
   constructor({
     logger,
     executionContext,
-    collectorsFetchConcurrency = Infinity,
     maximumWaitTimeForAllCollectorsInS = DEFAULT_MAXIMUM_WAIT_TIME_FOR_ALL_COLLECTORS_IN_S,
     collectors = [],
   }: CollectorSetConfig) {
@@ -56,7 +54,6 @@ export class CollectorSet {
     this.executionContext = executionContext;
     this.collectors = new Map(collectors.map((collector) => [collector.type, collector]));
     this.maximumWaitTimeForAllCollectorsInS = maximumWaitTimeForAllCollectorsInS;
-    this.collectorsFetchConcurrency = collectorsFetchConcurrency;
   }
 
   /**
@@ -233,17 +230,15 @@ export class CollectorSet {
     // freeze object to prevent collectors from mutating it.
     const context = Object.freeze({ esClient, soClient });
 
-    const fetchExecutions = await asyncMapWithLimit(
-      readyCollectors,
-      this.collectorsFetchConcurrency,
-      async (collector) => {
+    const fetchExecutions = await Promise.all(
+      readyCollectors.map(async (collector) => {
         const wrappedPromise = perfTimerify(
           `fetch_${collector.type}`,
           async () => await this.fetchCollector(collector, context)
         );
 
         return await wrappedPromise();
-      }
+      })
     );
     const durationMarks = getMarks();
 
@@ -365,7 +360,6 @@ export class CollectorSet {
       logger: this.logger,
       executionContext: this.executionContext,
       maximumWaitTimeForAllCollectorsInS: this.maximumWaitTimeForAllCollectorsInS,
-      collectorsFetchConcurrency: this.collectorsFetchConcurrency,
       collectors,
     });
   };
diff --git a/src/plugins/usage_collection/server/config.ts b/src/plugins/usage_collection/server/config.ts
index b6e717b24b433a2..bc183e31c0089a8 100644
--- a/src/plugins/usage_collection/server/config.ts
+++ b/src/plugins/usage_collection/server/config.ts
@@ -23,7 +23,6 @@ export const configSchema = schema.object({
   maximumWaitTimeForAllCollectorsInS: schema.number({
     defaultValue: DEFAULT_MAXIMUM_WAIT_TIME_FOR_ALL_COLLECTORS_IN_S,
   }),
-  collectorsFetchConcurrency: schema.number({ defaultValue: 5 }),
 });
 
 export type ConfigType = TypeOf<typeof configSchema>;