fix comments

cni/api/api.go

@@ -11,7 +11,7 @@ import (
 
 var (
 	loggerName = "azure-vnet"
-	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log").With(zap.String("component", "cni"))
+	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log")
 )
 
 type PodNetworkInterfaceInfo struct {

cni/ipam/ipam.go

@@ -23,7 +23,7 @@ const ipamV6 = "azure-vnet-ipamv6"
 
 var (
 	loggerName = "azure-vnet-ipam"
-	logger     = log.InitZapLogCNI(loggerName, "azure-ipam.log").With(zap.String("component", "cni"))
+	logger     = log.InitZapLogCNI(loggerName, "azure-ipam.log")
 )
 
 var ipv4DefaultRouteDstPrefix = net.IPNet{
@@ -81,7 +81,7 @@ func (plugin *ipamPlugin) Start(config *common.PluginConfig) error {
 	err = plugin.am.Initialize(config, false, plugin.Options)
 	if err != nil {
 		logger.Error("Failed to initialize address manager",
-			zap.String("error", err.Error()))
+			zap.Error(err))
 		return err
 	}
 
@@ -156,7 +156,7 @@ func (plugin *ipamPlugin) Add(args *cniSkel.CmdArgs) error {
 	defer func() {
 		logger.Info("ADD command completed",
 			zap.Any("result", result),
-			zap.Any("error:", err))
+			zap.Error(err))
 	}()
 
 	// Parse network configuration from stdin.

cni/log/logger.go

@@ -33,5 +33,6 @@ func InitZapLogCNI(loggerName, loggerFile string) *zap.Logger {
 
 	// only log process id on CNI package
 	logger = logger.With(zap.Int("pid", os.Getpid()))
+	logger = logger.With(zap.String("component", "cni"))
 	return logger
 }

cni/log/logger_mock.go

@@ -1,9 +1,5 @@
 package log
 
-import (
-	"go.uber.org/zap"
-)
-
 func InitializeMock() {
-	InitZapLogCNI("azure-vnet", "").With(zap.String("component", "cni"))
+	InitZapLogCNI("azure-vnet", "")
 }

cni/network/invoker_azure.go

@@ -21,7 +21,7 @@ import (
 
 var (
 	loggerName = "azure-vnet"
-	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log").With(zap.String("component", "cni"))
+	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log")
 )
 
 const (

cni/network/plugin/main.go

@@ -39,7 +39,7 @@ const (
 // Version is populated by make during build.
 var version string
 
-var logger = log.InitZapLogCNI(name, "azure-vnet.log").With(zap.String("component", "cni"))
+var logger = log.InitZapLogCNI(name, "azure-vnet.log")
 
 // Command line arguments for CNI plugin.
 var args = common.ArgumentList{

cni/plugin.go

@@ -26,7 +26,7 @@ import (
 
 var (
 	loggerName = "azure-vnet"
-	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log").With(zap.String("component", "cni"))
+	logger     = log.InitZapLogCNI(loggerName, "azure-vnet.log")
 )
 
 var errEmptyContent = errors.New("read content is zero bytes")
@@ -160,9 +160,9 @@ func (plugin *Plugin) Error(err error) *cniTypes.Error {
 		cniErr = &cniTypes.Error{Code: 100, Msg: err.Error()}
 	}
 
-	logger.Error("",
+	logger.Error("error",
 		zap.String("plugin", plugin.Name),
-		zap.String("error", cniErr.Error()))
+		zap.Error(cniErr))
 
 	return cniErr
 }
@@ -175,7 +175,7 @@ func (plugin *Plugin) Errorf(format string, args ...interface{}) *cniTypes.Error
 // RetriableError logs and returns a CNI error with the TryAgainLater error code
 func (plugin *Plugin) RetriableError(err error) *cniTypes.Error {
 	tryAgainErr := cniTypes.NewError(cniTypes.ErrTryAgainLater, err.Error(), "")
-	logger.Error("",
+	logger.Error("retry failed",
 		zap.String("name", plugin.Name),
 		zap.String("error", tryAgainErr.Error()))
 	return tryAgainErr

cni/telemetry/service/telemetrymain.go

@@ -117,7 +117,7 @@ func main() {
 	}
 
 	log.LoggerCfg.Level = logLevel
-	logger := log.InitZapLogCNI(azureVnetTelemetry, azureVnetTelemetry+".log").With(zap.String("component", "cni"))
+	logger := log.InitZapLogCNI(azureVnetTelemetry, azureVnetTelemetry+".log")
 
 	logger.Info("Telemetry invocation info", zap.Any("arguments", os.Args))