From e272871d8a12989acb833dda2e5728c8d0fd22fe Mon Sep 17 00:00:00 2001
From: Benjamin Pracht <benjamin@livekit.io>
Date: Mon, 15 Jan 2024 19:08:14 -0800
Subject: [PATCH] Log room name and participant ID

---
 pkg/lksdk_output/lksdk_output.go | 2 +-
 pkg/params/params.go             | 6 +++++-
 pkg/whip/whip_handler.go         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/lksdk_output/lksdk_output.go b/pkg/lksdk_output/lksdk_output.go
index e4670771..20b56d67 100644
--- a/pkg/lksdk_output/lksdk_output.go
+++ b/pkg/lksdk_output/lksdk_output.go
@@ -67,7 +67,7 @@ func NewLKSDKOutput(ctx context.Context, p *params.Params) (*LKSDKOutput, error)
 	}
 
 	s.room = room
-	s.logger = logger.GetLogger().WithValues("ingressID", p.IngressId, "resourceID", p.State.ResourceId, "roomID", room.SID())
+	s.logger = p.GetLogger().WithValues("roomID", room.SID())
 
 	s.logger.Infow("connected to room")
 
diff --git a/pkg/params/params.go b/pkg/params/params.go
index 5f7196e9..8f62db51 100644
--- a/pkg/params/params.go
+++ b/pkg/params/params.go
@@ -154,7 +154,7 @@ func GetParams(ctx context.Context, psrpcClient rpc.IOInfoClient, conf *config.C
 }
 
 func getLoggerFields(info *livekit.IngressInfo) []interface{} {
-	return []interface{}{"ingressID", info.IngressId, "resourceID", info.State.ResourceId}
+	return []interface{}{"ingressID", info.IngressId, "resourceID", info.State.ResourceId, "roomName", info.RoomName, "participantIdentity", info.ParticipantIdentity}
 }
 
 func getRTMPRelayUrl(conf *config.Config, resourceId string) string {
@@ -372,6 +372,10 @@ func (p *Params) SendStateUpdate(ctx context.Context) {
 	}
 }
 
+func (p *Params) GetLogger() logger.Logger {
+	return p.logger
+}
+
 func CopyRedactedIngressInfo(info *livekit.IngressInfo) *livekit.IngressInfo {
 	infoCopy := proto.Clone(info).(*livekit.IngressInfo)
 
diff --git a/pkg/whip/whip_handler.go b/pkg/whip/whip_handler.go
index 7d4cb6db..8e622b1f 100644
--- a/pkg/whip/whip_handler.go
+++ b/pkg/whip/whip_handler.go
@@ -89,7 +89,7 @@ func NewWHIPHandler(webRTCConfig *rtcconfig.WebRTCConfig) *whipHandler {
 func (h *whipHandler) Init(ctx context.Context, p *params.Params, sdpOffer string) (string, error) {
 	var err error
 
-	h.logger = logger.GetLogger().WithValues("ingressID", p.IngressId, "resourceID", p.State.ResourceId)
+	h.logger = p.GetLogger()
 	h.params = p
 
 	h.updateSettings()