github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-28 03:01:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Synthtrace - Add service.name in metricsetPicker for breakdown metrics (#140256)

Browse source 
* Add service.name in metricsetPicker for breakdown metrics

* Run cypress tests on synthtrace changes
This commit is contained in:
Giorgos Bamparopoulos 2022-09-21 15:38:13 +01:00 • committed by GitHub
parent 7be5ac42a0
commit ee4b451ed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.buildkite/scripts/pipelines/pull_request/pipeline.ts
View file

@ -90,7 +90,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
} }
if ( if (
(await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) || (await doAnyChangesMatch([/^x-pack\/plugins\/apm/, /^packages\/kbn-apm-synthtrace/])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites') GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) { ) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml')); pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));

6
packages/kbn-apm-synthtrace/src/lib/apm/processors/get_breakdown_metrics.ts
View file

@ -105,15 +105,16 @@ export function getBreakdownMetrics(events: ApmFields[]) {
lastMeasurement = timestamp; lastMeasurement = timestamp;
} }
const instance = pickBy(event, instancePicker);
const key = { const key = {
'@timestamp': event['@timestamp']! - (event['@timestamp']! % (30 * 1000)), '@timestamp': event['@timestamp']! - (event['@timestamp']! % (30 * 1000)),
'transaction.type': transaction['transaction.type'], 'transaction.type': transaction['transaction.type'],
'transaction.name': transaction['transaction.name'], 'transaction.name': transaction['transaction.name'],
...pickBy(event, metricsetPicker), ...pickBy(event, metricsetPicker),
...instance,
}; };
const instance = pickBy(event, instancePicker);
const metricsetId = objectHash(key); const metricsetId = objectHash(key);
let metricset = metricsets.get(metricsetId); let metricset = metricsets.get(metricsetId);
@ -121,7 +122,6 @@ export function getBreakdownMetrics(events: ApmFields[]) {
if (!metricset) { if (!metricset) {
metricset = { metricset = {
...key, ...key,
...instance,
'processor.event': 'metric', 'processor.event': 'metric',
'processor.name': 'metric', 'processor.name': 'metric',
'metricset.name': `span_breakdown`, 'metricset.name': `span_breakdown`,