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

githubwebhookserver: Tweak log levels of various messages (#1123) 

Some of logs like `HRA keys indexed for HRA` were so excessive that it made testing and debugging the githubwebhookserver harder. This tries to fix that.
This commit is contained in:
Yusuke Kuoka 2022-02-17 09:15:26 +09:00 committed by GitHub
parent a7b39cc247
commit e22d981d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/githubwebhookserver/main.go
View File

@ -130,6 +130,8 @@ func main() {
switch logLevel { switch logLevel {
case logLevelDebug: case logLevelDebug:
o.Development = true o.Development = true
lvl := zaplib.NewAtomicLevelAt(-2) // maps to logr's V(2)
o.Level = &lvl
case logLevelInfo: case logLevelInfo:
lvl := zaplib.NewAtomicLevelAt(zaplib.InfoLevel) lvl := zaplib.NewAtomicLevelAt(zaplib.InfoLevel)
o.Level = &lvl o.Level = &lvl
@ -174,8 +176,9 @@ func main() {
} }
hraGitHubWebhook := &controllers.HorizontalRunnerAutoscalerGitHubWebhook{ hraGitHubWebhook := &controllers.HorizontalRunnerAutoscalerGitHubWebhook{
Name: "webhookbasedautoscaler",
Client: mgr.GetClient(), Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("Runner"), Log: ctrl.Log.WithName("controllers").WithName("webhookbasedautoscaler"),
Recorder: nil, Recorder: nil,
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
SecretKeyBytes: []byte(webhookSecretToken), SecretKeyBytes: []byte(webhookSecretToken),
@ -184,7 +187,7 @@ func main() {
} }
if err = hraGitHubWebhook.SetupWithManager(mgr); err != nil { if err = hraGitHubWebhook.SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Runner") setupLog.Error(err, "unable to create controller", "controller", "webhookbasedautoscaler")
os.Exit(1) os.Exit(1)
} }

14
controllers/horizontal_runner_autoscaler_webhook.go
View File

@ -93,7 +93,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) Handle(w http.Respons
if err != nil { if err != nil {
msg := err.Error() msg := err.Error()
if written, err := w.Write([]byte(msg)); err != nil { if written, err := w.Write([]byte(msg)); err != nil {
autoscaler.Log.Error(err, "failed writing http error response", "msg", msg, "written", written) autoscaler.Log.V(1).Error(err, "failed writing http error response", "msg", msg, "written", written)
} }
} }
} }
@ -290,7 +290,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) Handle(w http.Respons
} }
if target == nil { if target == nil {
log.Info( log.V(1).Info(
"Scale target not found. If this is unexpected, ensure that there is exactly one repository-wide or organizational runner deployment that matches this webhook event", "Scale target not found. If this is unexpected, ensure that there is exactly one repository-wide or organizational runner deployment that matches this webhook event",
) )
@ -490,6 +490,8 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF
"organization", owner, "organization", owner,
"enterprises", enterprise, "enterprises", enterprise,
) )
} else {
log.V(1).Info("Found some runner groups are managed by ARC", "groups", managedRunnerGroups)
} }
var visibleGroups *simulator.VisibleRunnerGroups var visibleGroups *simulator.VisibleRunnerGroups
@ -535,7 +537,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF
return "" return ""
} }
log.Info("groups", "groups", visibleGroups) log.V(1).Info("groups", "groups", visibleGroups)
var t *ScaleTarget var t *ScaleTarget
@ -552,7 +554,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF
} }
t = target t = target
log.Info("job scale up target found", "enterprise", enterprise, "organization", owner, "repository", repo, "key", key) log.V(1).Info("job scale up target found", "enterprise", enterprise, "organization", owner, "repository", repo, "key", key)
return true, nil return true, nil
}) })
@ -850,7 +852,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) SetupWithManager(mgr
keys = append(keys, enterpriseKey(enterprise)) // Enterprise runners keys = append(keys, enterpriseKey(enterprise)) // Enterprise runners
} }
} }
autoscaler.Log.V(1).Info(fmt.Sprintf("HRA keys indexed for HRA %s: %v", hra.Name, keys)) autoscaler.Log.V(2).Info(fmt.Sprintf("HRA keys indexed for HRA %s: %v", hra.Name, keys))
return keys return keys
case "RunnerSet": case "RunnerSet":
var rs v1alpha1.RunnerSet var rs v1alpha1.RunnerSet
@ -875,7 +877,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) SetupWithManager(mgr
keys = append(keys, enterpriseRunnerGroupKey(enterprise, rs.Spec.Group)) // Enterprise runner groups keys = append(keys, enterpriseRunnerGroupKey(enterprise, rs.Spec.Group)) // Enterprise runner groups
} }
} }
autoscaler.Log.V(1).Info(fmt.Sprintf("HRA keys indexed for HRA %s: %v", hra.Name, keys)) autoscaler.Log.V(2).Info(fmt.Sprintf("HRA keys indexed for HRA %s: %v", hra.Name, keys))
return keys return keys
} }