From b760918a0db3be47ff808dc1b2bcc1ecf15065c4 Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Thu, 24 Apr 2025 11:34:16 +0530
Subject: [PATCH] Use logger from request context. (#3623)

That will have projectID and can potentially be used for project level
logging if we are able to pass around the project logger more.
---
 pkg/routing/signal.go | 3 ++-
 pkg/service/signal.go | 3 ++-
 pkg/service/utils.go  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/routing/signal.go b/pkg/routing/signal.go
index b7fa4a859..b47d3cbce 100644
--- a/pkg/routing/signal.go
+++ b/pkg/routing/signal.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/livekit/livekit-server/pkg/config"
 	"github.com/livekit/livekit-server/pkg/telemetry/prometheus"
+	"github.com/livekit/livekit-server/pkg/utils"
 	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/rpc"
@@ -88,7 +89,7 @@ func (r *signalClient) StartParticipantSignal(
 		return
 	}
 
-	l := logger.GetLogger().WithValues(
+	l := utils.GetLogger(ctx).WithValues(
 		"room", roomName,
 		"reqNodeID", nodeID,
 		"participant", pi.Identity,
diff --git a/pkg/service/signal.go b/pkg/service/signal.go
index 75866fae3..6000b2c36 100644
--- a/pkg/service/signal.go
+++ b/pkg/service/signal.go
@@ -23,6 +23,7 @@ import (
 	"github.com/livekit/livekit-server/pkg/config"
 	"github.com/livekit/livekit-server/pkg/routing"
 	"github.com/livekit/livekit-server/pkg/telemetry/prometheus"
+	"github.com/livekit/livekit-server/pkg/utils"
 	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/rpc"
@@ -86,7 +87,7 @@ type defaultSessionHandler struct {
 }
 
 func (s *defaultSessionHandler) Logger(ctx context.Context) logger.Logger {
-	return logger.GetLogger()
+	return utils.GetLogger(ctx)
 }
 
 func (s *defaultSessionHandler) HandleSession(
diff --git a/pkg/service/utils.go b/pkg/service/utils.go
index bac2b395f..0ac721884 100644
--- a/pkg/service/utils.go
+++ b/pkg/service/utils.go
@@ -22,8 +22,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/livekit/livekit-server/pkg/utils"
 	"github.com/livekit/protocol/livekit"
-	"github.com/livekit/protocol/logger"
 )
 
 func handleError(w http.ResponseWriter, r *http.Request, status int, err error, keysAndValues ...interface{}) {
@@ -32,7 +32,7 @@ func handleError(w http.ResponseWriter, r *http.Request, status int, err error,
 		keysAndValues = append(keysAndValues, "method", r.Method, "path", r.URL.Path)
 	}
 	if !errors.Is(err, context.Canceled) && !errors.Is(r.Context().Err(), context.Canceled) {
-		logger.GetLogger().WithCallDepth(1).Warnw("error handling request", err, keysAndValues...)
+		utils.GetLogger(r.Context()).WithCallDepth(1).Warnw("error handling request", err, keysAndValues...)
 	}
 	w.WriteHeader(status)
 	_, _ = w.Write([]byte(err.Error()))