[8.x] [ObsUX][APM] Migrate APM infra tests to agnostic deployment tes…

…ts (elastic#199775) (elastic#199830) # Backport This will backport the following commits from `main` to `8.x`: - [[ObsUX][APM] Migrate APM infra tests to agnostic deployment tests (elastic#199775)](elastic#199775)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Miriam <[email protected]>
kibanamachine · Nov 12, 2024 · f3393e9 · f3393e9
1 parent cbb4824
commit f3393e9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/index.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/index.ts
@@ -18,5 +18,6 @@ export default function apmApiIntegrationTests({
     loadTestFile(require.resolve('./correlations'));
     loadTestFile(require.resolve('./entities'));
     loadTestFile(require.resolve('./cold_start'));
+    loadTestFile(require.resolve('./infrastructure'));
   });
 }
diff --git a/...ion/tests/infrastructure/generate_data.ts → ...ility/apm/infrastructure/generate_data.ts b/...ion/tests/infrastructure/generate_data.ts → ...ility/apm/infrastructure/generate_data.ts
diff --git a/...k/test/api_integration/deployment_agnostic/apis/observability/apm/infrastructure/index.ts b/...k/test/api_integration/deployment_agnostic/apis/observability/apm/infrastructure/index.ts
@@ -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'));
+  });
+}
diff --git a/...ructure/infrastructure_attributes.spec.ts → ...ructure/infrastructure_attributes.spec.ts b/...ructure/infrastructure_attributes.spec.ts → ...ructure/infrastructure_attributes.spec.ts
@@ -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;
@@ -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 () => {