Merge pull request #4620 from AndiDog/fix-logging

Pass logger to machine pool scope to get verbosity right, fix copying logger in `With...` methods
kubernetes-sigs · Nov 28, 2023 · a1b6f35 · a1b6f35
2 parents 25f8108 + 70ada99
commit a1b6f35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/exp/controllers/awsmachinepool_controller.go b/exp/controllers/awsmachinepool_controller.go
@@ -131,6 +131,7 @@ func (r *AWSMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	// Create the machine pool scope
 	machinePoolScope, err := scope.NewMachinePoolScope(scope.MachinePoolScopeParams{
 		Client:         r.Client,
+		Logger:         log,
 		Cluster:        cluster,
 		MachinePool:    machinePool,
 		InfraCluster:   infraCluster,

diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -99,11 +99,15 @@ func (c *Logger) GetLogger() logr.Logger {
 }
 
 func (c *Logger) WithValues(keysAndValues ...any) *Logger {
-	c.logger = c.logger.WithValues(keysAndValues...)
-	return c
+	return &Logger{
+		callStackHelper: c.callStackHelper,
+		logger:          c.logger.WithValues(keysAndValues...),
+	}
 }
 
 func (c *Logger) WithName(name string) *Logger {
-	c.logger = c.logger.WithName(name)
-	return c
+	return &Logger{
+		callStackHelper: c.callStackHelper,
+		logger:          c.logger.WithName(name),
+	}
 }