add jobuuid label and bump to v6

Author: bobymicroby

dist/index.js

@@ -34,6 +34,7 @@ import { DEFAULT_AGGREGATION_SELECTOR } from '@opentelemetry/sdk-metrics/build/s
 import { InstrumentType } from '@opentelemetry/sdk-metrics/build/src/export/MetricData.js'
 
 import { AggregationType, ViewOptions } from '@opentelemetry/sdk-metrics'
+import { randomUUID } from 'crypto'
 class CapturingDiagLogger implements DiagLogger {
   private baseLogger: DiagConsoleLogger
   private capturedOutput: string = ''
@@ -99,7 +100,7 @@ export async function run(): Promise<void> {
 
     const metricsNamespace = core.getInput('metrics-namespace') || 'cae'
 
-    const metricsVersion = core.getInput('metrics-version') || 'v5'
+    const metricsVersion = core.getInput('metrics-version') || 'v6'
 
     const config: TMetricsConfig = {
       serviceName,
@@ -109,7 +110,8 @@ export async function run(): Promise<void> {
       repository: `${github.context.repo.owner}/${github.context.repo.repo}`,
       branch: github.context.ref.replace('refs/heads/', ''),
       commitSha: github.context.sha,
-      buildId: github.context.runId.toString()
+      runId: github.context.runId.toString(),
+      jobUUID: randomUUID()
     }
 
     core.info(`🔧 Configuring OpenTelemetry CI Visibility`)

dist/index.js.map

@@ -9,7 +9,8 @@ describe('generateMetrics', () => {
     repository: 'test/repo',
     branch: 'main',
     commitSha: 'abc123',
-    buildId: 'build-456'
+    runId: 'build-456',
+    jobUUID: 'job-456'
   }
 
   const createTest = (overrides: Partial<TTest> = {}): TTest => ({
@@ -254,7 +255,8 @@ describe('generateMetrics', () => {
       repository: undefined,
       branch: undefined,
       commitSha: undefined,
-      buildId: undefined
+      runId: undefined,
+      jobUUID: undefined
     })
 
     expect(metrics.length).toBeGreaterThan(0)

src/main.ts

@@ -8,7 +8,8 @@ export interface TMetricsConfig {
   readonly repository: string | undefined
   readonly branch: string | undefined
   readonly commitSha: string | undefined
-  readonly buildId: string | undefined
+  readonly runId: string | undefined
+  readonly jobUUID: string | undefined
 }
 
 export interface TMetricDataPoint {
@@ -185,7 +186,7 @@ const getBaseAttributes = (
   if (config.branch) attributes['vcs.repository.ref.name'] = config.branch
   if (config.commitSha)
     attributes['vcs.repository.ref.revision'] = config.commitSha
-  if (config.buildId) attributes['ci.build.id'] = config.buildId
+  if (config.runId) attributes['ci.build.id'] = config.runId
 
   return attributes
 }

src/metrics-generator.test.ts

@@ -82,7 +82,8 @@ describe('MetricsSubmitter', () => {
     repository: undefined,
     branch: undefined,
     commitSha: undefined,
-    buildId: undefined
+    runId: undefined,
+    jobUUID: undefined
   }
 
   const createDataPoint = (