Build with go-1.21 and use slog instead of zap for logging (#122)

Author: majst01

.github/workflows/docker.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v4
       with:
-        go-version: "1.20"
+        go-version: "1.21"
       id: go
 
     - name: Check out code into the Go module directory
@@ -86,10 +86,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v4
       with:
-        go-version: "1.20"
+        go-version: "1.21"
       id: go
 
     - name: Check out code into the Go module directory

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine as builder
+FROM golang:1.21-alpine as builder
 RUN apk add \
     binutils \
     gcc \

cmd/server/main.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"log/slog"
 	"os"
 
 	goipam "github.com/metal-stack/go-ipam"
 	"github.com/metal-stack/v"
 	"github.com/urfave/cli/v2"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 )
 
 func main() {
@@ -283,21 +282,19 @@ func main() {
 }
 
 func getConfig(ctx *cli.Context) config {
-	cfg := zap.NewProductionConfig()
-	level, err := zap.ParseAtomicLevel(ctx.String("log-level"))
-	if err != nil {
-		panic(err)
+	opts := &slog.HandlerOptions{
+		Level: slog.LevelInfo,
 	}
-	cfg.Level = level
-	cfg.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	zlog, err := cfg.Build()
-	if err != nil {
-		panic(err)
+	switch ctx.String("log-level") {
+	case "debug":
+		opts.Level = slog.LevelDebug
+	case "error":
+		opts.Level = slog.LevelError
 	}
 
 	return config{
 		GrpcServerEndpoint: ctx.String("grpc-server-endpoint"),
 		MetricsEndpoint:    ctx.String("metrics-endpoint"),
-		Log:                zlog.Sugar(),
+		Log:                slog.New(slog.NewJSONHandler(os.Stdout, opts)),
 	}
 }

cmd/server/server.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"fmt"
+	"log/slog"
 	"net/http"
 	"time"
 
@@ -18,22 +20,21 @@ import (
 	"connectrpc.com/grpchealth"
 	"connectrpc.com/grpcreflect"
 
-	"go.uber.org/zap"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 )
 
 type config struct {
 	GrpcServerEndpoint string
 	MetricsEndpoint    string
-	Log                *zap.SugaredLogger
+	Log                *slog.Logger
 	Storage            goipam.Storage
 }
 type server struct {
 	c       config
 	ipamer  goipam.Ipamer
 	storage goipam.Storage
-	log     *zap.SugaredLogger
+	log     *slog.Logger
 }
 
 func newServer(c config) *server {
@@ -45,7 +46,7 @@ func newServer(c config) *server {
 	}
 }
 func (s *server) Run() error {
-	s.log.Infow("starting go-ipam", "version", v.V, "backend", s.storage.Name())
+	s.log.Info("starting go-ipam", "version", v.V, "backend", s.storage.Name())
 
 	// The exporter embeds a default OpenTelemetry Reader and
 	// implements prometheus.Collector, allowing it to be used as
@@ -58,7 +59,7 @@ func (s *server) Run() error {
 
 	// Start the prometheus HTTP server and pass the exporter Collector to it
 	go func() {
-		s.log.Infof("serving metrics at %s/metrics", s.c.MetricsEndpoint)
+		s.log.Info("serving metrics", "at", fmt.Sprintf("%s/metrics", s.c.MetricsEndpoint))
 		metricsServer := http.NewServeMux()
 		metricsServer.Handle("/metrics", promhttp.Handler())
 		ms := &http.Server{
@@ -68,7 +69,7 @@ func (s *server) Run() error {
 		}
 		err := ms.ListenAndServe()
 		if err != nil {
-			s.log.Errorw("unable to start metric endpoint", "error", err)
+			s.log.Error("unable to start metric endpoint", "error", err)
 			return
 		}
 	}()

go.mod

@@ -1,34 +1,34 @@
 module github.com/metal-stack/go-ipam
 
-go 1.20
+go 1.21
 
 require (
 	connectrpc.com/connect v1.11.0
 	connectrpc.com/grpchealth v1.2.0
 	connectrpc.com/grpcreflect v1.2.0
 	connectrpc.com/otelconnect v0.5.0
-	github.com/avast/retry-go/v4 v4.3.4
+	github.com/avast/retry-go/v4 v4.5.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/klauspost/connect-compress/v2 v2.0.0
 	github.com/lib/pq v1.10.9
 	github.com/metal-stack/v v1.0.3
 	github.com/prometheus/client_golang v1.16.0
 	github.com/redis/go-redis/v9 v9.0.5
 	github.com/stretchr/testify v1.8.4
-	github.com/testcontainers/testcontainers-go v0.21.0
+	github.com/testcontainers/testcontainers-go v0.23.0
 	github.com/urfave/cli/v2 v2.25.7
 	go.etcd.io/etcd/client/v3 v3.5.9
 	go.mongodb.org/mongo-driver v1.12.1
 	go.opentelemetry.io/otel/exporters/prometheus v0.39.0
 	go.opentelemetry.io/otel/sdk/metric v0.39.0
-	go.uber.org/zap v1.25.0
 	go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28
-	golang.org/x/net v0.13.0
+	golang.org/x/net v0.14.0
 	golang.org/x/sync v0.3.0
 	google.golang.org/protobuf v1.31.0
 )
 
 require (
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
@@ -52,7 +52,6 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -63,7 +62,7 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
-	github.com/opencontainers/runc v1.1.8 // indirect
+	github.com/opencontainers/runc v1.1.9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
@@ -84,16 +83,16 @@ require (
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go.uber.org/goleak v1.2.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	golang.org/x/tools v0.11.1 // indirect
-	google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
+	google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
 	google.golang.org/grpc v1.57.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.0 // indirect
 )