Merge pull request #64 from form3tech-oss/mike-logging-set-debug

chore: Change noisy log messages to debug level
form3tech-oss · Dec 11, 2023 · 161f9ef · 161f9ef
2 parents 2eb86b6 + 1643e63
commit 161f9ef
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 92 deletions.
diff --git a/api/v1alpha1/schedule_webhook.go b/api/v1alpha1/schedule_webhook.go
@@ -33,7 +33,7 @@ var _ webhook.Defaulter = &Schedule{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (in *Schedule) Default() {
-	schedulelog.Info("default", "name", in.Name)
+	schedulelog.V(1).Info("default", "name", in.Name)
 	in.Spec.ConcurrencyPolicy.Default()
 }
 
@@ -47,13 +47,13 @@ var _ webhook.Validator = &Schedule{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (in *Schedule) ValidateCreate() (admission.Warnings, error) {
-	schedulelog.Info("validate create", "name", in.Name)
+	schedulelog.V(1).Info("validate create", "name", in.Name)
 	return in.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (in *Schedule) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
-	schedulelog.Info("validate update", "name", in.Name)
+	schedulelog.V(1).Info("validate update", "name", in.Name)
 	return in.Validate()
 }
 

diff --git a/api/v1alpha1/zz_generated.chaosmesh.go b/api/v1alpha1/zz_generated.chaosmesh.go
diff --git a/cmd/chaos-builder/impl.go b/cmd/chaos-builder/impl.go
@@ -153,13 +153,13 @@ func (in *{{.Type}}) IsOneShot() bool {
 var {{.Type}}WebhookLog = logf.Log.WithName("{{.Type}}-resource")
 
 func (in *{{.Type}}) ValidateCreate() (admission.Warnings, error) {
-	{{.Type}}WebhookLog.Info("validate create", "name", in.Name)
+	{{.Type}}WebhookLog.V(1).Info("validate create", "name", in.Name)
 	return in.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (in *{{.Type}}) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
-	{{.Type}}WebhookLog.Info("validate update", "name", in.Name)
+	{{.Type}}WebhookLog.V(1).Info("validate update", "name", in.Name)
 	{{- if not .EnableUpdate}}
 	if !reflect.DeepEqual(in.Spec, old.(*{{.Type}}).Spec) {
 		return nil, ErrCanNotUpdateChaos
@@ -170,7 +170,7 @@ func (in *{{.Type}}) ValidateUpdate(old runtime.Object) (admission.Warnings, err
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
 func (in *{{.Type}}) ValidateDelete() (admission.Warnings, error) {
-	{{.Type}}WebhookLog.Info("validate delete", "name", in.Name)
+	{{.Type}}WebhookLog.V(1).Info("validate delete", "name", in.Name)
 
 	// Nothing to do?
 	return nil, nil

diff --git a/controllers/common/condition/controller.go b/controllers/common/condition/controller.go
@@ -82,7 +82,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 				})
 			}
 
-			r.Log.Info("updating conditions", "conditions", conditions)
+			r.Log.V(1).Info("updating conditions", "conditions", conditions)
 			obj := r.Object.DeepCopyObject().(v1alpha1.InnerObject)
 
 			if err := r.Client.Get(ctx, req.NamespacedName, obj); err != nil {

diff --git a/controllers/common/desiredphase/controller.go b/controllers/common/desiredphase/controller.go
@@ -126,7 +126,7 @@ func (info *reconcileInfo) CalcDesiredPhase() (v1alpha1.DesiredPhase, []recorder
 func (info *reconcileInfo) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	desiredPhase, events := info.CalcDesiredPhase()
 
-	info.Log.Info("modify desiredPhase", "desiredPhase", desiredPhase)
+	info.Log.V(1).Info("modify desiredPhase", "desiredPhase", desiredPhase)
 	if info.obj.GetStatus().Experiment.DesiredPhase != desiredPhase {
 		for _, ev := range events {
 			info.Recorder.Event(info.obj, ev)
@@ -142,7 +142,7 @@ func (info *reconcileInfo) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 
 			if obj.GetStatus().Experiment.DesiredPhase != desiredPhase {
 				obj.GetStatus().Experiment.DesiredPhase = desiredPhase
-				info.Log.Info("update object", "namespace", obj.GetNamespace(), "name", obj.GetName())
+				info.Log.V(1).Info("update object", "namespace", obj.GetNamespace(), "name", obj.GetName())
 				return info.Client.Update(context.TODO(), obj)
 			}
 

diff --git a/controllers/common/finalizers/controller.go b/controllers/common/finalizers/controller.go
@@ -60,6 +60,7 @@ type InitReconciler struct {
 func (r *InitReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	obj := r.Object.DeepCopyObject().(v1alpha1.InnerObject)
 
+	r.Log.Info("init reconciler -> Reconcile")
 	if err := r.Client.Get(context.TODO(), req.NamespacedName, obj); err != nil {
 		if apierrors.IsNotFound(err) {
 			r.Log.Info("chaos not found")
@@ -90,6 +91,8 @@ type CleanReconciler struct {
 func (r *CleanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	obj := r.Object.DeepCopyObject().(v1alpha1.InnerObject)
 
+	r.Log.Info("clean reconciler -> Reconcile")
+
 	if err := r.Client.Get(context.TODO(), req.NamespacedName, obj); err != nil {
 		if apierrors.IsNotFound(err) {
 			r.Log.Info("chaos not found")

diff --git a/controllers/common/pipeline/pipeline.go b/controllers/common/pipeline/pipeline.go
@@ -75,7 +75,7 @@ func (p *Pipeline) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result
 			return ctrl.Result{}, err
 		}
 
-		p.ctx.Logger.WithName("pipeline").Info("reconcile result", "result", ret)
+		p.ctx.Logger.WithName("pipeline").V(1).Info("reconcile result", "result", ret)
 
 		if ret.Requeue || deadline != nil && deadline.Before(time.Now()) {
 			ret.Requeue = true

diff --git a/controllers/common/records/controller.go b/controllers/common/records/controller.go
@@ -116,8 +116,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	needRetry := false
 	for index, record := range records {
 		var err error
+
 		idLogger := logger.WithValues("id", records[index].Id)
-		idLogger.Info("iterating record", "record", record, "desiredPhase", desiredPhase)
+		idLogger.V(1).Info("iterating record", "record", record, "desiredPhase", desiredPhase)
 
 		// The whole running logic is a cycle:
 		// Not Injected -> Not Injected/* -> Injected -> Injected/* -> Not Injected
@@ -217,7 +218,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 	if shouldUpdate {
 		updateError := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-			logger.Info("updating records", "records", records)
+			logger.V(1).Info("updating records", "records", records)
 			obj := r.Object.DeepCopyObject().(v1alpha1.InnerObjectWithSelector)
 
 			if err := r.Client.Get(context.TODO(), req.NamespacedName, obj); err != nil {

diff --git a/controllers/multicluster/remotechaos/fx.go b/controllers/multicluster/remotechaos/fx.go
@@ -105,7 +105,6 @@ var remotePredicates = predicate.Funcs{
 		}
 
 		if obj.GetRemoteCluster() == "" {
-			fmt.Println("remote cluster is empty")
 			return false
 		}
 
@@ -121,7 +120,6 @@ var remotePredicates = predicate.Funcs{
 		}
 
 		if obj.GetRemoteCluster() == "" {
-			fmt.Println("remote cluster is empty")
 			return false
 		}