From f04c14d67be0a97d1c12f7fd3d1689285946f3a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:48:28 +0000 Subject: [PATCH 1/2] minor(deps): update module github.com/prometheus/exporter-toolkit to v0.13.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 730060e..7b05be5 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/oklog/run v1.1.0 github.com/prometheus/client_golang v1.20.3 github.com/prometheus/common v0.59.1 - github.com/prometheus/exporter-toolkit v0.12.0 + github.com/prometheus/exporter-toolkit v0.13.0 github.com/prometheus/prometheus v1.8.2-0.20210220213500-8c8de46003d1 github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.27.4 diff --git a/go.sum b/go.sum index f784e76..d695f55 100644 --- a/go.sum +++ b/go.sum @@ -660,8 +660,8 @@ github.com/prometheus/common v0.17.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16 github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= -github.com/prometheus/exporter-toolkit v0.12.0 h1:DkE5RcEZR3lQA2QD5JLVQIf41dFKNsVMXFhgqcif7fo= -github.com/prometheus/exporter-toolkit v0.12.0/go.mod h1:fQH0KtTn0yrrS0S82kqppRjDDiwMfIQUwT+RBRRhwUc= +github.com/prometheus/exporter-toolkit v0.13.0 h1:lmA0Q+8IaXgmFRKw09RldZmZdnvu9wwcDLIXGmTPw1c= +github.com/prometheus/exporter-toolkit v0.13.0/go.mod h1:2uop99EZl80KdXhv/MxVI2181fMcwlsumFOqBecGkG0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= From ce5a3c5efd6255c678f52bf4da379c4d3ebc1c9b Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sat, 14 Sep 2024 13:46:05 +0200 Subject: [PATCH 2/2] feat: replace go-kit logger by slog --- Makefile | 2 +- changelog/unreleased/logging-library.md | 7 +++++ pkg/action/discoverer.go | 17 ++++------- pkg/action/metrics.go | 9 ++---- pkg/action/server.go | 30 +++++++------------ pkg/adapter/adapter.go | 11 ++++--- pkg/command/health.go | 14 ++++----- pkg/command/server.go | 24 ++++----------- pkg/command/setup.go | 40 ++++++++++++------------- pkg/middleware/recoverer.go | 9 ++---- 10 files changed, 67 insertions(+), 96 deletions(-) create mode 100644 changelog/unreleased/logging-library.md diff --git a/Makefile b/Makefile index faae596..a4b4ecf 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ endif GOBUILD ?= CGO_ENABLED=0 go build PACKAGES ?= $(shell go list ./...) -SOURCES ?= $(shell find . -name "*.go" -type f) +SOURCES ?= $(shell find . -name "*.go" -type f -not -path ./.devenv/\* -not -path ./.direnv/\*) GENERATE ?= $(PACKAGES) TAGS ?= netgo diff --git a/changelog/unreleased/logging-library.md b/changelog/unreleased/logging-library.md new file mode 100644 index 0000000..15162c5 --- /dev/null +++ b/changelog/unreleased/logging-library.md @@ -0,0 +1,7 @@ +Change: Switch to official logging library + +Since there have been a structured logger part of the Go standard library we +thought it's time to replace the library with that. Be aware that log messages +should change a little bit. + +https://github.com/promhippie/prometheus-hetzner-sd/issues/270 diff --git a/pkg/action/discoverer.go b/pkg/action/discoverer.go index 66e8078..a15bd06 100644 --- a/pkg/action/discoverer.go +++ b/pkg/action/discoverer.go @@ -3,13 +3,12 @@ package action import ( "context" "fmt" + "log/slog" "strconv" "strings" "time" "github.com/appscode/go-hetzner" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" ) @@ -37,7 +36,7 @@ var ( // Discoverer implements the Prometheus discoverer interface. type Discoverer struct { clients map[string]*hetzner.Client - logger log.Logger + logger *slog.Logger refresh int lasts map[string]struct{} } @@ -72,8 +71,7 @@ func (d *Discoverer) getTargets(_ context.Context) ([]*targetgroup.Group, error) requestDuration.WithLabelValues(project).Observe(time.Since(now).Seconds()) if err != nil { - level.Warn(d.logger).Log( - "msg", "Failed to fetch servers", + d.logger.Warn("Failed to fetch servers", "project", project, "err", err, ) @@ -82,8 +80,7 @@ func (d *Discoverer) getTargets(_ context.Context) ([]*targetgroup.Group, error) continue } - level.Debug(d.logger).Log( - "msg", "Requested servers", + d.logger.Debug("Requested servers", "project", project, "count", len(servers), ) @@ -112,8 +109,7 @@ func (d *Discoverer) getTargets(_ context.Context) ([]*targetgroup.Group, error) }, } - level.Debug(d.logger).Log( - "msg", "Server added", + d.logger.Debug("Server added", "project", project, "source", target.Source, ) @@ -126,8 +122,7 @@ func (d *Discoverer) getTargets(_ context.Context) ([]*targetgroup.Group, error) for k := range d.lasts { if _, ok := current[k]; !ok { - level.Debug(d.logger).Log( - "msg", "Server deleted", + d.logger.Debug("Server deleted", "source", k, ) diff --git a/pkg/action/metrics.go b/pkg/action/metrics.go index c5c2e13..adc3058 100644 --- a/pkg/action/metrics.go +++ b/pkg/action/metrics.go @@ -2,9 +2,8 @@ package action import ( "fmt" + "log/slog" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/promhippie/prometheus-hetzner-sd/pkg/version" @@ -49,11 +48,9 @@ func init() { } type promLogger struct { - logger log.Logger + logger *slog.Logger } func (pl promLogger) Println(v ...interface{}) { - level.Error(pl.logger).Log( - "msg", fmt.Sprintln(v...), - ) + pl.logger.Error(fmt.Sprintln(v...)) } diff --git a/pkg/action/server.go b/pkg/action/server.go index e2ddf78..b92d334 100644 --- a/pkg/action/server.go +++ b/pkg/action/server.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io" + "log/slog" "net/http" "os" "os/signal" @@ -11,8 +12,6 @@ import ( "github.com/appscode/go-hetzner" "github.com/go-chi/chi/v5" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/oklog/run" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/exporter-toolkit/web" @@ -23,9 +22,8 @@ import ( ) // Server handles the server sub-command. -func Server(cfg *config.Config, logger log.Logger) error { - level.Info(logger).Log( - "msg", "Launching Prometheus Hetzner SD", +func Server(cfg *config.Config, logger *slog.Logger) error { + logger.Info("Launching Prometheus Hetzner SD", "version", version.String, "revision", version.Revision, "date", version.Date, @@ -43,8 +41,7 @@ func Server(cfg *config.Config, logger log.Logger) error { username, err := config.Value(credential.Username) if err != nil { - level.Error(logger).Log( - "msg", "Failed to read username secret", + logger.Error("Failed to read username secret", "project", credential.Project, "err", err, ) @@ -55,8 +52,7 @@ func Server(cfg *config.Config, logger log.Logger) error { password, err := config.Value(credential.Password) if err != nil { - level.Error(logger).Log( - "msg", "Failed to read password secret", + logger.Error("Failed to read password secret", "project", credential.Project, "err", err, ) @@ -90,9 +86,8 @@ func Server(cfg *config.Config, logger log.Logger) error { } gr.Add(func() error { - level.Info(logger).Log( - "msg", "Starting metrics server", - "addr", cfg.Server.Addr, + logger.Info("Starting metrics server", + "address", cfg.Server.Addr, ) return web.ListenAndServe( @@ -109,16 +104,14 @@ func Server(cfg *config.Config, logger log.Logger) error { defer cancel() if err := server.Shutdown(ctx); err != nil { - level.Error(logger).Log( - "msg", "Failed to shutdown metrics gracefully", + logger.Error("Failed to shutdown metrics gracefully", "err", err, ) return } - level.Info(logger).Log( - "msg", "Metrics shutdown gracefully", + logger.Info("Metrics shutdown gracefully", "reason", reason, ) }) @@ -141,7 +134,7 @@ func Server(cfg *config.Config, logger log.Logger) error { return gr.Run() } -func handler(cfg *config.Config, logger log.Logger) *chi.Mux { +func handler(cfg *config.Config, logger *slog.Logger) *chi.Mux { mux := chi.NewRouter() mux.Use(middleware.Recoverer(logger)) mux.Use(middleware.RealIP) @@ -181,8 +174,7 @@ func handler(cfg *config.Config, logger log.Logger) *chi.Mux { content, err := os.ReadFile(cfg.Target.File) if err != nil { - level.Info(logger).Log( - "msg", "Failed to read service discovery data", + logger.Error("Failed to read service discovery data", "err", err, ) diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go index 81b9d28..d8cea9b 100644 --- a/pkg/adapter/adapter.go +++ b/pkg/adapter/adapter.go @@ -19,12 +19,11 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "os" "path/filepath" "reflect" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/targetgroup" ) @@ -43,7 +42,7 @@ type Adapter struct { manager *discovery.Manager output string name string - logger log.Logger + logger *slog.Logger } func mapToArray(m map[string]*customSD) []customSD { @@ -84,7 +83,7 @@ func (a *Adapter) generateTargetGroups(allTargetGroups map[string][]*targetgroup a.groups = tempGroups err := a.writeOutput() if err != nil { - level.Error(log.With(a.logger, "component", "sd-adapter")).Log("err", err) + a.logger.With("component", "sd-adapter").Error("", "err", err) } } @@ -138,12 +137,12 @@ func (a *Adapter) Run() { } // NewAdapter creates a new instance of Adapter. -func NewAdapter(ctx context.Context, file string, name string, d discovery.Discoverer, logger log.Logger) *Adapter { +func NewAdapter(ctx context.Context, file string, name string, d discovery.Discoverer, logger *slog.Logger) *Adapter { return &Adapter{ ctx: ctx, disc: d, groups: make(map[string]*customSD), - manager: discovery.NewManager(ctx, logger), + manager: discovery.NewManager(ctx, nil), output: file, name: name, logger: logger, diff --git a/pkg/command/health.go b/pkg/command/health.go index eb6849a..51c88f5 100644 --- a/pkg/command/health.go +++ b/pkg/command/health.go @@ -4,7 +4,6 @@ import ( "fmt" "net/http" - "github.com/go-kit/log/level" "github.com/promhippie/prometheus-hetzner-sd/pkg/config" "github.com/urfave/cli/v2" ) @@ -20,8 +19,7 @@ func Health(cfg *config.Config) *cli.Command { if c.IsSet("hetzner.config") { if err := readConfig(c.String("hetzner.config"), cfg); err != nil { - level.Error(logger).Log( - "msg", "Failed to read config", + logger.Error("Failed to read config", "err", err, ) @@ -37,8 +35,7 @@ func Health(cfg *config.Config) *cli.Command { ) if err != nil { - level.Error(logger).Log( - "msg", "Failed to request health check", + logger.Error("Failed to request health check", "err", err, ) @@ -48,8 +45,7 @@ func Health(cfg *config.Config) *cli.Command { defer resp.Body.Close() if resp.StatusCode != 200 { - level.Error(logger).Log( - "msg", "Health check seems to be in bad state", + logger.Error("Health check seems to be in bad state", "err", err, "code", resp.StatusCode, ) @@ -57,6 +53,10 @@ func Health(cfg *config.Config) *cli.Command { return err } + logger.Debug("Health check seems to be fine", + "code", resp.StatusCode, + ) + return nil }, } diff --git a/pkg/command/server.go b/pkg/command/server.go index d55f94c..16a00e2 100644 --- a/pkg/command/server.go +++ b/pkg/command/server.go @@ -3,7 +3,6 @@ package command import ( "errors" - "github.com/go-kit/log/level" "github.com/promhippie/prometheus-hetzner-sd/pkg/action" "github.com/promhippie/prometheus-hetzner-sd/pkg/config" "github.com/urfave/cli/v2" @@ -20,8 +19,7 @@ func Server(cfg *config.Config) *cli.Command { if c.IsSet("hetzner.config") { if err := readConfig(c.String("hetzner.config"), cfg); err != nil { - level.Error(logger).Log( - "msg", "Failed to read config", + logger.Error("Failed to read config", "err", err, ) @@ -30,10 +28,7 @@ func Server(cfg *config.Config) *cli.Command { } if cfg.Target.File == "" { - level.Error(logger).Log( - "msg", "Missing path for output.file", - ) - + logger.Error("Missing path for output.file") return errors.New("missing path for output.file") } @@ -50,27 +45,18 @@ func Server(cfg *config.Config) *cli.Command { ) if credentials.Username == "" { - level.Error(logger).Log( - "msg", "Missing required hetzner.username", - ) - + logger.Error("Missing required hetzner.username") return errors.New("missing required hetzner.username") } if credentials.Password == "" { - level.Error(logger).Log( - "msg", "Missing required hetzner.password", - ) - + logger.Error("Missing required hetzner.password") return errors.New("missing required hetzner.password") } } if len(cfg.Target.Credentials) == 0 { - level.Error(logger).Log( - "msg", "Missing any credentials", - ) - + logger.Error("Missing any credentials") return errors.New("missing any credentials") } diff --git a/pkg/command/setup.go b/pkg/command/setup.go index ebfe4d1..ea4e6c6 100644 --- a/pkg/command/setup.go +++ b/pkg/command/setup.go @@ -3,12 +3,11 @@ package command import ( "encoding/json" "errors" + "log/slog" "os" "path/filepath" "strings" - "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/promhippie/prometheus-hetzner-sd/pkg/config" "gopkg.in/yaml.v3" ) @@ -18,36 +17,35 @@ var ( ErrConfigFormatInvalid = errors.New("config extension is not supported") ) -func setupLogger(cfg *config.Config) log.Logger { - var logger log.Logger - +func setupLogger(cfg *config.Config) *slog.Logger { if cfg.Logs.Pretty { - logger = log.NewSyncLogger( - log.NewLogfmtLogger(os.Stdout), - ) - } else { - logger = log.NewSyncLogger( - log.NewJSONLogger(os.Stdout), + return slog.New( + slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{ + Level: loggerLevel(cfg), + }), ) } + return slog.New( + slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{ + Level: loggerLevel(cfg), + }), + ) +} + +func loggerLevel(cfg *config.Config) slog.Leveler { switch strings.ToLower(cfg.Logs.Level) { case "error": - logger = level.NewFilter(logger, level.AllowError()) + return slog.LevelError case "warn": - logger = level.NewFilter(logger, level.AllowWarn()) + return slog.LevelWarn case "info": - logger = level.NewFilter(logger, level.AllowInfo()) + return slog.LevelInfo case "debug": - logger = level.NewFilter(logger, level.AllowDebug()) - default: - logger = level.NewFilter(logger, level.AllowInfo()) + return slog.LevelDebug } - return log.With( - logger, - "ts", log.DefaultTimestampUTC, - ) + return slog.LevelInfo } func readConfig(file string, cfg *config.Config) error { diff --git a/pkg/middleware/recoverer.go b/pkg/middleware/recoverer.go index 1cc2dab..95f9de1 100644 --- a/pkg/middleware/recoverer.go +++ b/pkg/middleware/recoverer.go @@ -1,21 +1,18 @@ package middleware import ( + "log/slog" "net/http" "runtime/debug" - - "github.com/go-kit/log" - "github.com/go-kit/log/level" ) // Recoverer initializes a recoverer middleware. -func Recoverer(logger log.Logger) func(next http.Handler) http.Handler { +func Recoverer(logger *slog.Logger) func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler { fn := func(w http.ResponseWriter, r *http.Request) { defer func() { if rvr := recover(); rvr != nil { - level.Error(logger).Log( - "msg", rvr.(string), + logger.Error(rvr.(string), "trace", string(debug.Stack()), )