Merge pull request #19404 from k8s-infra-cherrypick-robot/cherry-pick-19403-to-release-3.6

ahrtr · web-flow · commit 34afaca6f7cc · 2025-02-13T07:46:43.000Z
[release-3.6] server: Remove deprecated NewZapCoreLoggerBuilder
diff --git a/server/embed/config_logging.go b/server/embed/config_logging.go
@@ -216,12 +216,6 @@ func NewZapLoggerBuilder(lg *zap.Logger) func(*Config) error {
 	}
 }
 
-// NewZapCoreLoggerBuilder - is a deprecated setter for the logger.
-// Deprecated: Use simpler NewZapLoggerBuilder. To be removed in etcd-3.6.
-func NewZapCoreLoggerBuilder(lg *zap.Logger, _ zapcore.Core, _ zapcore.WriteSyncer) func(*Config) error {
-	return NewZapLoggerBuilder(lg)
-}
-
 // SetupGlobalLoggers configures 'global' loggers (grpc, zapGlobal) based on the cfg.
 //
 // The method is not executed by embed server by default (since 3.5) to

Original file line number	Diff line number	Diff line change
`@@ -216,12 +216,6 @@ func NewZapLoggerBuilder(lg zap.Logger) func(Config) error {`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`-// NewZapCoreLoggerBuilder - is a deprecated setter for the logger.`
`220`		`-// Deprecated: Use simpler NewZapLoggerBuilder. To be removed in etcd-3.6.`
`221`		`-func NewZapCoreLoggerBuilder(lg zap.Logger, _ zapcore.Core, _ zapcore.WriteSyncer) func(Config) error {`
`222`		`- return NewZapLoggerBuilder(lg)`
`223`		`-}`
`224`		`-`
`225`	`219`	`// SetupGlobalLoggers configures 'global' loggers (grpc, zapGlobal) based on the cfg.`
`226`	`220`	`//`
`227`	`221`	`// The method is not executed by embed server by default (since 3.5) to`