Merge pull request #2018 from authzed/2010-fix-logging-behavior

Fix logging behavior around setting goproc limits

Author: tstirrat15

cmd/spicedb/main.go

@@ -3,17 +3,13 @@ package main
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"os"
 
-	"github.com/KimMachineGun/automemlimit/memlimit"
 	mcobra "github.com/muesli/mango-cobra"
 	"github.com/muesli/roff"
 	"github.com/rs/zerolog"
-	slogzerolog "github.com/samber/slog-zerolog/v2"
 	"github.com/sercand/kuberesolver/v5"
 	"github.com/spf13/cobra"
-	"go.uber.org/automaxprocs/maxprocs"
 	"google.golang.org/grpc/balancer"
 
 	_ "google.golang.org/grpc/xds"
@@ -29,33 +25,16 @@ import (
 var errParsing = errors.New("parsing error")
 
 func main() {
+	// Set up root logger
+	// This will typically be overwritten by the logging setup for a given command.
+	log.SetGlobalLogger(zerolog.New(os.Stderr).Level(zerolog.InfoLevel))
+
 	// Enable Kubernetes gRPC resolver
 	kuberesolver.RegisterInCluster()
 
 	// Enable consistent hashring gRPC load balancer
 	balancer.Register(cmdutil.ConsistentHashringBuilder)
 
-	globalLogger := zerolog.New(os.Stderr).Level(zerolog.DebugLevel)
-	log.SetGlobalLogger(globalLogger)
-	slogger := slog.New(slogzerolog.Option{Level: slog.LevelDebug, Logger: &globalLogger}.NewZerologHandler())
-
-	undo, err := maxprocs.Set(maxprocs.Logger(globalLogger.Printf))
-	if err != nil {
-		log.Fatal().Err(err).Msg("failed to set maxprocs")
-	}
-	defer undo()
-
-	_, _ = memlimit.SetGoMemLimitWithOpts(
-		memlimit.WithRatio(0.9),
-		memlimit.WithProvider(
-			memlimit.ApplyFallback(
-				memlimit.FromCgroup,
-				memlimit.FromSystem,
-			),
-		),
-		memlimit.WithLogger(slogger),
-	)
-
 	// Create a root command
 	rootCmd := cmd.NewRootCommand("spicedb")
 	rootCmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error {

go.mod

@@ -7,7 +7,7 @@ require (
 	cloud.google.com/go/spanner v1.65.0
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2
 	github.com/IBM/pgxpoolprometheus v1.1.1
-	github.com/KimMachineGun/automemlimit v0.6.1
+	github.com/KimMachineGun/automemlimit v0.6.1 // indirect
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/authzed/authzed-go v0.14.0
 
@@ -54,7 +54,7 @@ require (
 	github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb
 	github.com/jackc/pgx/v5 v5.6.0
 	github.com/johannesboyne/gofakes3 v0.0.0-20230914150226-f005f5cc03aa
-	github.com/jzelinskie/cobrautil/v2 v2.0.0-20240506193431-cec803903353
+	github.com/jzelinskie/cobrautil/v2 v2.0.0-20240813173937-98b79ae0b499
 	github.com/jzelinskie/persistent v0.0.0-20230816160542-1205ef8f0e15
 	github.com/jzelinskie/stringz v0.0.3
 	github.com/lthibault/jitterbug v2.0.0+incompatible
@@ -75,7 +75,7 @@ require (
 	github.com/rs/xid v1.5.0
 	github.com/rs/zerolog v1.33.0
 	github.com/samber/lo v1.46.0
-	github.com/samber/slog-zerolog/v2 v2.6.0
+	github.com/samber/slog-zerolog/v2 v2.6.0 // indirect
 	github.com/schollz/progressbar/v3 v3.14.5
 	github.com/scylladb/go-set v1.0.2
 	github.com/sean-/sysexits v1.0.0
@@ -381,7 +381,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.uber.org/automaxprocs v1.5.3
+	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/crypto v0.25.0 // indirect

go.sum

@@ -1246,8 +1246,8 @@ github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY=
 github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jzelinskie/cobrautil/v2 v2.0.0-20240506193431-cec803903353 h1:UGu36yaNgS3oK5kyVin6JoqDHX0I9TSiEkxj8vduveQ=
-github.com/jzelinskie/cobrautil/v2 v2.0.0-20240506193431-cec803903353/go.mod h1:GLTrbHa+A3wox/h5wYURgBjRiOppvCeKJxWCNCFMARw=
+github.com/jzelinskie/cobrautil/v2 v2.0.0-20240813173937-98b79ae0b499 h1:dXbwn1pwooxn2DAnPF3SR7tNPqC6N4VmwftMrapCYng=
+github.com/jzelinskie/cobrautil/v2 v2.0.0-20240813173937-98b79ae0b499/go.mod h1:jsl6cEF6BT3UeQoSLreA7G0sZXemoI5XNqyxzWCohbE=
 github.com/jzelinskie/persistent v0.0.0-20230816160542-1205ef8f0e15 h1:lFr5Krrc4LESaXK9yW15IQMZ4p2bZGw/+71Z1dV6tuk=
 github.com/jzelinskie/persistent v0.0.0-20230816160542-1205ef8f0e15/go.mod h1:gGiXKQUcSfUdRciTcDSuLGLZLLFSIjt1xNTE90WHDSI=
 github.com/jzelinskie/stringz v0.0.3 h1:0GhG3lVMYrYtIvRbxvQI6zqRTT1P1xyQlpa0FhfUXas=

pkg/cmd/server/defaults.go

@@ -18,6 +18,7 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector"
 	"github.com/jzelinskie/cobrautil/v2"
 	"github.com/jzelinskie/cobrautil/v2/cobraotel"
+	"github.com/jzelinskie/cobrautil/v2/cobraproclimits"
 	"github.com/jzelinskie/cobrautil/v2/cobrazerolog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -71,6 +72,8 @@ func DefaultPreRunE(programName string) cobrautil.CobraRunFunc {
 				logging.SetGlobalLogger(logger)
 			}),
 		).RunE(),
+		cobraproclimits.SetMemLimitRunE(),
+		cobraproclimits.SetProcLimitRunE(),
 		cobraotel.New("spicedb",
 			cobraotel.WithLogger(zerologr.New(&logging.Logger)),
 		).RunE(),