[APM] Synthtrace - Add service.name in metricsetPicker for breakdown …

…metrics (#140256) * Add service.name in metricsetPicker for breakdown metrics * Run cypress tests on synthtrace changes
elastic · Sep 21, 2022 · ee4b451 · ee4b451
1 parent 7be5ac4
commit ee4b451
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -90,7 +90,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
     }
 
     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')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));

diff --git a/packages/kbn-apm-synthtrace/src/lib/apm/processors/get_breakdown_metrics.ts b/packages/kbn-apm-synthtrace/src/lib/apm/processors/get_breakdown_metrics.ts
@@ -105,23 +105,23 @@ export function getBreakdownMetrics(events: ApmFields[]) {
         lastMeasurement = timestamp;
       }
 
+      const instance = pickBy(event, instancePicker);
+
       const key = {
         '@timestamp': event['@timestamp']! - (event['@timestamp']! % (30 * 1000)),
         'transaction.type': transaction['transaction.type'],
         'transaction.name': transaction['transaction.name'],
         ...pickBy(event, metricsetPicker),
+        ...instance,
       };
 
-      const instance = pickBy(event, instancePicker);
-
       const metricsetId = objectHash(key);
 
       let metricset = metricsets.get(metricsetId);
 
       if (!metricset) {
         metricset = {
           ...key,
-          ...instance,
           'processor.event': 'metric',
           'processor.name': 'metric',
           'metricset.name': `span_breakdown`,