add job uuid and bump to v7

Author: bobymicroby

badges/coverage.svg

@@ -41,7 +41,8 @@
     "package:watch": "npm run package -- --watch",
     "test": "NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 npx jest",
     "all": "npm run format:write && npm run lint && npm run test && npm run coverage && npm run package",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test:update:snapshot": "NODE_OPTIONS=--experimental-vm-modules NODE_NO_WARNINGS=1 npx jest --updateSnapshot"
   },
   "license": "MIT",
   "dependencies": {

dist/index.js

@@ -100,7 +100,7 @@ export async function run(): Promise<void> {
 
     const metricsNamespace = core.getInput('metrics-namespace') || 'cae'
 
-    const metricsVersion = core.getInput('metrics-version') || 'v6'
+    const metricsVersion = core.getInput('metrics-version') || 'v7'
 
     const config: TMetricsConfig = {
       serviceName,

dist/index.js.map

@@ -228,11 +228,12 @@ describe('generateMetrics', () => {
         'vcs.repository.name': expect.any(String),
         'vcs.repository.ref.name': expect.any(String),
         'vcs.repository.ref.revision': expect.any(String),
-        'ci.build.id': expect.any(String)
+        'ci.run.id': expect.any(String)
       },
       `
       {
-        "ci.build.id": Any<String>,
+        "ci.job.id": "job-456",
+        "ci.run.id": Any<String>,
         "deployment.environment": Any<String>,
         "service.name": Any<String>,
         "service.version": Any<String>,

package.json

@@ -186,7 +186,13 @@ const getBaseAttributes = (
   if (config.branch) attributes['vcs.repository.ref.name'] = config.branch
   if (config.commitSha)
     attributes['vcs.repository.ref.revision'] = config.commitSha
-  if (config.runId) attributes['ci.build.id'] = config.runId
+  if (config.runId) {
+    attributes['ci.run.id'] = config.runId
+  }
+
+  if (config.jobUUID) {
+    attributes['ci.job.id'] = config.jobUUID
+  }
 
   return attributes
 }