Fix service name in development

elastic · Oct 5, 2020 · fa93453 · fa93453
1 parent d8dee60
commit fa93453
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts
@@ -110,6 +110,7 @@ export class ClusterManager {
  type: 'server',
  log: this.log,
  argv: serverArgv,
+ apmServiceName: 'kibana',
  })),
  ];
 

diff --git a/src/cli/cluster/worker.ts b/src/cli/cluster/worker.ts
@@ -49,6 +49,7 @@ interface WorkerOptions {
  title?: string;
  watch?: boolean;
  baseArgv?: string[];
+ apmServiceName?: string;
 }
 
 export class Worker extends EventEmitter {
@@ -89,6 +90,7 @@ export class Worker extends EventEmitter {
  NODE_OPTIONS: process.env.NODE_OPTIONS || '',
  kbnWorkerType: this.type,
  kbnWorkerArgv: JSON.stringify([...(opts.baseArgv || baseArgv), ...(opts.argv || [])]),
+ ELASTIC_APM_SERVICE_NAME: opts.apmServiceName || '',
  };
  }
 

diff --git a/src/cli/dev.js b/src/cli/dev.js
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-require('../apm')(process.env.ELASTIC_APM_PROXY_SERVICE_NAME || 'kibana-proxy');
+require('../apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
 require('../setup_node_env');
 require('./cli');