From b0d3d65f184607b7a54d9a2de1fc069ab1c67aee Mon Sep 17 00:00:00 2001 From: Paul Wells Date: Mon, 21 Oct 2024 23:44:00 -0700 Subject: [PATCH] update events package (#3126) * update events package * deps --- go.mod | 2 +- go.sum | 2 ++ pkg/agent/testutils/server.go | 22 +++++++++++----------- pkg/service/sip.go | 13 ++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 2f415c8c7..c3fce73ae 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/jxskiss/base62 v1.1.0 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 github.com/livekit/mediatransportutil v0.0.0-20240730083616-559fa5ece598 - github.com/livekit/protocol v1.26.1-0.20241022053724-1eb56d424343 + github.com/livekit/protocol v1.27.1-0.20241022061022-caa595ed3292 github.com/livekit/psrpc v0.6.1-0.20240924010758-9f0a4268a3b9 github.com/mackerelio/go-osstat v0.2.5 github.com/magefile/mage v1.15.0 diff --git a/go.sum b/go.sum index aad7823e7..6d0539605 100644 --- a/go.sum +++ b/go.sum @@ -165,6 +165,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ= github.com/livekit/mediatransportutil v0.0.0-20240730083616-559fa5ece598 h1:yLlkHk2feSLHstD9n4VKg7YEBR4rLODTI4WE8gNBEnQ= github.com/livekit/mediatransportutil v0.0.0-20240730083616-559fa5ece598/go.mod h1:jwKUCmObuiEDH0iiuJHaGMXwRs3RjrB4G6qqgkr/5oE= +github.com/livekit/protocol v1.27.1-0.20241022061022-caa595ed3292 h1:wVzOLGSjJpCsdKHKKpPxYhXW/JL90l0XYFQbeINSdP4= +github.com/livekit/protocol v1.27.1-0.20241022061022-caa595ed3292/go.mod h1:nxRzmQBKSYK64gqr7ABWwt78hvrgiO2wYuCojRYb7Gs= github.com/livekit/psrpc v0.6.1-0.20240924010758-9f0a4268a3b9 h1:33oBjGpVD9tYkDXQU42tnHl8eCX9G6PVUToBVuCUyOs= github.com/livekit/psrpc v0.6.1-0.20240924010758-9f0a4268a3b9/go.mod h1:CQUBSPfYYAaevg1TNCc6/aYsa8DJH4jSRFdCeSZk5u0= github.com/mackerelio/go-osstat v0.2.5 h1:+MqTbZUhoIt4m8qzkVoXUJg1EuifwlAJSk4Yl2GXh+o= diff --git a/pkg/agent/testutils/server.go b/pkg/agent/testutils/server.go index 09ce9e3c9..1c4ce48f3 100644 --- a/pkg/agent/testutils/server.go +++ b/pkg/agent/testutils/server.go @@ -18,7 +18,7 @@ import ( "github.com/livekit/livekit-server/pkg/service" "github.com/livekit/protocol/auth" "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/events" "github.com/livekit/protocol/utils/guid" "github.com/livekit/protocol/utils/must" "github.com/livekit/protocol/utils/options" @@ -111,11 +111,11 @@ func (h *TestServer) SimulateAgentWorker(opts ...SimulatedWorkerOption) *AgentWo jobs: map[string]*AgentJob{}, SimulatedWorkerOptions: o, - RegisterWorkerResponses: utils.NewDefaultEventObserverList[*livekit.RegisterWorkerResponse](), - AvailabilityRequests: utils.NewDefaultEventObserverList[*livekit.AvailabilityRequest](), - JobAssignments: utils.NewDefaultEventObserverList[*livekit.JobAssignment](), - JobTerminations: utils.NewDefaultEventObserverList[*livekit.JobTermination](), - WorkerPongs: utils.NewDefaultEventObserverList[*livekit.WorkerPong](), + RegisterWorkerResponses: events.NewObserverList[*livekit.RegisterWorkerResponse](), + AvailabilityRequests: events.NewObserverList[*livekit.AvailabilityRequest](), + JobAssignments: events.NewObserverList[*livekit.JobAssignment](), + JobTerminations: events.NewObserverList[*livekit.JobTermination](), + WorkerPongs: events.NewObserverList[*livekit.WorkerPong](), } w.ctx, w.cancel = context.WithCancel(context.Background()) @@ -178,11 +178,11 @@ type AgentWorker struct { serverMessages deque.Deque[*livekit.ServerMessage] jobs map[string]*AgentJob - RegisterWorkerResponses *utils.EventObserverList[*livekit.RegisterWorkerResponse] - AvailabilityRequests *utils.EventObserverList[*livekit.AvailabilityRequest] - JobAssignments *utils.EventObserverList[*livekit.JobAssignment] - JobTerminations *utils.EventObserverList[*livekit.JobTermination] - WorkerPongs *utils.EventObserverList[*livekit.WorkerPong] + RegisterWorkerResponses *events.ObserverList[*livekit.RegisterWorkerResponse] + AvailabilityRequests *events.ObserverList[*livekit.AvailabilityRequest] + JobAssignments *events.ObserverList[*livekit.JobAssignment] + JobTerminations *events.ObserverList[*livekit.JobTermination] + WorkerPongs *events.ObserverList[*livekit.WorkerPong] } func (w *AgentWorker) statusWorker() { diff --git a/pkg/service/sip.go b/pkg/service/sip.go index 74c075669..38d45245a 100644 --- a/pkg/service/sip.go +++ b/pkg/service/sip.go @@ -392,27 +392,26 @@ func (s *SIPService) CreateSIPParticipantRequest(ctx context.Context, req *livek return nil, ErrSIPNotConnected } callID := sip.NewCallID() - log := logger.GetLogger() - if projectID != "" { - log = log.WithValues("projectID", projectID) - } - unlikelyLogger := log.WithUnlikelyValues( + log := logger.GetLogger().WithUnlikelyValues( "callID", callID, "room", req.RoomName, "sipTrunk", req.SipTrunkId, "toUser", req.SipCallTo, ) + if projectID != "" { + log = log.WithValues("projectID", projectID) + } trunk, err := s.store.LoadSIPOutboundTrunk(ctx, req.SipTrunkId) if err != nil { - unlikelyLogger.Errorw("cannot get trunk to update sip participant", err) + log.Errorw("cannot get trunk to update sip participant", err) return nil, err } return rpc.NewCreateSIPParticipantRequest(projectID, callID, host, wsUrl, token, req, trunk) } func (s *SIPService) TransferSIPParticipant(ctx context.Context, req *livekit.TransferSIPParticipantRequest) (*emptypb.Empty, error) { - log := logger.GetLogger().WithValues("room", req.RoomName, "participant", req.ParticipantIdentity) + log := logger.GetLogger().WithUnlikelyValues("room", req.RoomName, "participant", req.ParticipantIdentity) ireq, err := s.transferSIPParticipantRequest(ctx, req) if err != nil { log.Errorw("cannot create transfer sip participant request", err)