fix: fix testcases

Signed-off-by: STRRL <[email protected]>

Author: STRRL

pkg/log/zap/kube_aware_logger_sink.go renamed to pkg/log/zap/kube_aware_logr_logger_sink.go

@@ -33,10 +33,10 @@ type KubeAwareLogSink struct {
 	kubeAwareEnabled *atomic.Bool
 }
 
-// NewKubeAwareLogger return the wrapper with existed logr.Logger.
+// NewKubeAwareLogrLogger return the wrapper with existed logr.Logger.
 // logger is the backend logger.
 // kubeAwareEnabled is the flag to enable kube aware logging.
-func NewKubeAwareLogger(logger logr.Logger, kubeAwareEnabled bool) logr.Logger {
+func NewKubeAwareLogrLogger(logger logr.Logger, kubeAwareEnabled bool) logr.Logger {
 	return logr.New(NewKubeAwareLogSink(logger.GetSink(), kubeAwareEnabled))
 }
 
@@ -114,9 +114,9 @@ func (k *KubeAwareLogSink) wrapKeyAndValues(keysAndValues []interface{}) []inter
 
 		switch val := item.(type) {
 		case runtime.Object:
-			result[i] = &kubeObjectWrapper{obj: val}
+			result[i] = &logrLoggerKubeObjectWrapper{obj: val}
 		case types.NamespacedName:
-			result[i] = &namespacedNameWrapper{NamespacedName: val}
+			result[i] = &logrLoggerNamespacedNameWrapper{NamespacedName: val}
 		default:
 			result[i] = item
 		}

pkg/log/zap/kube_object_wrapper.go renamed to pkg/log/zap/logr_logger_kube_object_wrapper.go

@@ -34,8 +34,8 @@ func (w *logrLoggerKubeObjectWrapper) MarshalLog() interface{} {
 	result := make(map[string]string)
 
 	if reflect.ValueOf(w.obj).IsNil() {
-		// best effort ,noop
-		return nil
+		// keep same behavior with kubeObjectWrapper.MarshalLogObject
+		return "got nil for runtime.Object"
 	}
 
 	if gvk := w.obj.GetObjectKind().GroupVersionKind(); gvk.Version != "" {

pkg/log/zap/namespaced_name_wrapper.go renamed to pkg/log/zap/logr_logger_namespaced_name_wrapper.go

@@ -41,7 +41,7 @@ type NewEncoderFunc func(...EncoderConfigOption) zapcore.Encoder
 // information and Namespace/Name to the log.
 func New(opts ...Opts) logr.Logger {
 	zaprLogger := zapr.NewLogger(NewRaw(opts...))
-	return NewKubeAwareLogger(zaprLogger, true)
+	return NewKubeAwareLogrLogger(zaprLogger, true)
 }
 
 // Opts allows to manipulate Options.