[shell-operator] Bump deckhouse logger (#774)

Signed-off-by: Pavel Okhlopkov <[email protected]>

Author: ldmonster

cmd/shell-operator/main.go

@@ -16,7 +16,7 @@ import (
 func main() {
 	kpApp := kingpin.New(app.AppName, fmt.Sprintf("%s %s: %s", app.AppName, app.Version, app.AppDescription))
 
-	logger := log.NewLogger(log.Options{})
+	logger := log.NewLogger()
 	log.SetDefault(logger)
 
 	// override usage template to reveal additional commands with information about start command

go.mod

@@ -3,8 +3,8 @@ module github.com/flant/shell-operator
 go 1.23.8
 
 require (
-	github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250424095005-9ab587d01d7a
-	github.com/flant/kube-client v1.3.0
+	github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250704135428-7600b0581807
+	github.com/flant/kube-client v1.3.1
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-openapi/spec v0.19.8
 	github.com/go-openapi/strfmt v0.19.5

go.sum

@@ -34,8 +34,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250424095005-9ab587d01d7a h1:c4CKIIsfpCn9wzMziOPfrqptAuHLCtTPM/heobSxPfk=
-github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250424095005-9ab587d01d7a/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw=
+github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250704135428-7600b0581807 h1:0kf//0CzwRhJZBTz3yzeZtHIQumWqsCU0DR+HM5r+PA=
+github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250704135428-7600b0581807/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw=
 github.com/deckhouse/module-sdk v0.2.2 h1:IzfWxmHiA0+F+R82qPr/JGef2kWBaXBu4tO0uo0Qzxw=
 github.com/deckhouse/module-sdk v0.2.2/go.mod h1:Ps92/zmKfkRMJF79/uxCba94ldvqtsV00sUCbTFj4zw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -51,8 +51,8 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
 github.com/flant/go-openapi-validate v0.19.12-flant.0 h1:xk6kvc9fHKMgUdB6J7kbpbLR5vJOUzKAK8p3nrD7mDk=
 github.com/flant/go-openapi-validate v0.19.12-flant.0/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4=
-github.com/flant/kube-client v1.3.0 h1:iVxwpUZO4AhURkq6n44qfzp0Bjs5WatzTtJrfxeRDkE=
-github.com/flant/kube-client v1.3.0/go.mod h1:yaFoNwyomNm0/OLXRxGYvR7or2pfLv9M9qPDSPPwljI=
+github.com/flant/kube-client v1.3.1 h1:1SdD799sujXNg2F6Z27le/+qkcKQaKf9Z492YGEhVhc=
+github.com/flant/kube-client v1.3.1/go.mod h1:mql6hsZMgBLAhdj3Emb8TrP5MVdXduFQ2NLjzn6IF0Y=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
 github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=

pkg/executor/executor.go

@@ -92,7 +92,7 @@ func NewExecutor(dir string, entrypoint string, args []string, envs []string) *E
 	ex := &Executor{
 		cmd:          cmd,
 		proxyJsonKey: "proxyJsonLog",
-		logger:       log.NewLogger(log.Options{}).Named("auto-executor"),
+		logger:       log.NewLogger().Named("auto-executor"),
 	}
 
 	return ex

pkg/executor/executor_test.go

@@ -16,17 +16,15 @@ import (
 )
 
 func TestRunAndLogLines(t *testing.T) {
-	loggerOpts := log.Options{
-		TimeFunc: func(_ time.Time) time.Time {
-			parsedTime, err := time.Parse(time.DateTime, "2006-01-02 15:04:05")
-			if err != nil {
-				assert.NoError(t, err)
-			}
-
-			return parsedTime
-		},
+	timeFunc := func(_ time.Time) time.Time {
+		parsedTime, err := time.Parse(time.DateTime, "2006-01-02 15:04:05")
+		if err != nil {
+			assert.NoError(t, err)
+		}
+
+		return parsedTime
 	}
-	logger := log.NewLogger(loggerOpts)
+	logger := log.NewLogger(log.WithTimeFunc(timeFunc))
 	logger.SetLevel(log.LevelInfo)
 
 	var buf bytes.Buffer

pkg/metric_storage/vault/vault_test.go

@@ -14,7 +14,7 @@ import (
 func Test_CounterAdd(t *testing.T) {
 	g := NewWithT(t)
 
-	logger := log.NewLogger(log.Options{})
+	logger := log.NewLogger()
 	log.SetDefault(logger)
 
 	buf := &bytes.Buffer{}

pkg/shell-operator/operator.go

@@ -86,7 +86,7 @@ func NewShellOperator(ctx context.Context, opts ...Option) *ShellOperator {
 	}
 
 	if so.logger == nil {
-		so.logger = log.NewLogger(log.Options{}).Named("shell-operator")
+		so.logger = log.NewLogger().Named("shell-operator")
 	}
 
 	return so

pkg/utils/file/file_test.go

@@ -123,17 +123,17 @@ func TestRecursiveCheckLibDirectory(t *testing.T) {
 	for _, tt := range tests {
 		var buf bytes.Buffer
 
-		logger := log.NewLogger(log.Options{
-			Output: &buf,
-			TimeFunc: func(_ time.Time) time.Time {
+		logger := log.NewLogger(
+			log.WithOutput(&buf),
+			log.WithTimeFunc(func(_ time.Time) time.Time {
 				parsedTime, err := time.Parse(time.DateTime, "2006-01-02 15:04:05")
 				if err != nil {
 					assert.NoError(t, err)
 				}
 
 				return parsedTime
-			},
-		})
+			}),
+		)
 
 		log.SetDefault(logger)
 

pkg/utils/structured-logger/structured_logger.go

@@ -27,7 +27,7 @@ type StructuredLogger struct {
 }
 
 func (l *StructuredLogger) NewLogEntry(r *http.Request) middleware.LogEntry {
-	entry := &StructuredLoggerEntry{Logger: log.NewLogger(log.Options{})}
+	entry := &StructuredLoggerEntry{Logger: log.NewLogger()}
 
 	entry.Logger = entry.Logger.With(
 		// TODO: make snake_case

pkg/webhook/admission/handler.go

@@ -37,7 +37,7 @@ func NewWebhookHandler() *WebhookHandler {
 	})
 
 	rtr.Group(func(r chi.Router) {
-		r.Use(structuredLogger.NewStructuredLogger(log.NewLogger(log.Options{}).Named("admissionWebhook"), "admissionWebhook"))
+		r.Use(structuredLogger.NewStructuredLogger(log.NewLogger().Named("admissionWebhook"), "admissionWebhook"))
 		r.Use(middleware.Recoverer)
 		r.Use(middleware.AllowContentType("application/json"))
 		r.Post("/*", h.serveReviewRequest)