actions/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions/actions-runner-controller.git synced 2025-12-14 22:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(actionsmetrics): Add owner and workflow_name labels to workflow job metrics (#2225)

Browse Source
This commit is contained in:
Hamish Forbes
2023-03-13 14:50:36 +13:00
committed by GitHub
parent af625dd1cb
commit bcaac39a2e
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/actionsmetrics/event_reader.go
View File

@@ -79,14 +79,34 @@ func (reader *EventReader) ProcessWorkflowJobEvent(ctx context.Context, event in
labels["repository_full_name"] = *n
keysAndValues = append(keysAndValues, "repository_full_name", *n)
}
if e.Repo.Owner != nil {
if l := e.Repo.Owner.Login; l != nil {
labels["owner"] = *l
keysAndValues = append(keysAndValues, "owner", *l)
}
}
}
var org string
if e.Org != nil {
if n := e.Org.Name; n != nil {
labels["organization"] = *e.Org.Name
org = *n
keysAndValues = append(keysAndValues, "organization", *n)
}
}
labels["organization"] = org
var wn string
if e.WorkflowJob != nil {
if n := e.WorkflowJob.WorkflowName; n != nil {
wn = *n
keysAndValues = append(keysAndValues, "workflow_name", *n)
}
}
labels["workflow_name"] = wn
log := reader.Log.WithValues(keysAndValues...)
// switch on job status
switch action := e.GetAction(); action {
@@ -102,14 +122,10 @@ func (reader *EventReader) ProcessWorkflowJobEvent(ctx context.Context, event in
parseResult, err := reader.fetchAndParseWorkflowJobLogs(ctx, e)
if err != nil {
reader.Log.Error(err, "reading workflow job log")
log.Error(err, "reading workflow job log")
return
} else {
reader.Log.WithValues("job_name", *e.WorkflowJob.Name, "job_id", fmt.Sprint(*e.WorkflowJob.ID), "repository", *e.Repo.Name, "repository_full_name", *e.Repo.FullName)
if len(*e.Org.Name) > 0 {
reader.Log.WithValues("organization", *e.Org.Name)
}
reader.Log.Info("reading workflow_job logs")
log.Info("reading workflow_job logs")
}
githubWorkflowJobQueueDurationSeconds.With(labels).Observe(parseResult.QueueTime.Seconds())
@@ -122,10 +138,10 @@ func (reader *EventReader) ProcessWorkflowJobEvent(ctx context.Context, event in
parseResult, err := reader.fetchAndParseWorkflowJobLogs(ctx, e)
if err != nil {
reader.Log.Error(err, "reading workflow job log")
log.Error(err, "reading workflow job log")
return
} else {
reader.Log.Info("reading workflow_job logs", keysAndValues...)
log.Info("reading workflow_job logs", keysAndValues...)
}
if *e.WorkflowJob.Conclusion == "failure" {