From 08b38db21730b4713e43ecc9a9cf65045c6c8dac Mon Sep 17 00:00:00 2001
From: felipe <130432649+felipe-op@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:29:59 -0800
Subject: [PATCH] fix(proxyd): log initialization (#9785)

* fix(proxyd): log initialization

* update integration test as well
---
 proxyd/proxyd/cmd/proxyd/main.go             | 4 ++--
 proxyd/proxyd/integration_tests/util_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxyd/proxyd/cmd/proxyd/main.go b/proxyd/proxyd/cmd/proxyd/main.go
index 36e0767..2f7579a 100644
--- a/proxyd/proxyd/cmd/proxyd/main.go
+++ b/proxyd/proxyd/cmd/proxyd/main.go
@@ -28,7 +28,7 @@ var (
 func main() {
 	// Set up logger with a default INFO level in case we fail to parse flags.
 	// Otherwise the final critical log won't show what the parsing error was.
-	slog.SetDefault(slog.New(slog.NewJSONHandler(
+	log.SetDefault(log.NewLogger(slog.NewJSONHandler(
 		os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo})))
 
 	log.Info("starting proxyd", "version", GitVersion, "commit", GitCommit, "date", GitDate)
@@ -50,7 +50,7 @@ func main() {
 			log.Warn("invalid server.log_level set: " + config.Server.LogLevel)
 		}
 	}
-	slog.SetDefault(slog.New(slog.NewJSONHandler(
+	log.SetDefault(log.NewLogger(slog.NewJSONHandler(
 		os.Stdout, &slog.HandlerOptions{Level: logLevel})))
 
 	if config.Server.EnablePprof {
diff --git a/proxyd/proxyd/integration_tests/util_test.go b/proxyd/proxyd/integration_tests/util_test.go
index e2b1eb6..36edce1 100644
--- a/proxyd/proxyd/integration_tests/util_test.go
+++ b/proxyd/proxyd/integration_tests/util_test.go
@@ -186,6 +186,6 @@ func (h *ProxydWSClient) WriteControlMessage(msgType int, msg []byte) error {
 }
 
 func InitLogger() {
-	slog.SetDefault(slog.New(
-		log.NewTerminalHandlerWithLevel(os.Stdout, slog.LevelDebug, false)))
+	log.SetDefault(log.NewLogger(slog.NewJSONHandler(
+		os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})))
 }