diff --git a/disk-mapper/cmd/main.go b/disk-mapper/cmd/main.go index 415b1c56c..534ae9267 100644 --- a/disk-mapper/cmd/main.go +++ b/disk-mapper/cmd/main.go @@ -35,7 +35,6 @@ import ( "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/internal/role" "github.com/spf13/afero" - "go.uber.org/zap" ) const ( diff --git a/disk-mapper/internal/recoveryserver/recoveryserver.go b/disk-mapper/internal/recoveryserver/recoveryserver.go index d4db3b787..f2267ebbb 100644 --- a/disk-mapper/internal/recoveryserver/recoveryserver.go +++ b/disk-mapper/internal/recoveryserver/recoveryserver.go @@ -27,7 +27,6 @@ import ( "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" "github.com/edgelesssys/constellation/v2/internal/kms/kms" "github.com/edgelesssys/constellation/v2/internal/logger" - "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -105,7 +104,7 @@ func (s *RecoveryServer) Serve(ctx context.Context, listener net.Listener, diskU func (s *RecoveryServer) Recover(ctx context.Context, req *recoverproto.RecoverMessage) (*recoverproto.RecoverResponse, error) { s.mux.Lock() defer s.mux.Unlock() - log := s.log.With(zap.String("peer", grpclog.PeerAddrFromContext(ctx))) + log := s.log.With(slog.String("peer", grpclog.PeerAddrFromContext(ctx))) log.Infof("Received recover call") diff --git a/internal/logger/cmdline.go b/internal/logger/cmdline.go index 82a6d2ee0..85dfb41ab 100644 --- a/internal/logger/cmdline.go +++ b/internal/logger/cmdline.go @@ -11,9 +11,9 @@ import ( ) // CmdLineVerbosityDescription explains numeric log levels. -const CmdLineVerbosityDescription = "log verbosity in zap logging levels. Use -1 for debug information, 0 for info, 1 for warn, 2 for error" +const CmdLineVerbosityDescription = "log verbosity in slog logging levels. Use -1 for debug information, 0 for info, 1 for warn, 2 for error" -// VerbosityFromInt converts a verbosity level from an integer to a zapcore.Level. +// VerbosityFromInt converts a verbosity level from an integer to a slog.Level. func VerbosityFromInt(verbosity int) slog.Level { switch { case verbosity <= -1: