diff --git a/pkg/rtc/utils.go b/pkg/rtc/utils.go index d0a276eeb..baf069ddc 100644 --- a/pkg/rtc/utils.go +++ b/pkg/rtc/utils.go @@ -129,7 +129,7 @@ func Recover() { } // logger helpers -func LoggerWithParticipant(l logger.Logger, identity livekit.ParticipantIdentity, sid livekit.ParticipantID) logger.Logger { +func LoggerWithParticipant(l logger.Logger, identity livekit.ParticipantIdentity, sid livekit.ParticipantID, isRemote bool) logger.Logger { lr := logr.Logger(l) if identity != "" { lr = lr.WithValues("participant", identity) @@ -137,6 +137,7 @@ func LoggerWithParticipant(l logger.Logger, identity livekit.ParticipantIdentity if sid != "" { lr = lr.WithValues("pID", sid) } + lr = lr.WithValues("remote", isRemote) return logger.Logger(lr) } diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go index 96db96b84..b5c6bfeb0 100644 --- a/pkg/service/roommanager.go +++ b/pkg/service/roommanager.go @@ -240,7 +240,7 @@ func (r *RoomManager) StartSession( rtcConf := *r.rtcConfig rtcConf.SetBufferFactory(room.GetBufferFactory()) sid := livekit.ParticipantID(utils.NewGuid(utils.ParticipantPrefix)) - pLogger := rtc.LoggerWithParticipant(room.Logger, pi.Identity, sid) + pLogger := rtc.LoggerWithParticipant(room.Logger, pi.Identity, sid, false) protoRoom := room.ToProto() participant, err = rtc.NewParticipant(rtc.ParticipantParams{ Identity: pi.Identity, @@ -401,7 +401,9 @@ func (r *RoomManager) rtcSessionWorker(room *rtc.Room, participant types.LocalPa pLogger := rtc.LoggerWithParticipant( rtc.LoggerWithRoom(logger.GetDefaultLogger(), room.Name(), room.ID()), - participant.Identity(), participant.ID(), + participant.Identity(), + participant.ID(), + false, ) // send first refresh for cases when client token is close to expiring @@ -469,6 +471,7 @@ func (r *RoomManager) handleRTCMessage(ctx context.Context, roomName livekit.Roo rtc.LoggerWithRoom(logger.GetDefaultLogger(), roomName, room.ID()), identity, sid, + false, ) switch rm := msg.Message.(type) { diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index 1398d7984..f9a701beb 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -183,7 +183,9 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) { pLogger := rtc.LoggerWithParticipant( rtc.LoggerWithRoom(logger.GetDefaultLogger(), roomName, ""), - pi.Identity, "", + pi.Identity, + "", + false, ) done := make(chan struct{}) // function exits when websocket terminates, it'll close the event reading off of response sink as well