From 1dc7e01184f87fe39f62754770c3317ecdafd8b9 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 10 Feb 2021 15:40:37 +0100
Subject: [PATCH] Limit cardinality of transaction.name

---
 src/optimize/bundles_route/bundles_route.ts     |  3 +++
 .../server/task_running/task_runner.ts          | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/optimize/bundles_route/bundles_route.ts b/src/optimize/bundles_route/bundles_route.ts
index 6debf4b476590..b88ca7e5c22b1 100644
--- a/src/optimize/bundles_route/bundles_route.ts
+++ b/src/optimize/bundles_route/bundles_route.ts
@@ -10,6 +10,7 @@ import { extname, join } from 'path';
 
 import Hapi from '@hapi/hapi';
 import * as UiSharedDeps from '@kbn/ui-shared-deps';
+import agent from 'elastic-apm-node';
 
 import { createDynamicAssetResponse } from './dynamic_asset_response';
 import { FileHashCache } from './file_hash_cache';
@@ -101,6 +102,8 @@ function buildRouteForBundles({
           method(request: Hapi.Request, h: Hapi.ResponseToolkit) {
             const ext = extname(request.params.path);
 
+            agent.setTransactionName('GET ?/bundles/?');
+
             if (ext !== '.js' && ext !== '.css') {
               return h.continue;
             }
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
index 40213b3743d62..ad5a2e11409ec 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
@@ -201,10 +201,10 @@ export class TaskManagerRunner implements TaskRunner {
     });
 
     const stopTaskTimer = startTaskTimer();
-    const apmTrans = apm.startTransaction(
-      `taskManager run ${this.instance.taskType}`,
-      'taskManager'
-    );
+    const apmTrans = apm.startTransaction(`taskManager run`, 'taskManager');
+    apmTrans?.addLabels({
+      taskType: this.taskType,
+    });
     try {
       this.task = this.definition.createTaskRunner(modifiedContext);
       const result = await this.task.run();
@@ -232,10 +232,11 @@ export class TaskManagerRunner implements TaskRunner {
   public async markTaskAsRunning(): Promise<boolean> {
     performance.mark('markTaskAsRunning_start');
 
-    const apmTrans = apm.startTransaction(
-      `taskManager markTaskAsRunning ${this.instance.taskType}`,
-      'taskManager'
-    );
+    const apmTrans = apm.startTransaction(`taskManager markTaskAsRunning`, 'taskManager');
+
+    apmTrans?.addLabels({
+      taskType: this.taskType,
+    });
 
     const now = new Date();
     try {