Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-03 20:44:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: convert zap to slog (#2825)

Browse source
This commit is contained in:
miampf 2024-02-08 14:20:01 +00:00 • committed by GitHub
parent 3765cb0762
commit 54cce77bab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
182 changed files with 1474 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

1
upgrade-agent/cmd/BUILD.bazel
View file

@ -12,7 +12,6 @@ go_library(
"//internal/logger",
"//upgrade-agent/internal/server",
"@com_github_spf13_afero//:afero",
"@org_uber_go_zap//:zap",
],
)

16
upgrade-agent/cmd/main.go
View file

@ -8,13 +8,14 @@ package main
import (
"flag"
"log/slog"
"os"
"github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/file"
"github.com/edgelesssys/constellation/v2/internal/logger"
"github.com/edgelesssys/constellation/v2/upgrade-agent/internal/server"
"github.com/spf13/afero"
"go.uber.org/zap"
)
const (
@ -26,23 +27,24 @@ func main() {
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
flag.Parse()
log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)).Named("bootstrapper")
defer log.Sync()
log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
if *gRPCDebug {
log.Named("gRPC").ReplaceGRPCLogger()
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
} else {
log.Named("gRPC").WithIncreasedLevel(zap.WarnLevel).ReplaceGRPCLogger()
logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(slog.LevelWarn, log.Handler())).WithGroup("gRPC"))
}
handler := file.NewHandler(afero.NewOsFs())
server, err := server.New(log, handler)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create update server")
log.With(slog.Any("error", err)).Error("Failed to create update server")
os.Exit(1)
}
err = server.Run(protocol, constants.UpgradeAgentSocketPath)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to start update server")
log.With(slog.Any("error", err)).Error("Failed to start update server")
os.Exit(1)
}
}

19
upgrade-agent/internal/server/server.go
View file

@ -17,6 +17,7 @@ import (
"errors"
"fmt"
"io/fs"
"log/slog"
"net"
"os"
"os/exec"
@ -39,13 +40,13 @@ var errInvalidKubernetesVersion = errors.New("invalid kubernetes version")
type Server struct {
file file.Handler
grpcServer serveStopper
log *logger.Logger
log *slog.Logger
upgradeproto.UnimplementedUpdateServer
}
// New creates a new upgrade-agent server.
func New(log *logger.Logger, fileHandler file.Handler) (*Server, error) {
log = log.Named("upgradeServer")
func New(log *slog.Logger, fileHandler file.Handler) (*Server, error) {
log = log.WithGroup("upgradeServer")
server := &Server{
log: log,
@ -53,7 +54,7 @@ func New(log *logger.Logger, fileHandler file.Handler) (*Server, error) {
}
grpcServer := grpc.NewServer(
log.Named("gRPC").GetServerUnaryInterceptor(),
logger.GetServerUnaryInterceptor(log.WithGroup("gRPC")),
)
upgradeproto.RegisterUpdateServer(grpcServer, server)
@ -85,22 +86,22 @@ func (s *Server) Run(protocol string, sockAddr string) error {
return fmt.Errorf("failed to listen: %s", err)
}
s.log.Infof("Starting")
s.log.Info("Starting")
return grpcServer.Serve(lis)
}
// Stop stops the upgrade-agent server gracefully.
func (s *Server) Stop() {
s.log.Infof("Stopping")
s.log.Info("Stopping")
s.grpcServer.GracefulStop()
s.log.Infof("Stopped")
s.log.Info("Stopped")
}
// ExecuteUpdate installs & verifies the provided kubeadm, then executes `kubeadm upgrade plan` & `kubeadm upgrade apply {wanted_Kubernetes_Version}` to upgrade to the specified version.
func (s *Server) ExecuteUpdate(ctx context.Context, updateRequest *upgradeproto.ExecuteUpdateRequest) (*upgradeproto.ExecuteUpdateResponse, error) {
s.log.Infof("Upgrade to Kubernetes version started: %s", updateRequest.WantedKubernetesVersion)
s.log.Info(fmt.Sprintf("Upgrade to Kubernetes version started: %s", updateRequest.WantedKubernetesVersion))
installer := installer.NewOSInstaller()
err := prepareUpdate(ctx, installer, updateRequest)
@ -120,7 +121,7 @@ func (s *Server) ExecuteUpdate(ctx context.Context, updateRequest *upgradeproto.
return nil, status.Errorf(codes.Internal, "unable to execute kubeadm upgrade apply: %s: %s", err, string(out))
}
s.log.Infof("Upgrade to Kubernetes version succeeded: %s", updateRequest.WantedKubernetesVersion)
s.log.Info(fmt.Sprintf("Upgrade to Kubernetes version succeeded: %s", updateRequest.WantedKubernetesVersion))
return &upgradeproto.ExecuteUpdateResponse{}, nil
}