public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update metrics to include repository on job-based label (#3310) 

Co-authored-by: Samuel Rats <samuel.rats@teads.com>
This commit is contained in:
Nikola Jokic 2024-03-18 12:45:52 +01:00 committed by GitHub
parent 039350a0d0
commit 814947c60e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ghalistener/listener/listener_test.go
View File

@ -37,7 +37,6 @@ func TestNew(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.NotNil(t, l) assert.NotNil(t, l)
}) })
} }
func TestListener_createSession(t *testing.T) { func TestListener_createSession(t *testing.T) {
@ -657,7 +656,7 @@ func TestListener_acquireAvailableJobs(t *testing.T) {
Return(nil, &actions.MessageQueueTokenExpiredError{}). Return(nil, &actions.MessageQueueTokenExpiredError{}).
Once() Once()
// First call to AcquireJobs will fail with a token expired error // Second call should succeed
client.On("AcquireJobs", ctx, mock.Anything, mock.Anything, mock.Anything). client.On("AcquireJobs", ctx, mock.Anything, mock.Anything, mock.Anything).
Run(func(args mock.Arguments) { Run(func(args mock.Arguments) {
ids := args.Get(3).([]int64) ids := args.Get(3).([]int64)

10
cmd/ghalistener/metrics/metrics.go
View File

@ -223,8 +223,8 @@ type baseLabels struct {
func (b *baseLabels) jobLabels(jobBase *actions.JobMessageBase) prometheus.Labels { func (b *baseLabels) jobLabels(jobBase *actions.JobMessageBase) prometheus.Labels {
return prometheus.Labels{ return prometheus.Labels{
labelKeyEnterprise: b.enterprise, labelKeyEnterprise: b.enterprise,
labelKeyOrganization: b.organization, labelKeyOrganization: jobBase.OwnerName,
labelKeyRepository: b.repository, labelKeyRepository: jobBase.RepositoryName,
labelKeyJobName: jobBase.JobDisplayName, labelKeyJobName: jobBase.JobDisplayName,
labelKeyJobWorkflowRef: jobBase.JobWorkflowRef, labelKeyJobWorkflowRef: jobBase.JobWorkflowRef,
labelKeyEventName: jobBase.EventName, labelKeyEventName: jobBase.EventName,
@ -271,8 +271,10 @@ type ServerPublisher interface {
ListenAndServe(ctx context.Context) error ListenAndServe(ctx context.Context) error
} }
var _ Publisher = &discard{} var (
var _ ServerPublisher = &exporter{} _ Publisher = &discard{}
_ ServerPublisher = &exporter{}
)
var Discard Publisher = &discard{} var Discard Publisher = &discard{}