Fix PR feedback

src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts

@@ -62,14 +62,14 @@ export type TelemetryLocalStats = ReturnType<typeof handleLocalStats>;
 
 /**
  * Get statistics for all products joined by Elasticsearch cluster.
- * @param {Array} cluster uuids
- * @param {Object} config contains the new esClient already scoped contains usageCollection, callCluster, esClient, start, end
+ * @param {Array} cluster uuids array of cluster uuid's
+ * @param {Object} config contains the usageCollection, callCluster (deprecated), the esClient and Saved Objects client scoped to the request or the internal repository, and the kibana request
  * @param {Object} StatsCollectionContext contains logger and version (string)
  */
 export const getLocalStats: StatsGetter<{}, TelemetryLocalStats> = async (
-  clustersDetails, // array of cluster uuid's
-  config, // contains the new esClient already scoped contains usageCollection, callCluster, esClient, start, end and the saved objects client scoped to the request or the internal repository
-  context // StatsCollectionContext contains logger and version (string)
+  clustersDetails,
+  config,
+  context
 ) => {
   const { callCluster, usageCollection, esClient, soClient, kibanaRequest } = config;
 

src/plugins/usage_collection/server/collector/collector.ts

@@ -76,7 +76,7 @@ export type CollectorFetchContext<WithKibanaRequest extends boolean | undefined
        * The KibanaRequest that can be used to scope the requests:
        * It is provided only when your custom clients need to be scoped. If not available, you should use the Internal Client.
        * More information about when scoping is needed: {@link CollectorFetchContext}
-       * @remark You should only use this if you implement your collector to deal with both scenarios: when provided and, especially, when not because it's the actual situation when the telemetry payload is sent to the remote service.
+       * @remark You should only use this if you implement your collector to deal with both scenarios: when provided and, especially, when not provided. When telemetry payload is sent to the remote service the `kibanaRequest` will not be provided.
        */
       kibanaRequest?: KibanaRequest;
     }

x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts

@@ -18,7 +18,7 @@ import { fetchClusters } from '../../lib/alerts/fetch_clusters';
 export function getMonitoringUsageCollector(
   usageCollection: UsageCollectionSetup,
   config: MonitoringConfig,
-  esClient: ILegacyClusterClient
+  legacyEsClient: ILegacyClusterClient
 ) {
   return usageCollection.makeUsageCollector<MonitoringUsage, unknown, true>({
     type: 'monitoring',
@@ -102,8 +102,8 @@ export function getMonitoringUsageCollector(
     },
     fetch: async ({ kibanaRequest }) => {
       const callCluster = kibanaRequest
-        ? esClient.asScoped(kibanaRequest).callAsCurrentUser
-        : esClient.callAsInternalUser;
+        ? legacyEsClient.asScoped(kibanaRequest).callAsCurrentUser
+        : legacyEsClient.callAsInternalUser;
       const usageClusters: MonitoringClusterStackProductUsage[] = [];
       const availableCcs = config.ui.ccs.enabled ? await fetchAvailableCcs(callCluster) : [];
       const elasticsearchIndex = getCcsIndexPattern(INDEX_PATTERN_ELASTICSEARCH, availableCcs);

x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts

@@ -15,8 +15,10 @@ export { KibanaSettingsCollector } from './get_settings_collector';
 export function registerCollectors(
   usageCollection: UsageCollectionSetup,
   config: MonitoringConfig,
-  esClient: ILegacyClusterClient
+  legacyEsClient: ILegacyClusterClient
 ) {
   usageCollection.registerCollector(getSettingsCollector(usageCollection, config));
-  usageCollection.registerCollector(getMonitoringUsageCollector(usageCollection, config, esClient));
+  usageCollection.registerCollector(
+    getMonitoringUsageCollector(usageCollection, config, legacyEsClient)
+  );
 }