diff --git a/cmd/githubwebhookserver/main.go b/cmd/githubwebhookserver/main.go index 8b4982ed..4f0da711 100644 --- a/cmd/githubwebhookserver/main.go +++ b/cmd/githubwebhookserver/main.go @@ -130,6 +130,8 @@ func main() { switch logLevel { case logLevelDebug: o.Development = true + lvl := zaplib.NewAtomicLevelAt(-2) // maps to logr's V(2) + o.Level = &lvl case logLevelInfo: lvl := zaplib.NewAtomicLevelAt(zaplib.InfoLevel) o.Level = &lvl @@ -174,8 +176,9 @@ func main() { } hraGitHubWebhook := &controllers.HorizontalRunnerAutoscalerGitHubWebhook{ + Name: "webhookbasedautoscaler", Client: mgr.GetClient(), - Log: ctrl.Log.WithName("controllers").WithName("Runner"), + Log: ctrl.Log.WithName("controllers").WithName("webhookbasedautoscaler"), Recorder: nil, Scheme: mgr.GetScheme(), SecretKeyBytes: []byte(webhookSecretToken), @@ -184,7 +187,7 @@ func main() { } 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) } diff --git a/controllers/horizontal_runner_autoscaler_webhook.go b/controllers/horizontal_runner_autoscaler_webhook.go index 794a9590..fc99e4f2 100644 --- a/controllers/horizontal_runner_autoscaler_webhook.go +++ b/controllers/horizontal_runner_autoscaler_webhook.go @@ -93,7 +93,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) Handle(w http.Respons if err != nil { msg := err.Error() 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 { - 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", ) @@ -490,6 +490,8 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF "organization", owner, "enterprises", enterprise, ) + } else { + log.V(1).Info("Found some runner groups are managed by ARC", "groups", managedRunnerGroups) } var visibleGroups *simulator.VisibleRunnerGroups @@ -535,7 +537,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF return "" } - log.Info("groups", "groups", visibleGroups) + log.V(1).Info("groups", "groups", visibleGroups) var t *ScaleTarget @@ -552,7 +554,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) getScaleUpTargetWithF } 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 }) @@ -850,7 +852,7 @@ func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) SetupWithManager(mgr 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 case "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 } } - 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 }