Egress v2 observability

observability/egressobs/egress.go

@@ -2,11 +2,10 @@ package egressobs
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/livekit/protocol/utils/protojson"
 
-	"github.com/pkg/errors"
-
 	"github.com/livekit/protocol/egress"
 	"github.com/livekit/protocol/livekit"
 )
@@ -33,8 +32,8 @@ type EgressResults struct {
 
 func GetSourceType(info *livekit.EgressInfo) SessionSourceType {
 	switch r := info.Request.(type) {
-	// case *livekit.EgressInfo_Egress:
-	// 	return getSourceTypeV2(r.Egress)
+	case *livekit.EgressInfo_Egress:
+		return getSourceTypeV2(r.Egress)
 	case *livekit.EgressInfo_Replay:
 		return getSourceTypeV2(r.Replay)
 	default:
@@ -64,8 +63,8 @@ func getSourceTypeV2(r egress.EgressRequest) SessionSourceType {
 
 func GetRequestType(info *livekit.EgressInfo) EgressRequestType {
 	switch info.Request.(type) {
-	// case *livekit.EgressInfo_Egress:
-	// 	return EgressRequestTypeEgress
+	case *livekit.EgressInfo_Egress:
+		return EgressRequestTypeEgress
 	case *livekit.EgressInfo_Replay:
 		return EgressRequestTypeReplay
 	case *livekit.EgressInfo_RoomComposite:
@@ -106,46 +105,46 @@ func GetStatus(info *livekit.EgressInfo) EgressStatus {
 
 func GetRequest(info *livekit.EgressInfo) (string, error) {
 	switch req := info.Request.(type) {
-	// case *livekit.EgressInfo_Egress:
-	// 	b, err := protojson.Marshal(req.Egress)
-	// 	if err != nil {
-	// 		return "", errors.Wrap(err, "failed to marshal egress request")
-	// 	}
-	// 	return string(b), nil
+	case *livekit.EgressInfo_Egress:
+		b, err := protojson.Marshal(req.Egress)
+		if err != nil {
+			return "", fmt.Errorf("failed serializing Egress request: %w", err)
+		}
+		return string(b), nil
 	case *livekit.EgressInfo_Replay:
 		b, err := protojson.Marshal(req.Replay)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing Replay request")
+			return "", fmt.Errorf("failed serializing Replay request: %w", err)
 		}
 		return string(b), nil
 	case *livekit.EgressInfo_RoomComposite:
 		b, err := protojson.Marshal(req.RoomComposite)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing RoomComposite request")
+			return "", fmt.Errorf("failed serializing RoomComposite request: %w", err)
 		}
 		return string(b), nil
 	case *livekit.EgressInfo_Web:
 		b, err := protojson.Marshal(req.Web)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing Web request")
+			return "", fmt.Errorf("failed serializing Web request: %w", err)
 		}
 		return string(b), nil
 	case *livekit.EgressInfo_Participant:
 		b, err := protojson.Marshal(req.Participant)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing Participant request")
+			return "", fmt.Errorf("failed serializing Participant request: %w", err)
 		}
 		return string(b), nil
 	case *livekit.EgressInfo_TrackComposite:
 		b, err := protojson.Marshal(req.TrackComposite)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing TrackComposite request")
+			return "", fmt.Errorf("failed serializing TrackComposite request: %w", err)
 		}
 		return string(b), nil
 	case *livekit.EgressInfo_Track:
 		b, err := protojson.Marshal(req.Track)
 		if err != nil {
-			return "", errors.Wrap(err, "failed serializing Track request")
+			return "", fmt.Errorf("failed serializing Track request: %w", err)
 		}
 		return string(b), nil
 	default:
@@ -181,7 +180,7 @@ func GetResult(info *livekit.EgressInfo) (string, error) {
 	}
 	b, err := json.Marshal(results)
 	if err != nil {
-		return "", errors.Wrap(err, "failed serializing results")
+		return "", fmt.Errorf("failed serializing results: %w", err)
 	}
 	return string(b), nil
 }

observability/egressobs/egress_test.go

@@ -77,6 +77,24 @@ func TestGetRequestType(t *testing.T) {
 			},
 			expected: "track",
 		},
+		{
+			name: "Egress",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Egress{
+					Egress: &livekit.StartEgressRequest{},
+				},
+			},
+			expected: "egress",
+		},
+		{
+			name: "Replay",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Replay{
+					Replay: &livekit.ExportReplayRequest{},
+				},
+			},
+			expected: "replay",
+		},
 		{
 			name:     "Undefined",
 			info:     &livekit.EgressInfo{},
@@ -92,6 +110,65 @@ func TestGetRequestType(t *testing.T) {
 	}
 }
 
+func TestGetSourceTypeV2(t *testing.T) {
+	tests := []struct {
+		name     string
+		info     *livekit.EgressInfo
+		expected string
+	}{
+		{
+			name: "EgressTemplate",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Egress{
+					Egress: &livekit.StartEgressRequest{
+						Source: &livekit.StartEgressRequest_Template{Template: &livekit.TemplateSource{}},
+					},
+				},
+			},
+			expected: "template",
+		},
+		{
+			name: "EgressMedia",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Egress{
+					Egress: &livekit.StartEgressRequest{
+						Source: &livekit.StartEgressRequest_Media{Media: &livekit.MediaSource{}},
+					},
+				},
+			},
+			expected: "media",
+		},
+		{
+			name: "EgressWeb",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Egress{
+					Egress: &livekit.StartEgressRequest{
+						Source: &livekit.StartEgressRequest_Web{Web: &livekit.WebSource{}},
+					},
+				},
+			},
+			expected: "web",
+		},
+		{
+			name: "ReplayTemplate",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Replay{
+					Replay: &livekit.ExportReplayRequest{
+						Source: &livekit.ExportReplayRequest_Template{Template: &livekit.TemplateSource{}},
+					},
+				},
+			},
+			expected: "template",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expected, string(GetSourceType(tt.info)))
+		})
+	}
+}
+
 func TestGetAudioOnly(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -198,6 +275,27 @@ func TestGetRequest(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "Egress",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Egress{
+					Egress: &livekit.StartEgressRequest{
+						RoomName: "test-room",
+						Source:   &livekit.StartEgressRequest_Template{Template: &livekit.TemplateSource{Layout: "speaker"}},
+					},
+				},
+			},
+		},
+		{
+			name: "Replay",
+			info: &livekit.EgressInfo{
+				Request: &livekit.EgressInfo_Replay{
+					Replay: &livekit.ExportReplayRequest{
+						ReplayId: "test-replay",
+					},
+				},
+			},
+		},
 		{
 			name: "Undefined",
 			info: &livekit.EgressInfo{},