maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[kbn/optimizer] log info about the metrics being reported even when reporter is disabled (#73389)

Browse source 
Co-authored-by: spalger <spalger@users.noreply.github.com>
This commit is contained in:
Spencer 2020-07-28 08:01:34 -07:00 committed by GitHub
parent 0149c65221
commit 3d5d4de63c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
View file

@ -29,6 +29,8 @@ interface Config {
buildId: string;
}
export type CiStatsMetrics = Array<{ group: string; id: string; value: number }>;
function parseConfig(log: ToolingLog) {
const configJson = process.env.KIBANA_CI_STATS_CONFIG;
if (!configJson) {
@ -84,7 +86,7 @@ export class CiStatsReporter {
return !!this.config;
}
async metrics(metrics: Array<{ group: string; id: string; value: number }>) {
async metrics(metrics: CiStatsMetrics) {
if (!this.config) {
return;
}

2
packages/kbn-optimizer/src/cli.ts
View file

@ -116,7 +116,7 @@ run(
log.warning('Unable to initialize CiStatsReporter from env');
}
update$ = update$.pipe(reportOptimizerStats(reporter, config));
update$ = update$.pipe(reportOptimizerStats(reporter, config, log));
}
await update$.pipe(logOptimizerState(log, config)).toPromise();

6
packages/kbn-optimizer/src/log_optimizer_state.ts
View file

@ -104,7 +104,7 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
}
if (state.phase === 'running' || state.phase === 'initializing') {
return true;
return;
}
if (state.phase === 'issue') {
@ -119,7 +119,7 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
}
}
log.indent(-4);
return true;
return;
}
if (state.phase === 'success') {
@ -135,7 +135,7 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
);
}
return true;
return;
}
throw new Error(`unhandled optimizer message: ${inspect(update)}`);

22
packages/kbn-optimizer/src/report_optimizer_stats.ts
View file

@ -21,7 +21,7 @@ import Fs from 'fs';
import Path from 'path';
import { materialize, mergeMap, dematerialize } from 'rxjs/operators';
import { CiStatsReporter } from '@kbn/dev-utils';
import { CiStatsReporter, CiStatsMetrics, ToolingLog } from '@kbn/dev-utils';
import { OptimizerUpdate$ } from './run_optimizer';
import { OptimizerState, OptimizerConfig } from './optimizer';
@ -67,7 +67,11 @@ const getFiles = (dir: string, parent?: string) =>
return true;
});
export function reportOptimizerStats(reporter: CiStatsReporter, config: OptimizerConfig) {
export function reportOptimizerStats(
reporter: CiStatsReporter,
config: OptimizerConfig,
log: ToolingLog
) {
return pipeClosure((update$: OptimizerUpdate$) => {
let lastState: OptimizerState | undefined;
return update$.pipe(
@ -98,10 +102,18 @@ export function reportOptimizerStats(reporter: CiStatsReporter, config: Optimize
const miscFiles = outputFiles.filter(
(f) => f !== entry && !asyncChunks.includes(f)
);
if (asyncChunks.length) {
log.verbose(bundle.id, 'async chunks', asyncChunks);
}
if (miscFiles.length) {
log.verbose(bundle.id, 'misc files', asyncChunks);
}
const sumSize = (files: Entry[]) =>
files.reduce((acc: number, f) => acc + f.stats!.size, 0);
return [
const metrics: CiStatsMetrics = [
{
group: `@kbn/optimizer bundle module count`,
id: bundle.id,
@ -123,6 +135,10 @@ export function reportOptimizerStats(reporter: CiStatsReporter, config: Optimize
value: sumSize(miscFiles),
},
];
log.info(bundle.id, 'metrics', metrics);
return metrics;
})
)
);

2
src/dev/build/tasks/build_kibana_platform_plugins.ts
View file

@ -44,7 +44,7 @@ export const BuildKibanaPlatformPlugins: Task = {
await runOptimizer(optimizerConfig)
.pipe(
reportOptimizerStats(reporter, optimizerConfig),
reportOptimizerStats(reporter, optimizerConfig, log),
logOptimizerState(log, optimizerConfig)
)
.toPromise();