Skip to content

Commit

Permalink
[ObsUX][APM] Migrate APM infra tests to agnostic deployment tests (el…
Browse files Browse the repository at this point in the history
…astic#199775)

### Summary
Closes elastic#198976
Part of elastic#193245

This PR contains the changes to migrate infrastructure test folder to
Deployment-agnostic testing strategy.

#### How to test
Serverless
```
node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="APM"
```
It's recommended to be run against
[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)

Stateful
```
node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts --grep="APM"
```
Checks

- [ ] (OPTIONAL, only if a test has been unskipped) Run flaky test suite
- [x]  local run for serverless
- [x]  local run for stateful
- [x]  MKI run for serverless
  • Loading branch information
MiriamAparicio authored Nov 12, 2024
1 parent 8a8363f commit 7f2a324
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ export default function apmApiIntegrationTests({
loadTestFile(require.resolve('./correlations'));
loadTestFile(require.resolve('./entities'));
loadTestFile(require.resolve('./cold_start'));
loadTestFile(require.resolve('./infrastructure'));
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* 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('infrastructure', () => {
loadTestFile(require.resolve('./infrastructure_attributes.spec.ts'));
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
* 2.0.
*/
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../common/ftr_provider_context';
import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
import { 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('2021-01-01T00:00:00.000Z').getTime();
const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
Expand All @@ -34,28 +34,26 @@ export default function ApiTest({ getService }: FtrProviderContext) {
return response;
}

registry.when(
'Infrastructure attributes when data is not loaded',
{ config: 'basic', archives: [] },
() => {
describe('Infrastructure attributes', () => {
describe('Infrastructure attributes when data is not loaded', () => {
it('handles the empty state', async () => {
const response = await callApi('synth-go');
expect(response.status).to.be(200);
expect(response.body.containerIds.length).to.be(0);
expect(response.body.hostNames.length).to.be(0);
expect(response.body.podNames.length).to.be(0);
});
}
);
});

// FLAKY: https://github.com/elastic/kibana/issues/177386
registry.when('Infrastructure attributes', { config: 'basic', archives: [] }, () => {
describe('when data is loaded', () => {
beforeEach(async () => {
let apmSynthtraceEsClient: ApmSynthtraceEsClient;

before(async () => {
apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
await generateData({ start, end, apmSynthtraceEsClient });
});

afterEach(() => apmSynthtraceEsClient.clean());
after(() => apmSynthtraceEsClient.clean());

describe('when service runs in container', () => {
it('returns arrays of container ids and pod names', async () => {
Expand Down

0 comments on commit 7f2a324

Please sign in to comment.