Keep external logger setup inside util log

Signed-off-by: Rohithmatham12 <rohithmatham@gmail.com>

Author: Rohithmatham12

cmd/cortex/main.go

@@ -20,7 +20,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	collectorversion "github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/common/version"
-	"go.uber.org/automaxprocs/maxprocs"
 	"gopkg.in/yaml.v2"
 
 	"github.com/cortexproject/cortex/pkg/cortex"
@@ -170,9 +169,7 @@ func main() {
 	}
 
 	util_log.InitLogger(&cfg.Server)
-	if _, err := maxprocs.Set(maxprocs.Logger(util_log.AutomaxprocsLogger(util_log.Logger))); err != nil {
-		level.Warn(util_log.Logger).Log("msg", "failed to set GOMAXPROCS from CPU quota", "err", err)
-	}
+	util_log.InitAutomaxprocs()
 	util.InitEvents(eventSampleRate)
 
 	ctx, cancelFn := context.WithCancel(context.Background())

pkg/util/log/external.go

@@ -8,26 +8,35 @@ import (
 
 	kitlog "github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"go.uber.org/automaxprocs/maxprocs"
 	"google.golang.org/grpc/grpclog"
 )
 
 // InitExternalLoggers configures package-level loggers from dependencies that
 // do not take Cortex's logger through normal constructors.
 func InitExternalLoggers() {
-	grpclog.SetLoggerV2(NewGRPCLogger(Logger))
+	grpclog.SetLoggerV2(newGRPCLogger(Logger))
 }
 
-// AutomaxprocsLogger adapts the printf-style logger used by automaxprocs to
+// InitAutomaxprocs configures GOMAXPROCS from the container CPU quota and logs
+// through Cortex's configured logger.
+func InitAutomaxprocs() {
+	if _, err := maxprocs.Set(maxprocs.Logger(automaxprocsLogger(Logger))); err != nil {
+		level.Warn(Logger).Log("msg", "failed to set GOMAXPROCS from CPU quota", "err", err)
+	}
+}
+
+// automaxprocsLogger adapts the printf-style logger used by automaxprocs to
 // Cortex's configured go-kit logger.
-func AutomaxprocsLogger(logger kitlog.Logger) func(string, ...interface{}) {
-	return func(format string, args ...interface{}) {
+func automaxprocsLogger(logger kitlog.Logger) func(string, ...any) {
+	return func(format string, args ...any) {
 		level.Info(logger).Log("msg", fmt.Sprintf(format, args...))
 	}
 }
 
-// NewGRPCLogger adapts gRPC's package-level logger to Cortex's configured
+// newGRPCLogger adapts gRPC's package-level logger to Cortex's configured
 // go-kit logger so gRPC transport logs use the selected Cortex log format.
-func NewGRPCLogger(logger kitlog.Logger) grpclog.LoggerV2 {
+func newGRPCLogger(logger kitlog.Logger) grpclog.LoggerV2 {
 	return &grpcLogger{
 		logger:   logger,
 		severity: grpcSeverityFromEnv(),

pkg/util/log/external_test.go

@@ -15,7 +15,7 @@ func TestGRPCLoggerUsesConfiguredLogger(t *testing.T) {
 	t.Setenv("GRPC_GO_LOG_VERBOSITY_LEVEL", "")
 
 	logger, logs := testJSONLogger(t)
-	grpcLogger := NewGRPCLogger(logger)
+	grpcLogger := newGRPCLogger(logger)
 
 	grpcLogger.Info("not logged by default")
 	grpcLogger.Error("transport failure")
@@ -29,7 +29,7 @@ func TestGRPCLoggerUsesConfiguredLogger(t *testing.T) {
 func TestAutomaxprocsLoggerUsesConfiguredLogger(t *testing.T) {
 	logger, logs := testJSONLogger(t)
 
-	AutomaxprocsLogger(logger)("maxprocs: Leaving GOMAXPROCS=%v: CPU quota undefined", 4)
+	automaxprocsLogger(logger)("maxprocs: Leaving GOMAXPROCS=%v: CPU quota undefined", 4)
 
 	entry := readSingleJSONLogEntry(t, logs)
 	require.Equal(t, "info", entry["level"])
@@ -46,13 +46,13 @@ func testJSONLogger(t *testing.T) (kitlog.Logger, *bytes.Buffer) {
 	return newPrometheusLoggerFrom(kitlog.NewJSONLogger(logs), logLevel), logs
 }
 
-func readSingleJSONLogEntry(t *testing.T, logs *bytes.Buffer) map[string]interface{} {
+func readSingleJSONLogEntry(t *testing.T, logs *bytes.Buffer) map[string]any {
 	t.Helper()
 
 	lines := bytes.Split(bytes.TrimSpace(logs.Bytes()), []byte("\n"))
 	require.Len(t, lines, 1)
 
-	var entry map[string]interface{}
+	var entry map[string]any
 	require.NoError(t, json.Unmarshal(lines[0], &entry))
 	return entry
 }