From 007177d095f052384805e65a5d569c8b7c659ce1 Mon Sep 17 00:00:00 2001 From: shishirng Date: Thu, 30 Dec 2021 15:26:14 -0500 Subject: [PATCH] room_sid to room_id update in analytics proto (#306) Signed-off-by: shishir gowda --- go.mod | 2 +- go.sum | 2 ++ pkg/telemetry/telemetryserviceinternalevents.go | 14 +++++++------- .../test/telemetry_service_events_test.go | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 7f1b094cb..65090d63c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/google/wire v0.5.0 github.com/gorilla/websocket v1.4.2 github.com/hashicorp/golang-lru v0.5.4 - github.com/livekit/protocol v0.11.7 + github.com/livekit/protocol v0.11.8-0.20211230201519-cfba8f993398 github.com/magefile/mage v1.11.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0 github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index c1dceefd2..912f3e7bb 100644 --- a/go.sum +++ b/go.sum @@ -134,6 +134,8 @@ github.com/lithammer/shortuuid/v3 v3.0.6 h1:pr15YQyvhiSX/qPxncFtqk+v4xLEpOZObbsY github.com/lithammer/shortuuid/v3 v3.0.6/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts= github.com/livekit/protocol v0.11.7 h1:Rfd+7GE63d2W2505QroxGGFUxWkcLWqYR0z9dfrf1zU= github.com/livekit/protocol v0.11.7/go.mod h1:YoHW9YbWbPnuVsgwBB4hAINKT+V68jmfh9zXBSSn6Wg= +github.com/livekit/protocol v0.11.8-0.20211230201519-cfba8f993398 h1:T1BINt9HgduT7DGi5Ax5niF1DtN2CPiF3BXK3amzXZo= +github.com/livekit/protocol v0.11.8-0.20211230201519-cfba8f993398/go.mod h1:YoHW9YbWbPnuVsgwBB4hAINKT+V68jmfh9zXBSSn6Wg= github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls= github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= diff --git a/pkg/telemetry/telemetryserviceinternalevents.go b/pkg/telemetry/telemetryserviceinternalevents.go index aa2ca5102..93150f706 100644 --- a/pkg/telemetry/telemetryserviceinternalevents.go +++ b/pkg/telemetry/telemetryserviceinternalevents.go @@ -39,7 +39,7 @@ func (t *telemetryServiceInternal) RoomEnded(ctx context.Context, room *livekit. t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_ROOM_ENDED, Timestamp: timestamppb.Now(), - RoomSid: room.Sid, + RoomId: room.Sid, Room: room, }) } @@ -59,7 +59,7 @@ func (t *telemetryServiceInternal) ParticipantJoined(ctx context.Context, room * t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_PARTICIPANT_JOINED, Timestamp: timestamppb.Now(), - RoomSid: room.Sid, + RoomId: room.Sid, ParticipantId: participant.Sid, Participant: participant, Room: room, @@ -84,7 +84,7 @@ func (t *telemetryServiceInternal) ParticipantLeft(ctx context.Context, room *li t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_PARTICIPANT_LEFT, Timestamp: timestamppb.Now(), - RoomSid: room.Sid, + RoomId: room.Sid, ParticipantId: participant.Sid, Room: room, }) @@ -97,7 +97,7 @@ func (t *telemetryServiceInternal) TrackPublished(ctx context.Context, participa t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_TRACK_PUBLISHED, Timestamp: timestamppb.Now(), - RoomSid: roomID, + RoomId: roomID, ParticipantId: participantID, Track: track, Room: &livekit.Room{Name: roomName}, @@ -119,7 +119,7 @@ func (t *telemetryServiceInternal) TrackUnpublished(ctx context.Context, partici t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_TRACK_UNPUBLISHED, Timestamp: timestamppb.Now(), - RoomSid: roomID, + RoomId: roomID, ParticipantId: participantID, TrackId: track.Sid, Room: &livekit.Room{Name: roomName}, @@ -133,7 +133,7 @@ func (t *telemetryServiceInternal) TrackSubscribed(ctx context.Context, particip t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_TRACK_SUBSCRIBED, Timestamp: timestamppb.Now(), - RoomSid: roomID, + RoomId: roomID, ParticipantId: participantID, TrackId: track.Sid, Room: &livekit.Room{Name: roomName}, @@ -147,7 +147,7 @@ func (t *telemetryServiceInternal) TrackUnsubscribed(ctx context.Context, partic t.analytics.SendEvent(ctx, &livekit.AnalyticsEvent{ Type: livekit.AnalyticsEventType_TRACK_UNSUBSCRIBED, Timestamp: timestamppb.Now(), - RoomSid: roomID, + RoomId: roomID, ParticipantId: participantID, TrackId: track.Sid, Room: &livekit.Room{Name: roomName}, diff --git a/pkg/telemetry/test/telemetry_service_events_test.go b/pkg/telemetry/test/telemetry_service_events_test.go index fecaa24d4..230cfa9ac 100644 --- a/pkg/telemetry/test/telemetry_service_events_test.go +++ b/pkg/telemetry/test/telemetry_service_events_test.go @@ -26,7 +26,7 @@ func Test_OnParticipantJoin_EventIsSent(t *testing.T) { require.Equal(t, livekit.AnalyticsEventType_PARTICIPANT_JOINED, event.Type) require.Equal(t, partSID, event.ParticipantId) require.Equal(t, participantInfo, event.Participant) - require.Equal(t, room.Sid, event.RoomSid) + require.Equal(t, room.Sid, event.RoomId) require.Equal(t, room, event.Room) require.Equal(t, clientInfo.Sdk, event.SdkType) } @@ -47,6 +47,6 @@ func Test_OnParticipantLeft_EventIsSent(t *testing.T) { _, event := fixture.analytics.SendEventArgsForCall(0) require.Equal(t, livekit.AnalyticsEventType_PARTICIPANT_LEFT, event.Type) require.Equal(t, partSID, event.ParticipantId) - require.Equal(t, room.Sid, event.RoomSid) + require.Equal(t, room.Sid, event.RoomId) require.Equal(t, room, event.Room) }