Skip to content

Commit

Permalink
[8.x] [obsUX][APM] Migrate APM metrics tests to agnostic deployment t…
Browse files Browse the repository at this point in the history
…ests (#200175) (#200242)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[obsUX][APM] Migrate APM metrics tests to agnostic deployment tests
(#200175)](#200175)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Miriam","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-14T18:50:37Z","message":"[obsUX][APM]
Migrate APM metrics tests to agnostic deployment tests (#200175)\n\n###
Summary\r\nCloses
https://github.com/elastic/kibana/issues/198976\r\nPart of
https://github.com/elastic/kibana/issues/193245\r\n\r\nThis PR contains
the changes to migrate metrics test folder to\r\nDeployment-agnostic
testing strategy.\r\n\r\n#### How to test\r\nServerless\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\nIt's recommended to be run
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)\r\n\r\nStateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\nChecks\r\n\r\n- [ ] (OPTIONAL, only if a test
has been unskipped) Run flaky test suite\r\n- [x] local run for
serverless\r\n- [x] local run for stateful\r\n- [x] MKI run for
serverless","sha":"4d1cb0b586c3434d2c968c059d6e23d71207bfef","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-infra_services"],"title":"[obsUX][APM]
Migrate APM metrics tests to agnostic deployment
tests","number":200175,"url":"https://github.com/elastic/kibana/pull/200175","mergeCommit":{"message":"[obsUX][APM]
Migrate APM metrics tests to agnostic deployment tests (#200175)\n\n###
Summary\r\nCloses
https://github.com/elastic/kibana/issues/198976\r\nPart of
https://github.com/elastic/kibana/issues/193245\r\n\r\nThis PR contains
the changes to migrate metrics test folder to\r\nDeployment-agnostic
testing strategy.\r\n\r\n#### How to test\r\nServerless\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\nIt's recommended to be run
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)\r\n\r\nStateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\nChecks\r\n\r\n- [ ] (OPTIONAL, only if a test
has been unskipped) Run flaky test suite\r\n- [x] local run for
serverless\r\n- [x] local run for stateful\r\n- [x] MKI run for
serverless","sha":"4d1cb0b586c3434d2c968c059d6e23d71207bfef"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/200175","number":200175,"mergeCommit":{"message":"[obsUX][APM]
Migrate APM metrics tests to agnostic deployment tests (#200175)\n\n###
Summary\r\nCloses
https://github.com/elastic/kibana/issues/198976\r\nPart of
https://github.com/elastic/kibana/issues/193245\r\n\r\nThis PR contains
the changes to migrate metrics test folder to\r\nDeployment-agnostic
testing strategy.\r\n\r\n#### How to test\r\nServerless\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\nIt's recommended to be run
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)\r\n\r\nStateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\nChecks\r\n\r\n- [ ] (OPTIONAL, only if a test
has been unskipped) Run flaky test suite\r\n- [x] local run for
serverless\r\n- [x] local run for stateful\r\n- [x] MKI run for
serverless","sha":"4d1cb0b586c3434d2c968c059d6e23d71207bfef"}}]}]
BACKPORT-->

Co-authored-by: Miriam <[email protected]>
  • Loading branch information
kibanamachine and MiriamAparicio authored Nov 14, 2024
1 parent d0c9a2f commit 798e18c
Show file tree
Hide file tree
Showing 14 changed files with 948 additions and 933 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default function apmApiIntegrationTests({
loadTestFile(require.resolve('./correlations'));
loadTestFile(require.resolve('./entities'));
loadTestFile(require.resolve('./cold_start'));
loadTestFile(require.resolve('./metrics'));
loadTestFile(require.resolve('./services'));
loadTestFile(require.resolve('./historical_data'));
loadTestFile(require.resolve('./observability_overview'));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';

export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
describe('metrics', () => {
loadTestFile(require.resolve('./metrics_charts.spec.ts'));
loadTestFile(require.resolve('./memory/memory_metrics.spec.ts'));
loadTestFile(require.resolve('./serverless/serverless_active_instances.spec.ts'));
loadTestFile(require.resolve('./serverless/serverless_functions_overview.spec.ts'));
loadTestFile(require.resolve('./serverless/serverless_metrics_charts.spec.ts'));
loadTestFile(require.resolve('./serverless/serverless_summary.spec.ts'));
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
*/

import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../common/ftr_provider_context';
import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
import { config, generateData } from './generate_data';
import { DeploymentAgnosticFtrProviderContext } from '../../../../../ftr_provider_context';

export default function ApiTest({ getService }: FtrProviderContext) {
const registry = getService('registry');
const apmApiClient = getService('apmApiClient');
const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
const apmApiClient = getService('apmApi');
const synthtrace = getService('synthtrace');

const start = new Date('2023-01-01T00:00:00.000Z').getTime();
const end = new Date('2023-01-01T00:15:00.000Z').getTime() - 1;
Expand All @@ -33,9 +33,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
});
}

// FLAKY: https://github.com/elastic/kibana/issues/176990
registry.when('Memory', { config: 'trial', archives: [] }, () => {
describe('Memory', () => {
let apmSynthtraceEsClient: ApmSynthtraceEsClient;
before(async () => {
apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
await generateData({ start, end, apmSynthtraceEsClient });
});

Expand Down
Loading

0 comments on commit 798e18c

Please sign in to comment.