improve the logging

Author: behzad-mir

cns/cni-telemetry-sidecar/main.go

@@ -3,49 +3,129 @@ package main
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"github.com/Azure/azure-container-networking/cns/logger"
+	"github.com/Azure/azure-container-networking/telemetry"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 var (
 	version    = "unknown"
-	configPath = flag.String("config", "/etc/cns/cns-config.json", "Path to CNS configuration file")
+	aiMetadata = "unknown"
 )
 
 func main() {
+	var (
+		configPath  = flag.String("config", "/etc/azure-cns/cns_config.json", "Path to CNS configuration file")
+		logLevel    = flag.String("log-level", "info", "Log level (debug, info, warn, error)")
+		showVersion = flag.Bool("version", false, "Show version information")
+	)
 	flag.Parse()
 
-	// Initialize logging for the CNI telemetry sidecar
-	logger.InitLogger("azure-cns-cni-telemetry-sidecar", 1, 1, "/var/log/azure-cns-telemetry")
-	defer logger.Close()
+	// Show version and exit if requested
+	if *showVersion {
+		fmt.Printf("Azure CNI Telemetry Sidecar version: %s\n", version)
+		fmt.Printf("AI Metadata: %s\n", aiMetadata)
+		return
+	}
+
+	// Create a zap logger early for structured logging
+	zapLogger := createZapLogger(*logLevel)
+	defer zapLogger.Sync()
+
+	// Use structured logging with zap instead of log.Printf
+	zapLogger.Info("Starting Azure CNI Telemetry Sidecar",
+		zap.String("version", version),
+		zap.String("configPath", *configPath),
+		zap.String("logLevel", *logLevel))
 
-	logger.Printf("Starting Azure CNI Telemetry Sidecar v%s", version)
+	// Initialize telemetry buffer with zap logger
+	tb := telemetry.NewTelemetryBuffer(zapLogger)
+	if tb == nil {
+		zapLogger.Error("Failed to create telemetry buffer")
+		os.Exit(1)
+	}
+	defer tb.Close()
 
-	// Create telemetry sidecar service
-	sidecar := NewTelemetrySidecar(*configPath)
+	zapLogger.Info("Telemetry buffer initialized successfully")
 
-	// Setup graceful shutdown context
+	// Set up signal handling for graceful shutdown
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	// Handle OS signals for graceful shutdown
-	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
-		sig := <-sigCh
-		logger.Printf("Received shutdown signal %v, initiating graceful shutdown", sig)
+		sig := <-sigChan
+		zapLogger.Info("Received shutdown signal", zap.String("signal", sig.String()))
 		cancel()
 	}()
 
-	// Run the telemetry sidecar
-	if err := sidecar.Run(ctx); err != nil {
-		logger.Errorf("Azure CNI Telemetry Sidecar failed: %v", err)
+	// Implement the main telemetry service
+	if err := runTelemetryService(ctx, zapLogger, *configPath); err != nil {
+		zapLogger.Error("Telemetry service failed", zap.Error(err))
 		os.Exit(1)
 	}
 
-	logger.Printf("Azure CNI Telemetry Sidecar stopped gracefully")
+	zapLogger.Info("Azure CNI Telemetry Sidecar stopped")
+}
+
+// createZapLogger creates a zap logger with the specified log level
+func createZapLogger(logLevel string) *zap.Logger {
+	var level zapcore.Level
+	switch logLevel {
+	case "debug":
+		level = zapcore.DebugLevel
+	case "info":
+		level = zapcore.InfoLevel
+	case "warn":
+		level = zapcore.WarnLevel
+	case "error":
+		level = zapcore.ErrorLevel
+	default:
+		level = zapcore.InfoLevel
+	}
+
+	config := zap.Config{
+		Level:       zap.NewAtomicLevelAt(level),
+		Development: false,
+		Sampling: &zap.SamplingConfig{
+			Initial:    100,
+			Thereafter: 100,
+		},
+		Encoding:         "json",
+		EncoderConfig:    zap.NewProductionEncoderConfig(),
+		OutputPaths:      []string{"stdout"},
+		ErrorOutputPaths: []string{"stderr"},
+	}
+
+	logger, err := config.Build()
+	if err != nil {
+		// Fallback to a basic logger if configuration fails
+		return zap.NewNop()
+	}
+
+	return logger
+}
+
+// runTelemetryService implements the main telemetry collection logic
+func runTelemetryService(ctx context.Context, logger *zap.Logger, configPath string) error {
+	logger.Info("CNI Telemetry Sidecar is running")
+
+	// TODO: Implement your telemetry collection logic here
+	// Example implementation structure:
+	// 1. Read configuration from configPath
+	// 2. Set up telemetry collectors for CNI metrics
+	// 3. Start HTTP server for health checks and metrics endpoints
+	// 4. Process and forward telemetry data
+
+	// For now, just wait for shutdown
+	<-ctx.Done()
+	logger.Info("Telemetry service shutting down")
+	return nil
 }