From fa9345333a2d6f5cb50db9ffe1ac53375f9ff857 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 5 Oct 2020 09:39:08 -0600
Subject: [PATCH] Fix service name in development

---
 src/cli/cluster/cluster_manager.ts | 1 +
 src/cli/cluster/worker.ts          | 2 ++
 src/cli/dev.js                     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts
index 3d81185e8a3138..931650a67687cf 100644
--- 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
index f6205b41ac5a59..d28065765070b5 100644
--- 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
index 9d0cb35c3d7309..a284c82dfeb6ee 100644
--- 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');