Feat: Added ETW logging support for CNS.

cns/logger/cnslogger.go

@@ -8,6 +8,8 @@ import (
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/log"
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 type CNSLogger struct {
@@ -17,6 +19,8 @@ type CNSLogger struct {
 	DisableMetricLogging bool
 	DisableEventLogging  bool
 
+	zapLogger *zap.Logger
+
 	m            sync.RWMutex
 	Orchestrator string
 	NodeID       string
@@ -28,7 +32,19 @@ func NewCNSLogger(fileName string, logLevel, logTarget int, logDir string) (*CNS
 		return nil, errors.Wrap(err, "could not get new logger")
 	}
 
-	return &CNSLogger{logger: l}, nil
+	encoderConfig := zap.NewProductionEncoderConfig()
+	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	jsonEncoder := zapcore.NewJSONEncoder(encoderConfig)
+
+	zapLogger, err := initZapLogger(zapcore.DebugLevel, jsonEncoder)
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get ETW logger")
+	}
+
+	return &CNSLogger{
+		logger:    l,
+		zapLogger: zapLogger,
+	}, nil
 }
 
 func (c *CNSLogger) InitAI(aiConfig aitelemetry.AIConfig, disableTraceLogging, disableMetricLogging, disableEventLogging bool) {
@@ -69,6 +85,7 @@ func (c *CNSLogger) SetContextDetails(orchestrator, nodeID string) {
 
 func (c *CNSLogger) Printf(format string, args ...any) {
 	c.logger.Logf(format, args...)
+	c.zapLogger.Info(fmt.Sprintf(format, args...))
 
 	if c.th == nil || c.DisableTraceLogging {
 		return
@@ -80,6 +97,7 @@ func (c *CNSLogger) Printf(format string, args ...any) {
 
 func (c *CNSLogger) Debugf(format string, args ...any) {
 	c.logger.Debugf(format, args...)
+	c.zapLogger.Debug(fmt.Sprintf(format, args...))
 
 	if c.th == nil || c.DisableTraceLogging {
 		return
@@ -91,6 +109,7 @@ func (c *CNSLogger) Debugf(format string, args ...any) {
 
 func (c *CNSLogger) Warnf(format string, args ...any) {
 	c.logger.Warnf(format, args...)
+	c.zapLogger.Warn(fmt.Sprintf(format, args...))
 
 	if c.th == nil || c.DisableTraceLogging {
 		return
@@ -102,6 +121,7 @@ func (c *CNSLogger) Warnf(format string, args ...any) {
 
 func (c *CNSLogger) Errorf(format string, args ...any) {
 	c.logger.Errorf(format, args...)
+	c.zapLogger.Error(fmt.Sprintf(format, args...))
 
 	if c.th == nil || c.DisableTraceLogging {
 		return

cns/logger/cnslogger_linux.go

@@ -0,0 +1,14 @@
+package logger
+
+import (
+	"go.uber.org/zap/zapcore"
+)
+
+const (
+	// LogPath is the path where log files are stored.
+	LogPath = "/var/log/"
+)
+
+func GetPlatformCores(zapcore.Level, zapcore.Encoder) (zapcore.Core, error) {
+	return zapcore.NewNopCore(), nil
+}

cns/logger/cnslogger_windows.go

@@ -0,0 +1,29 @@
+package logger
+
+import (
+	"github.com/Azure/azure-container-networking/zapetw"
+	"github.com/pkg/errors"
+	"go.uber.org/zap/zapcore"
+)
+
+const (
+	// LogPath is the path where log files are stored.
+	LogPath         = ""
+	etwCNSEventName = "AzureCNS"
+)
+
+func GetPlatformCores(loggingLevel zapcore.Level, encoder zapcore.Encoder) (zapcore.Core, error) {
+	etwcore, err := getETWCore(loggingLevel, encoder)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get ETW core")
+	}
+	return etwcore, nil
+}
+
+func getETWCore(loggingLevel zapcore.Level, encoder zapcore.Encoder) (zapcore.Core, error) {
+	etwcore, err := zapetw.NewETWCore(etwCNSEventName, encoder, loggingLevel)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create ETW core")
+	}
+	return etwcore, nil
+}

cns/logger/zaplogger.go

@@ -0,0 +1,18 @@
+package logger
+
+import (
+	"os"
+
+	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+func initZapLogger(loggingLevel zapcore.Level, encoder zapcore.Encoder) (*zap.Logger, error) {
+	platformCore, err := GetPlatformCores(loggingLevel, encoder)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get Platform cores")
+	}
+	// Create a new logger with the platform core.
+	return zap.New(platformCore, zap.AddCaller()).With(zap.Int("pid", os.Getpid())), nil
+}

cns/service/main.go

@@ -577,7 +577,6 @@ func main() {
 			logger.InitAI(aiConfig, ts.DisableTrace, ts.DisableMetric, ts.DisableEvent)
 		}
 	}
-
 	logger.Printf("[Azure CNS] Using config: %+v", cnsconfig)
 
 	_, envEnableConflistGeneration := os.LookupEnv(envVarEnableCNIConflistGeneration)