use slog in handler

FerretDB · chilagrow · Jul 22, 2024 · Jul 17, 2024 · Jul 18, 2024 · Jul 18, 2024
commit 16c05af75cd077f2d211952cd9d4f41f3d21e95a
@@ -498,6 +498,7 @@ func run() {
 
 	h, closeBackend, err := registry.NewHandler(cli.Handler, &registry.NewHandlerOpts{
 		Logger:        logger,
+		SLogger:       slogger,
 		ConnMetrics:   metrics.ConnMetrics,
 		StateProvider: stateProvider,
 		TCPHost:       cli.Listen.Addr,

diff --git a/ferretdb/ferretdb.go b/ferretdb/ferretdb.go
@@ -22,6 +22,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/url"
 	"sync"
 
@@ -126,6 +127,7 @@ func New(config *Config) (*FerretDB, error) {
 
 	h, closeBackend, err := registry.NewHandler(config.Handler, &registry.NewHandlerOpts{
 		Logger:        log,
+		SLogger:       slog.Default(), // TODO https://github.com/FerretDB/FerretDB/issues/4013
 		ConnMetrics:   metrics.ConnMetrics,
 		StateProvider: sp,
 		TCPHost:       config.Listener.TCP,

diff --git a/integration/setup/listener.go b/integration/setup/listener.go
@@ -16,6 +16,7 @@ package setup
 
 import (
 	"context"
+	"log/slog"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -179,6 +180,7 @@ func setupListener(tb testtb.TB, ctx context.Context, logger *zap.Logger, opts *
 
 	handlerOpts := &registry.NewHandlerOpts{
 		Logger:        logger,
+		SLogger:       slog.Default(), // TODO https://github.com/FerretDB/FerretDB/issues/4013
 		ConnMetrics:   listenerMetrics.ConnMetrics,
 		StateProvider: sp,
 

diff --git a/internal/handler/cmd_query.go b/internal/handler/cmd_query.go
@@ -19,12 +19,11 @@
 	"fmt"
 	"strings"
 
-	"go.uber.org/zap"
-
 	"github.com/FerretDB/FerretDB/internal/handler/common"
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
+	"github.com/FerretDB/FerretDB/internal/util/logging"
 	"github.com/FerretDB/FerretDB/internal/util/must"
 	"github.com/FerretDB/FerretDB/internal/wire"
 )
@@ -75,7 +74,7 @@
 
 		dbName, err := common.GetRequiredParam[string](authDoc, "db")
 		if err != nil {
-			h.L.Debug("No `db` in `speculativeAuthenticate`", zap.Error(err))
+			h.L.DebugContext(connCtx, "No `db` in `speculativeAuthenticate`", logging.Error(err))
 
 			opReply.SetDocument(reply)
 
@@ -84,7 +83,7 @@
 
 		speculativeAuthenticate, err := h.saslStart(connCtx, dbName, authDoc)
 		if err != nil {
-			h.L.Debug("Speculative authentication failed", zap.Error(err))
+			h.L.DebugContext(connCtx, "Speculative authentication failed", logging.Error(err))
 
 			// unsuccessful speculative authentication leave `speculativeAuthenticate` field unset
 			// and let `saslStart` return an error
@@ -93,7 +92,7 @@
 			return &opReply, nil
 		}
 
-		h.L.Debug("Speculative authentication passed")
+		h.L.DebugContext(connCtx, "Speculative authentication passed")
 
 		reply.Set("speculativeAuthenticate", speculativeAuthenticate)
 

diff --git a/internal/handler/commands.go b/internal/handler/commands.go
@@ -16,8 +16,7 @@
 
 import (
 	"context"
-
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/clientconn/conninfo"
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
@@ -295,23 +294,25 @@
 }
 
 // checkSCRAMConversation returns error if SCRAM conversation is not valid.
-func checkSCRAMConversation(ctx context.Context, l *zap.Logger) error {
+func checkSCRAMConversation(ctx context.Context, l *slog.Logger) error {
 	_, _, conv, _ := conninfo.Get(ctx).Auth()
 
 	switch {
 	case conv == nil:
-		l.Warn("checkSCRAMConversation: no conversation")
+		l.WarnContext(ctx, "checkSCRAMConversation: no conversation")
 
 	case !conv.Valid():
-		l.Warn(
+		l.WarnContext(
+			ctx,
 			"checkSCRAMConversation: invalid conversation",
-			zap.String("username", conv.Username()), zap.Bool("valid", conv.Valid()), zap.Bool("done", conv.Done()),
+			slog.String("username", conv.Username()), slog.Bool("valid", conv.Valid()), slog.Bool("done", conv.Done()),
 		)
 
 	default:
-		l.Debug(
+		l.DebugContext(
+			ctx,
 			"checkSCRAMConversation: passed",
-			zap.String("username", conv.Username()), zap.Bool("valid", conv.Valid()), zap.Bool("done", conv.Done()),
+			slog.String("username", conv.Username()), slog.Bool("valid", conv.Valid()), slog.Bool("done", conv.Done()),
 		)
 
 		return nil

diff --git a/internal/handler/common/count.go b/internal/handler/common/count.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
 	"github.com/FerretDB/FerretDB/internal/types"
@@ -44,7 +44,7 @@ type CountParams struct {
 }
 
 // GetCountParams returns the parameters for the count command.
-func GetCountParams(document *types.Document, l *zap.Logger) (*CountParams, error) {
+func GetCountParams(document *types.Document, l *slog.Logger) (*CountParams, error) {
 	var count CountParams
 
 	err := handlerparams.ExtractParams(document, "count", &count, l)

diff --git a/internal/handler/common/delete_params.go b/internal/handler/common/delete_params.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
 	"github.com/FerretDB/FerretDB/internal/types"
@@ -55,7 +55,7 @@ type Delete struct {
 }
 
 // GetDeleteParams returns parameters for delete operation.
-func GetDeleteParams(document *types.Document, l *zap.Logger) (*DeleteParams, error) {
+func GetDeleteParams(document *types.Document, l *slog.Logger) (*DeleteParams, error) {
 	params := DeleteParams{
 		Ordered: true,
 	}

diff --git a/internal/handler/common/distinct.go b/internal/handler/common/distinct.go
@@ -17,8 +17,7 @@ package common
 import (
 	"errors"
 	"fmt"
-
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/commonpath"
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
@@ -49,7 +48,7 @@ type DistinctParams struct {
 }
 
 // GetDistinctParams returns `distinct` command parameters.
-func GetDistinctParams(document *types.Document, l *zap.Logger) (*DistinctParams, error) {
+func GetDistinctParams(document *types.Document, l *slog.Logger) (*DistinctParams, error) {
 	var dp DistinctParams
 
 	err := handlerparams.ExtractParams(document, "distinct", &dp, l)

diff --git a/internal/handler/common/explain.go b/internal/handler/common/explain.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
@@ -45,7 +45,7 @@ type ExplainParams struct {
 }
 
 // GetExplainParams returns the parameters for the explain command.
-func GetExplainParams(document *types.Document, l *zap.Logger) (*ExplainParams, error) {
+func GetExplainParams(document *types.Document, l *slog.Logger) (*ExplainParams, error) {
 	var err error
 
 	var db, collection string

diff --git a/internal/handler/common/find.go b/internal/handler/common/find.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
@@ -65,7 +65,7 @@ type FindParams struct {
 }
 
 // GetFindParams returns `find` command parameters.
-func GetFindParams(doc *types.Document, l *zap.Logger) (*FindParams, error) {
+func GetFindParams(doc *types.Document, l *slog.Logger) (*FindParams, error) {
 	params := FindParams{
 		BatchSize: 101,
 	}

diff --git a/internal/handler/common/findandmodify.go b/internal/handler/common/findandmodify.go
@@ -16,8 +16,7 @@ package common
 
 import (
 	"fmt"
-
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
@@ -59,7 +58,7 @@ type FindAndModifyParams struct {
 }
 
 // GetFindAndModifyParams returns `findAndModifyParams` command parameters.
-func GetFindAndModifyParams(doc *types.Document, l *zap.Logger) (*FindAndModifyParams, error) {
+func GetFindAndModifyParams(doc *types.Document, l *slog.Logger) (*FindAndModifyParams, error) {
 	var params FindAndModifyParams
 
 	err := handlerparams.ExtractParams(doc, "findAndModify", &params, l)

diff --git a/internal/handler/common/insert.go b/internal/handler/common/insert.go
@@ -16,8 +16,7 @@ package common
 
 import (
 	"fmt"
-
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
@@ -45,7 +44,7 @@ type InsertParams struct {
 }
 
 // GetInsertParams returns the parameters for an insert command.
-func GetInsertParams(document *types.Document, l *zap.Logger) (*InsertParams, error) {
+func GetInsertParams(document *types.Document, l *slog.Logger) (*InsertParams, error) {
 	params := InsertParams{
 		Ordered: true,
 	}

diff --git a/internal/handler/common/unimplemented.go b/internal/handler/common/unimplemented.go
@@ -16,8 +16,7 @@ package common
 
 import (
 	"fmt"
-
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/types"
@@ -60,12 +59,12 @@ func UnimplementedNonDefault(doc *types.Document, field string, isDefault func(v
 }
 
 // Ignored logs a message if doc has any of the given fields.
-func Ignored(doc *types.Document, l *zap.Logger, fields ...string) {
+func Ignored(doc *types.Document, l *slog.Logger, fields ...string) {
 	for _, field := range fields {
 		if v, err := doc.Get(field); err == nil {
 			l.Debug(
 				"ignoring field",
-				zap.String("command", doc.Command()), zap.String("field", field), zap.Any("value", v),
+				slog.String("command", doc.Command()), slog.String("field", field), slog.Any("value", v),
 			)
 		}
 	}

diff --git a/internal/handler/common/update_params.go b/internal/handler/common/update_params.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"go.uber.org/zap"
+	"log/slog"
 
 	"github.com/FerretDB/FerretDB/internal/handler/handlererrors"
 	"github.com/FerretDB/FerretDB/internal/handler/handlerparams"
@@ -84,7 +84,7 @@ type UpdateResult struct {
 }
 
 // GetUpdateParams returns parameters for update command.
-func GetUpdateParams(document *types.Document, l *zap.Logger) (*UpdateParams, error) {
+func GetUpdateParams(document *types.Document, l *slog.Logger) (*UpdateParams, error) {
 	var params UpdateParams
 
 	err := handlerparams.ExtractParams(document, "update", &params, l)