refactor: expandSeriesByValues

Author: int128

src/pullRequest/expand.ts

@@ -1,13 +1,13 @@
 import { Series } from '@datadog/datadog-api-client/dist/packages/datadog-api-client-v1/models/Series'
 
-export const expandSeriesByLabels = (series: Series[], labels: { name: string }[]): Series[] => {
-  if (labels.length === 0) {
+export const expandSeriesByValues = (series: Series[], key: string, values: string[]): Series[] => {
+  if (values.length === 0) {
     return series
   }
   return series.flatMap((s) =>
-    labels.map((label) => ({
+    values.map((v) => ({
       ...s,
-      tags: [...(s.tags ?? []), `label:${label.name}`],
+      tags: [...(s.tags ?? []), `${key}:${v}`],
     }))
   )
 }

src/pullRequest/metrics.ts

@@ -1,7 +1,7 @@
 import { Series } from '@datadog/datadog-api-client/dist/packages/datadog-api-client-v1/models/Series'
 import { PullRequestClosedEvent, PullRequestEvent, PullRequestOpenedEvent } from '@octokit/webhooks-types'
 import { ClosedPullRequest } from '../queries/closedPullRequest'
-import { expandSeriesByLabels } from './expand'
+import { expandSeriesByValues } from './expand'
 
 const computeCommonTags = (e: PullRequestEvent): string[] => {
   const tags = [
@@ -139,7 +139,7 @@ export const computePullRequestClosedMetrics = (
   if (options.sendPullRequestLabels) {
     // Datadog treats a tag as combination of values.
     // For example, if we send a metric with tags `label:foo` and `label:bar`, Datadog will show `label:foo,bar`.
-    return expandSeriesByLabels(series, e.pull_request.labels)
+    return expandSeriesByValues(series, 'label', e.pull_request.labels.map((l) => l.name))
   }
   return series
 }

tests/pullRequest/expand.test.ts

@@ -1,8 +1,8 @@
 import { Series } from '@datadog/datadog-api-client/dist/packages/datadog-api-client-v1/models/Series'
-import { expandSeriesByLabels } from '../../src/pullRequest/expand'
+import { expandSeriesByValues } from '../../src/pullRequest/expand'
 
 test('empty', () => {
-  expect(expandSeriesByLabels([], [])).toStrictEqual([])
+  expect(expandSeriesByValues([], 'label', [])).toStrictEqual([])
 })
 
 test('expand series by no label', () => {
@@ -16,7 +16,7 @@ test('expand series by no label', () => {
       points: [[1579721588, 2]],
     },
   ]
-  expect(expandSeriesByLabels(series, [])).toStrictEqual(series)
+  expect(expandSeriesByValues(series, 'label', [])).toStrictEqual(series)
 })
 
 test('expand series by 1 label', () => {
@@ -30,7 +30,7 @@ test('expand series by 1 label', () => {
       points: [[1579721588, 2]],
     },
   ]
-  expect(expandSeriesByLabels(series, [{ name: 'app' }])).toStrictEqual([
+  expect(expandSeriesByValues(series, 'label', ['app'])).toStrictEqual([
     {
       metric: 'github.actions.pull_request_closed.total',
       points: [[1579721588, 1]],
@@ -55,7 +55,7 @@ test('expand series by 2 labels', () => {
       points: [[1579721588, 2]],
     },
   ]
-  expect(expandSeriesByLabels(series, [{ name: 'app' }, { name: 'critical' }])).toStrictEqual([
+  expect(expandSeriesByValues(series, 'label', ['app', 'critical'])).toStrictEqual([
     {
       metric: 'github.actions.pull_request_closed.total',
       points: [[1579721588, 1]],