change the structure of the zap log

Author: paulyufan2

cni/api/api.go

@@ -6,13 +6,12 @@ import (
 	"os"
 
 	"github.com/Azure/azure-container-networking/cni/log"
-	"github.com/Azure/azure-container-networking/zaplog"
 	"go.uber.org/zap"
 )
 
 var (
 	LoggerVnetName = "azure-vnet"
-	logger         = zaplog.InitLog(log.LoggerVnetCfg).With(zap.String("component", "cni"))
+	logger         = log.InitZapLogCNI(log.LoggerVnetCfg).With(zap.String("component", "cni"))
 )
 
 type PodNetworkInterfaceInfo struct {

cni/ipam/ipam.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/ipam"
 	"github.com/Azure/azure-container-networking/platform"
-	"github.com/Azure/azure-container-networking/zaplog"
 	cniSkel "github.com/containernetworking/cni/pkg/skel"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 	cniTypesCurr "github.com/containernetworking/cni/pkg/types/100"
@@ -24,7 +23,7 @@ const ipamV6 = "azure-vnet-ipamv6"
 
 var (
 	LoggerVnetName = "azure-vnet-ipam"
-	logger         = zaplog.InitLog(log.LoggerIpamCfg).With(zap.String("component", "cni"))
+	logger         = log.InitZapLogCNI(log.LoggerIpamCfg).With(zap.String("component", "cni"))
 )
 
 var ipv4DefaultRouteDstPrefix = net.IPNet{

cni/log/logger.go

@@ -1,8 +1,8 @@
 package log
 
 import (
-	"github.com/Azure/azure-container-networking/log"
 	"github.com/Azure/azure-container-networking/zaplog"
+	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
@@ -20,24 +20,28 @@ var (
 
 var LoggerVnetCfg = &zaplog.Config{
 	Level:       zapcore.DebugLevel,
-	LogPath:     log.LogPath + "azure-vnet.log",
+	LogPath:     LogPath + "azure-vnet.log",
 	MaxSizeInMB: maxLogFileSizeInMb,
 	MaxBackups:  maxLogFileCount,
 	Name:        LoggerVnetName,
 }
 
 var LoggerIpamCfg = &zaplog.Config{
 	Level:       zapcore.DebugLevel,
-	LogPath:     log.LogPath + "azure-ipam.log",
+	LogPath:     LogPath + "azure-ipam.log",
 	MaxSizeInMB: maxLogFileSizeInMb,
 	MaxBackups:  maxLogFileCount,
 	Name:        LoggerIpamName,
 }
 
 var LoggerTelemetryCfg = &zaplog.Config{
 	Level:       zapcore.DebugLevel,
-	LogPath:     log.LogPath + "azure-vnet-telemetry.log",
+	LogPath:     LogPath + "azure-vnet-telemetry.log",
 	MaxSizeInMB: maxLogFileSizeInMb,
 	MaxBackups:  maxLogFileCount,
 	Name:        LoggerTelemetryName,
 }
+
+func InitZapLogCNI(zapLogConfig *zaplog.Config) *zap.Logger {
+	return zaplog.InitZapLog(zapLogConfig)
+}

cni/log/logger_mock.go

@@ -1,10 +1,9 @@
 package log
 
 import (
-	"github.com/Azure/azure-container-networking/zaplog"
 	"go.uber.org/zap"
 )
 
 func InitializeMock() {
-	zaplog.InitLog(LoggerVnetCfg).With(zap.String("component", "cni"))
+	InitZapLogCNI(LoggerVnetCfg).With(zap.String("component", "cni"))
 }

cni/network/invoker_azure.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Azure/azure-container-networking/ipam"
 	"github.com/Azure/azure-container-networking/network"
 	"github.com/Azure/azure-container-networking/platform"
-	"github.com/Azure/azure-container-networking/zaplog"
 	cniSkel "github.com/containernetworking/cni/pkg/skel"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 	cniTypesCurr "github.com/containernetworking/cni/pkg/types/100"
@@ -22,7 +21,7 @@ import (
 
 var (
 	LoggerVnetName = "azure-vnet"
-	logger         = zaplog.InitLog(log.LoggerVnetCfg).With(zap.String("component", "cni"))
+	logger         = log.InitZapLogCNI(log.LoggerVnetCfg).With(zap.String("component", "cni"))
 )
 
 const (

cni/network/plugin/main.go

@@ -21,7 +21,6 @@ import (
 	"github.com/Azure/azure-container-networking/platform"
 	"github.com/Azure/azure-container-networking/store"
 	"github.com/Azure/azure-container-networking/telemetry"
-	"github.com/Azure/azure-container-networking/zaplog"
 	"github.com/containernetworking/cni/pkg/skel"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/pkg/errors"
@@ -42,7 +41,7 @@ var version string
 
 var (
 	LoggerVnetName = name
-	logger         = zaplog.InitLog(log.LoggerVnetCfg).With(zap.String("component", "cni"))
+	logger         = log.InitZapLogCNI(log.LoggerVnetCfg).With(zap.String("component", "cni"))
 )
 
 // Command line arguments for CNI plugin.

cni/plugin.go

@@ -15,7 +15,6 @@ import (
 	"github.com/Azure/azure-container-networking/platform"
 	"github.com/Azure/azure-container-networking/processlock"
 	"github.com/Azure/azure-container-networking/store"
-	"github.com/Azure/azure-container-networking/zaplog"
 	cniInvoke "github.com/containernetworking/cni/pkg/invoke"
 	cniSkel "github.com/containernetworking/cni/pkg/skel"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
@@ -27,7 +26,7 @@ import (
 
 var (
 	LoggerVnetName = "azure-vnet"
-	logger         = zaplog.InitLog(log.LoggerVnetCfg).With(zap.String("component", "cni"))
+	logger         = log.InitZapLogCNI(log.LoggerVnetCfg).With(zap.String("component", "cni"))
 )
 
 var errEmptyContent = errors.New("read content is zero bytes")

cni/telemetry/service/telemetrymain.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Azure/azure-container-networking/cni/log"
 	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/telemetry"
-	"github.com/Azure/azure-container-networking/zaplog"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -119,7 +118,7 @@ func main() {
 
 	log.LoggerTelemetryCfg.Level = logLevel
 	log.LoggerTelemetryCfg.Name = azureVnetTelemetry
-	logger := zaplog.InitLog(log.LoggerVnetCfg).With(zap.String("component", "cni"))
+	logger := log.InitZapLogCNI(log.LoggerTelemetryCfg).With(zap.String("component", "cni"))
 
 	logger.Info("Telemetry invocation info", zap.Any("arguments", os.Args))
 

zaplog/zaplog.go

@@ -8,7 +8,7 @@ import (
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-var ZapDefaultLogger = InitLog(&Config{})
+var ZapDefaultLogger = InitZapLog(&Config{})
 
 type Config struct {
 	Level       zapcore.Level
@@ -18,7 +18,7 @@ type Config struct {
 	Name        string
 }
 
-func InitLog(cfg *Config) *zap.Logger {
+func InitZapLog(cfg *Config) *zap.Logger {
 	logFileWriter := zapcore.AddSync(&lumberjack.Logger{
 		Filename:   cfg.LogPath,
 		MaxSize:    cfg.MaxSizeInMB,