Skip to content

Commit 97697e8

Browse files
authored
Add job_workflow_ref label to listener metrics (#4054)
Signed-off-by: rskmm0chang <[email protected]>
1 parent 27b292b commit 97697e8

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

charts/gha-runner-scale-set/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ githubConfigSecret:
131131
# counters:
132132
# gha_started_jobs_total:
133133
# labels:
134-
# ["repository", "organization", "enterprise", "job_name", "event_name"]
134+
# ["repository", "organization", "enterprise", "job_name", "event_name", "job_workflow_ref"]
135135
# gha_completed_jobs_total:
136136
# labels:
137137
# [
@@ -141,6 +141,7 @@ githubConfigSecret:
141141
# "job_name",
142142
# "event_name",
143143
# "job_result",
144+
# "job_workflow_ref",
144145
# ]
145146
# gauges:
146147
# gha_assigned_jobs:
@@ -162,7 +163,7 @@ githubConfigSecret:
162163
# histograms:
163164
# gha_job_startup_duration_seconds:
164165
# labels:
165-
# ["repository", "organization", "enterprise", "job_name", "event_name"]
166+
# ["repository", "organization", "enterprise", "job_name", "event_name","job_workflow_ref"]
166167
# buckets:
167168
# [
168169
# 0.01,
@@ -220,6 +221,7 @@ githubConfigSecret:
220221
# "job_name",
221222
# "event_name",
222223
# "job_result",
224+
# "job_workflow_ref"
223225
# ]
224226
# buckets:
225227
# [

cmd/ghalistener/metrics/metrics.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const (
2121
labelKeyOrganization = "organization"
2222
labelKeyRepository = "repository"
2323
labelKeyJobName = "job_name"
24+
labelKeyJobWorkflowRef = "job_workflow_ref"
2425
labelKeyEventName = "event_name"
2526
labelKeyJobResult = "job_result"
2627
)
@@ -75,11 +76,12 @@ var metricsHelp = metricsHelpRegistry{
7576

7677
func (e *exporter) jobLabels(jobBase *actions.JobMessageBase) prometheus.Labels {
7778
return prometheus.Labels{
78-
labelKeyEnterprise: e.scaleSetLabels[labelKeyEnterprise],
79-
labelKeyOrganization: jobBase.OwnerName,
80-
labelKeyRepository: jobBase.RepositoryName,
81-
labelKeyJobName: jobBase.JobDisplayName,
82-
labelKeyEventName: jobBase.EventName,
79+
labelKeyEnterprise: e.scaleSetLabels[labelKeyEnterprise],
80+
labelKeyOrganization: jobBase.OwnerName,
81+
labelKeyRepository: jobBase.RepositoryName,
82+
labelKeyJobName: jobBase.JobDisplayName,
83+
labelKeyJobWorkflowRef: jobBase.JobWorkflowRef,
84+
labelKeyEventName: jobBase.EventName,
8385
}
8486
}
8587

0 commit comments

Comments
 (0)