use original zap flag

Author: Frapschen

cmd/bbr/main.go

@@ -64,8 +64,9 @@ func run() error {
 	opts := zap.Options{Development: true}
 	opts.BindFlags(flag.CommandLine)
 	flag.Parse()
+
 	// --- set up logger
-	ctrl.SetLogger(logging.InitLogging(*logVerbosity, true))
+	ctrl.SetLogger(logging.InitLogging(&opts))
 
 	// Print all flag values
 	flags := make(map[string]any)

cmd/epp/runner/runner.go

@@ -30,8 +30,6 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/prometheus/client_golang/prometheus"
-	uberzap "go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
 	healthPb "google.golang.org/grpc/health/grpc_health_v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -81,7 +79,6 @@ var (
 	poolName       = flag.String("pool-name", runserver.DefaultPoolName, "Name of the InferencePool this Endpoint Picker is associated with.")
 	poolGroup      = flag.String("pool-group", runserver.DefaultPoolGroup, "group of the InferencePool this Endpoint Picker is associated with.")
 	poolNamespace  = flag.String("pool-namespace", "", "Namespace of the InferencePool this Endpoint Picker is associated with.")
-	logVerbosity   = flag.Int("log-verbosity", logging.DEFAULT, "number for the log level verbosity, higher verbosity means more (and less important) logs will be generated")
 	secureServing  = flag.Bool("secure-serving", runserver.DefaultSecureServing, "Enables secure serving. Defaults to true.")
 	healthChecking = flag.Bool("health-checking", runserver.DefaultHealthChecking, "Enables health checking")
 	certPath       = flag.String("cert-path", runserver.DefaultCertPath, "The path to the certificate for secure serving. The certificate and private key files "+
@@ -134,13 +131,11 @@ func (r *Runner) WithSchedulerConfig(schedulerConfig *scheduling.SchedulerConfig
 }
 
 func (r *Runner) Run(ctx context.Context) error {
-	opts := zap.Options{
-		Development: true,
-	}
+	opts := zap.Options{Development: true}
 	opts.BindFlags(flag.CommandLine)
 	flag.Parse()
-	initLogging(&opts)
 
+	ctrl.SetLogger(logging.InitLogging(&opts))
 	setupLog.Info("GIE build", "commit-sha", version.CommitSHA, "build-ref", version.BuildRef)
 
 	// Validate flags
@@ -430,24 +425,6 @@ func setupDatalayer() (datalayer.EndpointFactory, error) {
 	return factory, nil
 }
 
-func initLogging(opts *zap.Options) {
-	// Unless -zap-log-level is explicitly set, use -v
-	useV := true
-	flag.Visit(func(f *flag.Flag) {
-		if f.Name == "zap-log-level" {
-			useV = false
-		}
-	})
-	if useV {
-		// See https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/log/zap#Options.Level
-		lvl := -1 * (*logVerbosity)
-		opts.Level = uberzap.NewAtomicLevelAt(zapcore.Level(int8(lvl)))
-	}
-
-	logger := zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
-	ctrl.SetLogger(logger)
-}
-
 // registerExtProcServer adds the ExtProcServerRunner as a Runnable to the manager.
 func registerExtProcServer(mgr manager.Manager, runner *runserver.ExtProcServerRunner, logger logr.Logger) error {
 	if err := mgr.Add(runner.AsRunnable(logger)); err != nil {

config/charts/body-based-routing/templates/bbr.yaml

@@ -19,8 +19,8 @@ spec:
         imagePullPolicy: {{ .Values.bbr.image.pullPolicy | default "Always" }}
         args:
         - "--streaming"
-        - "--log-level"
-        - "error"
+        - "--zap-log-level"
+        - "info"
         ports:
         - containerPort: {{ .Values.bbr.port }}
         # health check

config/charts/inferencepool/templates/epp-deployment.yaml

@@ -43,8 +43,8 @@ spec:
         {{- end }}
         - --zap-encoder
         - "json"
-        - "--log-level"
-        - "error"
+        - --zap-log-level
+        - "info"
         - --config-file
         - "/config/{{ .Values.inferenceExtension.pluginsConfigFile }}"
         {{- if eq (.Values.inferencePool.modelServerType | default "vllm") "triton-tensorrt-llm" }}

internal/telemetry/logging/logger.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/go-logr/logr"
 	uberzap "go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
@@ -52,13 +51,6 @@ func Fatal(logger logr.Logger, err error, msg string, keysAndValues ...any) {
 	os.Exit(1)
 }
 
-func InitLogging(logVerbosity int, development bool) logr.Logger {
-	// See https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/log/zap#Options.Level
-	opts := &zap.Options{
-		Development: development,
-		Level:       uberzap.NewAtomicLevelAt(zapcore.Level(int8(-1 * logVerbosity))),
-	}
-	logger := zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
-
-	return logger
+func InitLogging(opts *zap.Options) logr.Logger {
+	return zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
 }