[Moving] Move APM and APM_Data_Access folders into /x-pack/observability_solution/

.buildkite/ftr_configs.yml

@@ -47,9 +47,9 @@ disabled:
   - x-pack/test/functional_enterprise_search/visual_config.ts
   - x-pack/test/functional_enterprise_search/cli_config.ts
   - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config.ts
+  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_open.ts
+  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_run.ts
+  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts
   - x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
   - x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts

.eslintrc.js

@@ -591,7 +591,7 @@ module.exports = {
         '**/*.test.js',
         'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
-        'x-pack/plugins/apm/**/*.js',
+        'x-pack/plugins/observability_solution/apm/**/*.js',
         'test/*/config.ts',
         'test/*/config_open.ts',
         'test/*/*.config.ts',
@@ -871,7 +871,7 @@ module.exports = {
      */
     {
       files: [
-        'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
@@ -894,7 +894,7 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/apm/**/*.stories.*',
+        'x-pack/plugins/observability_solution/apm/**/*.stories.*',
         'x-pack/plugins/observability/**/*.stories.*',
         'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
       ],
@@ -911,16 +911,17 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/aiops/**/*.tsx',
-        'x-pack/plugins/apm/**/*.tsx',
-        'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
         'x-pack/plugins/infra/**/*.tsx',
         'x-pack/plugins/observability/**/*.tsx',
-        'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_solution/apm/**/*.tsx',
+        'x-pack/plugins/observability_solution/dataset_quality/**/*.tsx',
+        'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
         'x-pack/plugins/observability_solution/profiling/**/*.tsx',
         'x-pack/plugins/observability_solution/synthetics/**/*.tsx',
+        'x-pack/plugins/observability_solution/uptime/**/*.tsx',
         'x-pack/plugins/observability_solution/ux/**/*.tsx',
         'src/plugins/ai_assistant_management/**/*.tsx',
       ],
@@ -930,11 +931,10 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
@@ -950,7 +950,7 @@ module.exports = {
     },
     {
       // require explicit return types in route handlers for performance reasons
-      files: ['x-pack/plugins/apm/server/**/route.ts'],
+      files: ['x-pack/plugins/observability_solution/apm/server/**/route.ts'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': [
           'error',

.github/CODEOWNERS

@@ -40,8 +40,8 @@ packages/analytics/shippers/elastic_v3/common @elastic/kibana-core
 packages/analytics/shippers/elastic_v3/server @elastic/kibana-core
 packages/analytics/shippers/fullstory @elastic/kibana-core
 packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
-x-pack/plugins/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
-x-pack/plugins/apm @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team
 packages/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
 packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
 packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
@@ -1539,7 +1539,7 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur
 **/*.scss @elastic/kibana-design
 
 # Observability design
-/x-pack/plugins/apm/**/*.scss @elastic/observability-design
+/x-pack/plugins/observability_solution/apm/**/*.scss @elastic/observability-design
 /x-pack/plugins/infra/**/*.scss @elastic/observability-design
 /x-pack/plugins/fleet/**/*.scss @elastic/observability-design
 /x-pack/plugins/monitoring/**/*.scss @elastic/observability-design

.github/paths-labeller.yml

@@ -9,7 +9,7 @@
     - 'src/plugins/expressions/**/*.*'
     - 'src/plugins/bfetch/**/*.*'
 - 'Team:obs-ux-infra_services':
-    - 'x-pack/plugins/apm/**/*.*'
+    - 'x-pack/plugins/observability_solution/apm/**/*.*'
     - 'x-pack/test/apm_api_integration/**/*.*'
     - 'packages/kbn-apm-synthtrace/**/*.*'
     - 'packages/kbn-apm-synthtrace-client/**/*.*'

.gitignore

@@ -91,8 +91,8 @@ npm-debug.log*
 ## @cypress/snapshot from apm plugin
 /snapshots.js
 /apm-diagnostics*.json
-/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
-/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
+/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
+/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
 
 # transpiled cypress config
 x-pack/plugins/fleet/cypress.config.d.ts
@@ -141,4 +141,3 @@ x-pack/test/security_api_integration/plugins/audit_log/audit.log
 # ignore FTR temp directory
 .ftr
 role_users.json
-

api_docs/apm_data_access.devdocs.json

@@ -24,7 +24,7 @@
         "signature": [
           "{ readonly indices: Readonly<{} & { error: string; transaction: string; span: string; metric: string; onboarding: string; sourcemap: string; }>; }"
         ],
-        "path": "x-pack/plugins/apm_data_access/server/index.ts",
+        "path": "x-pack/plugins/observability_solution/apm_data_access/server/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -39,7 +39,7 @@
         "signature": [
           "{ readonly error: string; readonly transaction: string; readonly span: string; readonly metric: string; readonly onboarding: string; readonly sourcemap: string; }"
         ],
-        "path": "x-pack/plugins/apm_data_access/server/index.ts",
+        "path": "x-pack/plugins/observability_solution/apm_data_access/server/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -53,7 +53,7 @@
       "tags": [],
       "label": "ApmDataAccessPluginSetup",
       "description": [],
-      "path": "x-pack/plugins/apm_data_access/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [
@@ -67,7 +67,7 @@
           "signature": [
             "{ readonly error: string; readonly transaction: string; readonly span: string; readonly metric: string; readonly onboarding: string; readonly sourcemap: string; }"
           ],
-          "path": "x-pack/plugins/apm_data_access/server/types.ts",
+          "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts",
           "deprecated": false,
           "trackAdoption": false
         },
@@ -89,7 +89,7 @@
             },
             ") => Promise<Readonly<{} & { error: string; transaction: string; span: string; metric: string; onboarding: string; sourcemap: string; }>>"
           ],
-          "path": "x-pack/plugins/apm_data_access/server/types.ts",
+          "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts",
           "deprecated": false,
           "trackAdoption": false,
           "children": [
@@ -109,7 +109,7 @@
                   "text": "SavedObjectsClientContract"
                 }
               ],
-              "path": "x-pack/plugins/apm_data_access/server/types.ts",
+              "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts",
               "deprecated": false,
               "trackAdoption": false,
               "isRequired": true
@@ -128,7 +128,7 @@
       "tags": [],
       "label": "ApmDataAccessPluginStart",
       "description": [],
-      "path": "x-pack/plugins/apm_data_access/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [],
@@ -149,10 +149,8 @@
         "tags": [],
         "label": "PLUGIN_ID",
         "description": [],
-        "signature": [
-          "\"apmDataAccess\""
-        ],
-        "path": "x-pack/plugins/apm_data_access/common/index.ts",
+        "signature": ["\"apmDataAccess\""],
+        "path": "x-pack/plugins/observability_solution/apm_data_access/common/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -164,15 +162,13 @@
         "tags": [],
         "label": "PLUGIN_NAME",
         "description": [],
-        "signature": [
-          "\"apmDataAccess\""
-        ],
-        "path": "x-pack/plugins/apm_data_access/common/index.ts",
+        "signature": ["\"apmDataAccess\""],
+        "path": "x-pack/plugins/observability_solution/apm_data_access/common/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
       }
     ],
     "objects": []
   }
-}
+}