Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Limit cardinality of transaction.name (#90955) #91021

Merged
merged 1 commit into from
Feb 11, 2021
Merged

[7.x] Limit cardinality of transaction.name (#90955) #91021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/optimize/bundles_route/bundles_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
}
Expand Down
17 changes: 9 additions & 8 deletions x-pack/plugins/task_manager/server/task_running/task_runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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 {
Expand Down