inline getMetrics logic which isn't shared anymore

elastic · Feb 5, 2021 · b722e38 · b722e38
1 parent 6645d0c
commit b722e38
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/packages/kbn-optimizer/src/limits.ts b/packages/kbn-optimizer/src/limits.ts
@@ -7,12 +7,13 @@
  */
 
 import Fs from 'fs';
+import Path from 'path';
 
 import dedent from 'dedent';
 import Yaml from 'js-yaml';
-import { createFailError, ToolingLog } from '@kbn/dev-utils';
+import { createFailError, ToolingLog, CiStatsMetrics } from '@kbn/dev-utils';
 
-import { OptimizerConfig, getMetrics, Limits } from './optimizer';
+import { OptimizerConfig, Limits } from './optimizer';
 
 const LIMITS_PATH = require.resolve('../limits.yml');
 const DEFAULT_BUDGET = 15000;
@@ -76,13 +77,18 @@ interface UpdateBundleLimitsOptions {
 
 export function updateBundleLimits({ log, config, dropMissing }: UpdateBundleLimitsOptions) {
   const limits = readLimits();
-  const metrics = getMetrics(config);
+  const metrics: CiStatsMetrics = config.bundles
+    .map((bundle) =>
+      JSON.parse(Fs.readFileSync(Path.resolve(bundle.outputDir, 'metrics.json'), 'utf-8'))
+    )
+    .flat()
+    .sort((a, b) => a.id.localeCompare(b.id));
 
   const pageLoadAssetSize: NonNullable<Limits['pageLoadAssetSize']> = dropMissing
     ? {}
     : limits.pageLoadAssetSize ?? {};
 
-  for (const metric of metrics.sort((a, b) => a.id.localeCompare(b.id))) {
+  for (const metric of metrics) {
     if (metric.group === 'page load bundle size') {
       const existingLimit = limits.pageLoadAssetSize?.[metric.id];
       pageLoadAssetSize[metric.id] =

diff --git a/packages/kbn-optimizer/src/optimizer/get_output_stats.ts b/packages/kbn-optimizer/src/optimizer/get_output_stats.ts
diff --git a/packages/kbn-optimizer/src/optimizer/index.ts b/packages/kbn-optimizer/src/optimizer/index.ts
@@ -14,4 +14,3 @@ export * from './watch_bundles_for_changes';
 export * from './run_workers';
 export * from './bundle_cache';
 export * from './handle_optimizer_completion';
-export * from './get_output_stats';