From 0dd49626610adf2a741fc0d6c899a8f1cad5a717 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Fri, 5 Mar 2021 19:18:05 -0800 Subject: [PATCH] [Rename] kbn-apm-config-loader to osd-apm-config-loader (#78) * [Rename] kbn-apm-config-loader to osd-apm-onfig-loader Signed-off-by: Kawika Avilla * Handle PR comments Signed-off-by: Kawika Avilla --- packages/kbn-apm-config-loader/README.md | 13 --------- .../__fixtures__/en_var_ref_config.yml | 5 ---- packages/osd-apm-config-loader/README.md | 13 +++++++++ .../__fixtures__/config.yml | 2 +- .../__fixtures__/config_flat.yml | 2 +- .../__fixtures__/en_var_ref_config.yml | 5 ++++ .../__fixtures__/one.yml | 0 .../__fixtures__/two.yml | 0 .../package.json | 8 ++--- .../src/config.test.mocks.ts | 0 .../src/config.test.ts | 26 ++++++++--------- .../src/config.ts | 29 ++++++++++--------- .../src/config_loader.test.mocks.ts | 0 .../src/config_loader.test.ts | 0 .../src/config_loader.ts | 2 +- .../src/index.ts | 0 .../src/types.ts | 0 .../__snapshots__/read_config.test.ts.snap | 0 .../src/utils/apply_config_overrides.test.ts | 0 .../src/utils/apply_config_overrides.ts | 0 .../src/utils/ensure_deep_object.test.ts | 0 .../src/utils/ensure_deep_object.ts | 0 .../src/utils/get_config_file_paths.test.ts | 2 +- .../src/utils/get_config_file_paths.ts | 4 +-- .../src/utils/index.ts | 0 .../src/utils/read_argv.test.ts | 0 .../src/utils/read_argv.ts | 0 .../src/utils/read_config.test.ts | 0 .../src/utils/read_config.ts | 0 .../tsconfig.json | 0 .../yarn.lock | 0 31 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 packages/kbn-apm-config-loader/README.md delete mode 100644 packages/kbn-apm-config-loader/__fixtures__/en_var_ref_config.yml create mode 100644 packages/osd-apm-config-loader/README.md rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/__fixtures__/config.yml (75%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/__fixtures__/config_flat.yml (65%) create mode 100644 packages/osd-apm-config-loader/__fixtures__/en_var_ref_config.yml rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/__fixtures__/one.yml (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/__fixtures__/two.yml (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/package.json (73%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config.test.mocks.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config.test.ts (82%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config.ts (82%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config_loader.test.mocks.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config_loader.test.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/config_loader.ts (92%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/index.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/types.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/__snapshots__/read_config.test.ts.snap (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/apply_config_overrides.test.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/apply_config_overrides.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/ensure_deep_object.test.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/ensure_deep_object.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/get_config_file_paths.test.ts (96%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/get_config_file_paths.ts (93%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/index.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/read_argv.test.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/read_argv.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/read_config.test.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/src/utils/read_config.ts (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/tsconfig.json (100%) rename packages/{kbn-apm-config-loader => osd-apm-config-loader}/yarn.lock (100%) diff --git a/packages/kbn-apm-config-loader/README.md b/packages/kbn-apm-config-loader/README.md deleted file mode 100644 index 51623dc745f..00000000000 --- a/packages/kbn-apm-config-loader/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @kbn/apm-config-loader - -Configuration loader for the APM instrumentation script. - -This module is only meant to be used by the APM instrumentation script (`src/apm.js`) -to load the required configuration options from the `kibana.yaml` configuration file with -default values. - -### Why not just use @kbn-config? - -`@kbn/config` is the recommended way to load and read the kibana configuration file, -however in the specific case of APM, we want to only need the minimal dependencies -before loading `elastic-apm-node` to avoid losing instrumentation on the already loaded modules. \ No newline at end of file diff --git a/packages/kbn-apm-config-loader/__fixtures__/en_var_ref_config.yml b/packages/kbn-apm-config-loader/__fixtures__/en_var_ref_config.yml deleted file mode 100644 index 761f6a43ba4..00000000000 --- a/packages/kbn-apm-config-loader/__fixtures__/en_var_ref_config.yml +++ /dev/null @@ -1,5 +0,0 @@ -foo: 1 -bar: "pre-${KBN_ENV_VAR1}-mid-${KBN_ENV_VAR2}-post" - -elasticsearch: - requestHeadersWhitelist: ["${KBN_ENV_VAR1}", "${KBN_ENV_VAR2}"] diff --git a/packages/osd-apm-config-loader/README.md b/packages/osd-apm-config-loader/README.md new file mode 100644 index 00000000000..6e058ce0389 --- /dev/null +++ b/packages/osd-apm-config-loader/README.md @@ -0,0 +1,13 @@ +# @osd/apm-config-loader + +Configuration loader for the APM instrumentation script. + +This module is only meant to be used by the APM instrumentation script (`src/apm.js`) +to load the required configuration options from the `opensearch_dashboards.yaml` configuration file with +default values. + +### Why not just use @osd-config? + +`@osd/config` is the recommended way to load and read the opensearchDashboards configuration file, +however in the specific case of APM, we want to only need the minimal dependencies +before loading `opensearch-apm-node` to avoid losing instrumentation on the already loaded modules. \ No newline at end of file diff --git a/packages/kbn-apm-config-loader/__fixtures__/config.yml b/packages/osd-apm-config-loader/__fixtures__/config.yml similarity index 75% rename from packages/kbn-apm-config-loader/__fixtures__/config.yml rename to packages/osd-apm-config-loader/__fixtures__/config.yml index b0706d8ff8e..64f1c572b65 100644 --- a/packages/kbn-apm-config-loader/__fixtures__/config.yml +++ b/packages/osd-apm-config-loader/__fixtures__/config.yml @@ -1,6 +1,6 @@ pid: enabled: true - file: '/var/run/kibana.pid' + file: '/var/run/opensearch_dashboards.pid' obj: { val: 3 } arr: [1] empty_obj: {} diff --git a/packages/kbn-apm-config-loader/__fixtures__/config_flat.yml b/packages/osd-apm-config-loader/__fixtures__/config_flat.yml similarity index 65% rename from packages/kbn-apm-config-loader/__fixtures__/config_flat.yml rename to packages/osd-apm-config-loader/__fixtures__/config_flat.yml index a687a9a9088..825b5bd79ed 100644 --- a/packages/kbn-apm-config-loader/__fixtures__/config_flat.yml +++ b/packages/osd-apm-config-loader/__fixtures__/config_flat.yml @@ -1,5 +1,5 @@ pid.enabled: true -pid.file: '/var/run/kibana.pid' +pid.file: '/var/run/opensearch_dashboards.pid' pid.obj: { val: 3 } pid.arr: [1, 2] pid.empty_obj: {} diff --git a/packages/osd-apm-config-loader/__fixtures__/en_var_ref_config.yml b/packages/osd-apm-config-loader/__fixtures__/en_var_ref_config.yml new file mode 100644 index 00000000000..b1e9ceafcfe --- /dev/null +++ b/packages/osd-apm-config-loader/__fixtures__/en_var_ref_config.yml @@ -0,0 +1,5 @@ +foo: 1 +bar: "pre-${OSD_ENV_VAR1}-mid-${OSD_ENV_VAR2}-post" + +opensearch: + requestHeadersWhitelist: ["${OSD_ENV_VAR1}", "${OSD_ENV_VAR2}"] diff --git a/packages/kbn-apm-config-loader/__fixtures__/one.yml b/packages/osd-apm-config-loader/__fixtures__/one.yml similarity index 100% rename from packages/kbn-apm-config-loader/__fixtures__/one.yml rename to packages/osd-apm-config-loader/__fixtures__/one.yml diff --git a/packages/kbn-apm-config-loader/__fixtures__/two.yml b/packages/osd-apm-config-loader/__fixtures__/two.yml similarity index 100% rename from packages/kbn-apm-config-loader/__fixtures__/two.yml rename to packages/osd-apm-config-loader/__fixtures__/two.yml diff --git a/packages/kbn-apm-config-loader/package.json b/packages/osd-apm-config-loader/package.json similarity index 73% rename from packages/kbn-apm-config-loader/package.json rename to packages/osd-apm-config-loader/package.json index 6865e9ec9bf..2cfb6197f0c 100644 --- a/packages/kbn-apm-config-loader/package.json +++ b/packages/osd-apm-config-loader/package.json @@ -1,5 +1,5 @@ { - "name": "@kbn/apm-config-loader", + "name": "@osd/apm-config-loader", "main": "./target/index.js", "types": "./target/index.d.ts", "version": "1.0.0", @@ -7,12 +7,12 @@ "private": true, "scripts": { "build": "tsc", - "kbn:bootstrap": "yarn build", - "kbn:watch": "yarn build --watch" + "osd:bootstrap": "yarn build", + "osd:watch": "yarn build --watch" }, "dependencies": { "@elastic/safer-lodash-set": "0.0.0", - "@kbn/utils": "1.0.0", + "@osd/utils": "1.0.0", "js-yaml": "^3.14.0", "lodash": "^4.17.20" }, diff --git a/packages/kbn-apm-config-loader/src/config.test.mocks.ts b/packages/osd-apm-config-loader/src/config.test.mocks.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/config.test.mocks.ts rename to packages/osd-apm-config-loader/src/config.test.mocks.ts diff --git a/packages/kbn-apm-config-loader/src/config.test.ts b/packages/osd-apm-config-loader/src/config.test.ts similarity index 82% rename from packages/kbn-apm-config-loader/src/config.test.ts rename to packages/osd-apm-config-loader/src/config.test.ts index 83438215716..53ca6c94a85 100644 --- a/packages/kbn-apm-config-loader/src/config.test.ts +++ b/packages/osd-apm-config-loader/src/config.test.ts @@ -69,21 +69,21 @@ describe('ApmConfiguration', () => { expect(config.getConfig('serviceName').globalLabels.git_rev).toBe('distribution-sha'); }); - it('reads the kibana uuid from the uuid file', () => { + it('reads the opensearchDashboards uuid from the uuid file', () => { readUuidFileMock.mockReturnValue('instance-uuid'); const config = new ApmConfiguration(mockedRootDir, {}, false); - expect(config.getConfig('serviceName').globalLabels.kibana_uuid).toBe('instance-uuid'); + expect(config.getConfig('serviceName').globalLabels.opensearch_dashboards_uuid).toBe('instance-uuid'); }); - it('uses the uuid from the kibana config if present', () => { + it('uses the uuid from the opensearchDashboards config if present', () => { readUuidFileMock.mockReturnValue('uuid-from-file'); - const kibanaConfig = { + const opensearchDashboardsConfig = { server: { uuid: 'uuid-from-config', }, }; - const config = new ApmConfiguration(mockedRootDir, kibanaConfig, false); - expect(config.getConfig('serviceName').globalLabels.kibana_uuid).toBe('uuid-from-config'); + const config = new ApmConfiguration(mockedRootDir, opensearchDashboardsConfig, false); + expect(config.getConfig('serviceName').globalLabels.opensearch_dashboards_uuid).toBe('uuid-from-config'); }); it('uses the correct default config depending on the `isDistributable` parameter', () => { @@ -99,9 +99,9 @@ describe('ApmConfiguration', () => { expect(Object.keys(config.getConfig('serviceName'))).not.toContain('serverUrl'); }); - it('loads the configuration from the kibana config file', () => { - const kibanaConfig = { - elastic: { + it('loads the configuration from the opensearchDashboards config file', () => { + const opensearchDashboardsConfig = { + opensearch: { apm: { active: true, serverUrl: 'https://url', @@ -109,7 +109,7 @@ describe('ApmConfiguration', () => { }, }, }; - const config = new ApmConfiguration(mockedRootDir, kibanaConfig, true); + const config = new ApmConfiguration(mockedRootDir, opensearchDashboardsConfig, true); expect(config.getConfig('serviceName')).toEqual( expect.objectContaining({ active: true, @@ -134,8 +134,8 @@ describe('ApmConfiguration', () => { }); it('respect the precedence of the dev config', () => { - const kibanaConfig = { - elastic: { + const opensearchDashboardsConfig = { + opensearch: { apm: { active: true, serverUrl: 'https://url', @@ -147,7 +147,7 @@ describe('ApmConfiguration', () => { active: true, serverUrl: 'https://dev-url.co', }; - const config = new ApmConfiguration(mockedRootDir, kibanaConfig, true); + const config = new ApmConfiguration(mockedRootDir, opensearchDashboardsConfig, true); expect(config.getConfig('serviceName')).toEqual( expect.objectContaining({ active: true, diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/osd-apm-config-loader/src/config.ts similarity index 82% rename from packages/kbn-apm-config-loader/src/config.ts rename to packages/osd-apm-config-loader/src/config.ts index 897e7fd7ca6..eee2f10a27d 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/osd-apm-config-loader/src/config.ts @@ -21,7 +21,7 @@ import { join } from 'path'; import { merge, get } from 'lodash'; import { execSync } from 'child_process'; // deep import to avoid loading the whole package -import { getDataPath } from '@kbn/utils/target/path'; +import { getDataPath } from '@osd/utils/target/path'; import { readFileSync } from 'fs'; import { ApmAgentConfig } from './types'; @@ -42,6 +42,7 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { return { active: false, serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443', + // TODO: serverUrl // The secretToken below is intended to be hardcoded in this file even though // it makes it public. This is not a security/privacy issue. Normally we'd // instead disable the need for a secretToken in the APM Server config where @@ -57,17 +58,17 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { export class ApmConfiguration { private baseConfig?: any; - private kibanaVersion: string; + private opensearchDashboardsVersion: string; private pkgBuild: Record; constructor( private readonly rootDir: string, - private readonly rawKibanaConfig: Record, + private readonly rawOpenSearchDashboardsConfig: Record, private readonly isDistributable: boolean ) { // eslint-disable-next-line @typescript-eslint/no-var-requires const { version, build } = require(join(this.rootDir, 'package.json')); - this.kibanaVersion = version; + this.opensearchDashboardsVersion = version; this.pkgBuild = build; } @@ -82,7 +83,7 @@ export class ApmConfiguration { if (!this.baseConfig) { const apmConfig = merge( getDefaultConfig(this.isDistributable), - this.getConfigFromKibanaConfig(), + this.getConfigFromOpenSearchDashboardsConfig(), this.getDevConfig(), this.getDistConfig() ); @@ -92,32 +93,32 @@ export class ApmConfiguration { apmConfig.globalLabels.git_rev = rev; } - const uuid = this.getKibanaUuid(); + const uuid = this.getOpenSearchDashboardsUuid(); if (uuid) { - apmConfig.globalLabels.kibana_uuid = uuid; + apmConfig.globalLabels.opensearch_dashboards_uuid = uuid; } - apmConfig.serviceVersion = this.kibanaVersion; + apmConfig.serviceVersion = this.opensearchDashboardsVersion; this.baseConfig = apmConfig; } return this.baseConfig; } - private getConfigFromKibanaConfig(): ApmAgentConfig { - return get(this.rawKibanaConfig, 'elastic.apm', {}); + private getConfigFromOpenSearchDashboardsConfig(): ApmAgentConfig { + return get(this.rawOpenSearchDashboardsConfig, 'opensearch.apm', {}); } - private getKibanaUuid() { + private getOpenSearchDashboardsUuid() { // try to access the `server.uuid` value from the config file first. // if not manually defined, we will then read the value from the `{DATA_FOLDER}/uuid` file. // note that as the file is created by the platform AFTER apm init, the file // will not be present at first startup, but there is nothing we can really do about that. - if (get(this.rawKibanaConfig, 'server.uuid')) { - return this.rawKibanaConfig.server.uuid; + if (get(this.rawOpenSearchDashboardsConfig, 'server.uuid')) { + return this.rawOpenSearchDashboardsConfig.server.uuid; } - const dataPath: string = get(this.rawKibanaConfig, 'path.data') || getDataPath(); + const dataPath: string = get(this.rawOpenSearchDashboardsConfig, 'path.data') || getDataPath(); try { const filename = join(dataPath, 'uuid'); return readFileSync(filename, 'utf-8'); diff --git a/packages/kbn-apm-config-loader/src/config_loader.test.mocks.ts b/packages/osd-apm-config-loader/src/config_loader.test.mocks.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/config_loader.test.mocks.ts rename to packages/osd-apm-config-loader/src/config_loader.test.mocks.ts diff --git a/packages/kbn-apm-config-loader/src/config_loader.test.ts b/packages/osd-apm-config-loader/src/config_loader.test.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/config_loader.test.ts rename to packages/osd-apm-config-loader/src/config_loader.test.ts diff --git a/packages/kbn-apm-config-loader/src/config_loader.ts b/packages/osd-apm-config-loader/src/config_loader.ts similarity index 92% rename from packages/kbn-apm-config-loader/src/config_loader.ts rename to packages/osd-apm-config-loader/src/config_loader.ts index edddd445b9b..8667ff2b1fb 100644 --- a/packages/kbn-apm-config-loader/src/config_loader.ts +++ b/packages/osd-apm-config-loader/src/config_loader.ts @@ -24,7 +24,7 @@ import { ApmConfiguration } from './config'; * Load the APM configuration. * * @param argv the `process.argv` arguments - * @param rootDir The root directory of kibana (where the sources and the `package.json` file are) + * @param rootDir The root directory of opensearch-dashboards (where the sources and the `package.json` file are) * @param production true for production builds, false otherwise */ export const loadConfiguration = ( diff --git a/packages/kbn-apm-config-loader/src/index.ts b/packages/osd-apm-config-loader/src/index.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/index.ts rename to packages/osd-apm-config-loader/src/index.ts diff --git a/packages/kbn-apm-config-loader/src/types.ts b/packages/osd-apm-config-loader/src/types.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/types.ts rename to packages/osd-apm-config-loader/src/types.ts diff --git a/packages/kbn-apm-config-loader/src/utils/__snapshots__/read_config.test.ts.snap b/packages/osd-apm-config-loader/src/utils/__snapshots__/read_config.test.ts.snap similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/__snapshots__/read_config.test.ts.snap rename to packages/osd-apm-config-loader/src/utils/__snapshots__/read_config.test.ts.snap diff --git a/packages/kbn-apm-config-loader/src/utils/apply_config_overrides.test.ts b/packages/osd-apm-config-loader/src/utils/apply_config_overrides.test.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/apply_config_overrides.test.ts rename to packages/osd-apm-config-loader/src/utils/apply_config_overrides.test.ts diff --git a/packages/kbn-apm-config-loader/src/utils/apply_config_overrides.ts b/packages/osd-apm-config-loader/src/utils/apply_config_overrides.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/apply_config_overrides.ts rename to packages/osd-apm-config-loader/src/utils/apply_config_overrides.ts diff --git a/packages/kbn-apm-config-loader/src/utils/ensure_deep_object.test.ts b/packages/osd-apm-config-loader/src/utils/ensure_deep_object.test.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/ensure_deep_object.test.ts rename to packages/osd-apm-config-loader/src/utils/ensure_deep_object.test.ts diff --git a/packages/kbn-apm-config-loader/src/utils/ensure_deep_object.ts b/packages/osd-apm-config-loader/src/utils/ensure_deep_object.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/ensure_deep_object.ts rename to packages/osd-apm-config-loader/src/utils/ensure_deep_object.ts diff --git a/packages/kbn-apm-config-loader/src/utils/get_config_file_paths.test.ts b/packages/osd-apm-config-loader/src/utils/get_config_file_paths.test.ts similarity index 96% rename from packages/kbn-apm-config-loader/src/utils/get_config_file_paths.test.ts rename to packages/osd-apm-config-loader/src/utils/get_config_file_paths.test.ts index c18069f2118..095dd0018ba 100644 --- a/packages/kbn-apm-config-loader/src/utils/get_config_file_paths.test.ts +++ b/packages/osd-apm-config-loader/src/utils/get_config_file_paths.test.ts @@ -18,7 +18,7 @@ */ import { resolve, join } from 'path'; -import { getConfigPath } from '@kbn/utils'; +import { getConfigPath } from '@osd/utils'; import { getConfigurationFilePaths } from './get_config_file_paths'; describe('getConfigurationFilePaths', () => { diff --git a/packages/kbn-apm-config-loader/src/utils/get_config_file_paths.ts b/packages/osd-apm-config-loader/src/utils/get_config_file_paths.ts similarity index 93% rename from packages/kbn-apm-config-loader/src/utils/get_config_file_paths.ts rename to packages/osd-apm-config-loader/src/utils/get_config_file_paths.ts index 262f0d1c8b3..04d50be0ba0 100644 --- a/packages/kbn-apm-config-loader/src/utils/get_config_file_paths.ts +++ b/packages/osd-apm-config-loader/src/utils/get_config_file_paths.ts @@ -19,14 +19,14 @@ import { resolve } from 'path'; // deep import to avoid loading the whole package -import { getConfigPath } from '@kbn/utils/target/path'; +import { getConfigPath } from '@osd/utils/target/path'; import { getArgValues } from './read_argv'; /** * Return the configuration files that needs to be loaded. * * This mimics the behavior of the `src/cli/serve/serve.js` cli script by reading - * `-c` and `--config` options from process.argv, and fallbacks to `@kbn/utils`'s `getConfigPath()` + * `-c` and `--config` options from process.argv, and fallbacks to `@osd/utils`'s `getConfigPath()` */ export const getConfigurationFilePaths = (argv: string[]): string[] => { const rawPaths = getArgValues(argv, ['-c', '--config']); diff --git a/packages/kbn-apm-config-loader/src/utils/index.ts b/packages/osd-apm-config-loader/src/utils/index.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/index.ts rename to packages/osd-apm-config-loader/src/utils/index.ts diff --git a/packages/kbn-apm-config-loader/src/utils/read_argv.test.ts b/packages/osd-apm-config-loader/src/utils/read_argv.test.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/read_argv.test.ts rename to packages/osd-apm-config-loader/src/utils/read_argv.test.ts diff --git a/packages/kbn-apm-config-loader/src/utils/read_argv.ts b/packages/osd-apm-config-loader/src/utils/read_argv.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/read_argv.ts rename to packages/osd-apm-config-loader/src/utils/read_argv.ts diff --git a/packages/kbn-apm-config-loader/src/utils/read_config.test.ts b/packages/osd-apm-config-loader/src/utils/read_config.test.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/read_config.test.ts rename to packages/osd-apm-config-loader/src/utils/read_config.test.ts diff --git a/packages/kbn-apm-config-loader/src/utils/read_config.ts b/packages/osd-apm-config-loader/src/utils/read_config.ts similarity index 100% rename from packages/kbn-apm-config-loader/src/utils/read_config.ts rename to packages/osd-apm-config-loader/src/utils/read_config.ts diff --git a/packages/kbn-apm-config-loader/tsconfig.json b/packages/osd-apm-config-loader/tsconfig.json similarity index 100% rename from packages/kbn-apm-config-loader/tsconfig.json rename to packages/osd-apm-config-loader/tsconfig.json diff --git a/packages/kbn-apm-config-loader/yarn.lock b/packages/osd-apm-config-loader/yarn.lock similarity index 100% rename from packages/kbn-apm-config-loader/yarn.lock rename to packages/osd-apm-config-loader/yarn.lock