Skip to content

Commit 48c6cd6

Browse files
drewdaemonelasticmachinedmlemeshko
authored
[journeys] use http2 by default (#247883)
## Summary Switches all journeys to use HTTP2 by default (unless a custom FTR config is defined). Also, removes the http2-specific dashboard journeys since they won't be distinct anymore. Journey run: https://buildkite.com/elastic/kibana-single-user-performance/builds/18426 --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
1 parent ee57c56 commit 48c6cd6

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ disabled:
55

66
# Base config files, only necessary to inform config finding script
77
- src/platform/test/functional/config.base.js
8+
- src/platform/test/functional/config.base.http2.ts
89
- src/platform/test/functional/firefox/config.base.ts
910
- x-pack/platform/test/functional/config.base.ts
1011
- x-pack/platform/test/localization/config.base.ts
@@ -359,7 +360,6 @@ enabled:
359360
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
360361
- x-pack/performance/journeys_e2e/web_logs_dashboard_dataview.ts
361362
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
362-
- x-pack/performance/journeys_e2e/data_stress_test_lens_http2.ts
363363
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
364364
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
365365
- x-pack/performance/journeys_e2e/dashboard_listing_page.ts

src/dev/performance/run_performance_cli.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ const journeyTargetGroups: JourneyTargetGroups = {
4747
maps: ['ecommerce_dashboard_map_only'],
4848
ml: ['aiops_log_rate_analysis', 'many_fields_transform', 'tsdb_logs_data_visualizer'],
4949
esql: ['many_fields_discover_esql', 'web_logs_dashboard_esql'],
50-
http2: ['data_stress_test_lens_http2', 'ecommerce_dashboard_http2'],
5150
};
5251

5352
const readFilesRecursively = (dir: string, callback: Function) => {

src/platform/packages/private/kbn-journeys/journey/journey_ftr_config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export function makeFtrConfigProvider(
3535
? 'x-pack/platform/test/serverless/shared/config.base.ts'
3636
: config.getFtrConfigPath();
3737
const defaultConfigPath = config.isXpack()
38-
? 'x-pack/platform/test/functional/config.base.ts'
39-
: 'src/platform/test/functional/config.base.js';
38+
? 'x-pack/performance/configs/http2_config.ts'
39+
: 'src/platform/test/functional/config.base.http2.ts';
4040
const ftrConfigPath = configPath ?? defaultConfigPath;
4141
const baseConfig = (await readConfigFile(Path.resolve(REPO_ROOT, ftrConfigPath))).getAll();
4242

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
import type { FtrConfigProviderContext } from '@kbn/test';
11+
import { configureHTTP2 } from '../common/configure_http2';
12+
13+
// eslint-disable-next-line import/no-default-export
14+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
15+
const functionalConfig = await readConfigFile(require.resolve('./config.base.js'));
16+
17+
return configureHTTP2({
18+
...functionalConfig.getAll(),
19+
});
20+
}

x-pack/performance/journeys_e2e/data_stress_test_lens_http2.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

x-pack/performance/journeys_e2e/many_fields_lens_editor.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Journey } from '@kbn/journeys';
99
import { subj } from '@kbn/test-subj-selector';
1010

1111
export const journey = new Journey({
12-
// Failing: See https://github.com/elastic/kibana/issues/167496
1312
kbnArchives: ['x-pack/performance/kbn_archives/lens_many_fields'],
1413
esArchives: ['src/platform/test/functional/fixtures/es_archiver/stress_test'],
1514
})

x-pack/platform/plugins/shared/lens/readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ Run all tests from the `x-pack` root directory
253253
- Run `node ../scripts/functional_test_runner.js --config ./test/api_integration/config.ts --grep=Lens`
254254
- Performance journeys:
255255
- Run `node scripts/run_performance --journey-path x-pack/performance/journeys_e2e/data_stress_test_lens`
256-
- Run `node scripts/run_performance --journey-path x-pack/performance/journeys_e2e/data_stress_test_lens_http2`
257256

258257
## Developing tips
259258

0 commit comments

Comments
 (0)