Changes for ingress observability support (#1392)

- Add projectID explicitly to GetIngressInfoResponse as we cannot send it in headers on a response
- move ingressobs.Reporter to protocol
- Remove the unused KillIngressSession RPC
- Random fmt fixes by the protobuf linter included in my editor...

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: biglittlebigben

.changeset/heavy-scissors-hear.md

@@ -0,0 +1,5 @@
+---
+"@livekit/protocol": patch
+---
+
+Changes for ingress observability support

observability/ingressobs/gen_reporter.go

@@ -4,6 +4,7 @@ import (
 	"github.com/livekit/protocol/observability/agentsobs"
 	"github.com/livekit/protocol/observability/egressobs"
 	"github.com/livekit/protocol/observability/gatewayobs"
+	"github.com/livekit/protocol/observability/ingressobs"
 	"github.com/livekit/protocol/observability/roomobs"
 	"github.com/livekit/protocol/observability/telephonycallobs"
 	"github.com/livekit/protocol/observability/telephonyobs"
@@ -18,7 +19,7 @@ type Reporter interface {
 	Telephony() telephonyobs.Reporter
 	Connector() any // any is a placeholder for the connector type
 	Egress() egressobs.Reporter
-	Ingress() any
+	Ingress() ingressobs.Reporter
 	GatewayMetrics() any // any is a placeholder for the gateway metrics type
 	TelephonyCall() telephonycallobs.Reporter
 	Close()
@@ -54,8 +55,8 @@ func (reporter) Egress() egressobs.Reporter {
 	return egressobs.NewNoopReporter()
 }
 
-func (reporter) Ingress() any {
-	return nil
+func (reporter) Ingress() ingressobs.Reporter {
+	return ingressobs.NewNoopReporter()
 }
 
 func (reporter) GatewayMetrics() any {

observability/ingressobs/gen_reporter_noop.go

@@ -31,16 +31,6 @@ service IngressInternal {
     option (psrpc.options).multi = true;
     option (psrpc.options).topics = true;
   };
-
-  rpc KillIngressSession(KillIngressSessionRequest) returns (google.protobuf.Empty) {
-    option (psrpc.options) = {
-      topics: true
-      topic_params: {
-        names: ["ingress_id", "resource_id"]
-        typed: false
-      }
-    };
-  };
 }
 
 service IngressHandler {

observability/ingressobs/gen_source.go

@@ -66,6 +66,7 @@ message GetIngressInfoResponse {
   livekit.IngressInfo info = 1;
   string token = 2;
   string ws_url = 3;
+  string project_id = 6;
   map<string, string> logging_fields = 4;
   map<string, string> feature_flags = 5;
 }
@@ -77,20 +78,20 @@ message UpdateIngressStateRequest {
 }
 
 message GetSIPTrunkAuthenticationRequest {
-  string sip_call_id = 6 [deprecated=true];
+  string sip_call_id = 6 [deprecated = true];
 
   // What Number is calling
-  string from = 2 [deprecated=true];
+  string from = 2 [deprecated = true];
   // What Host is calling
-  string from_host = 7 [deprecated=true];
+  string from_host = 7 [deprecated = true];
 
   // What Number was called
-  string to = 3 [deprecated=true];
+  string to = 3 [deprecated = true];
   // What Host was called
-  string to_host = 5 [deprecated=true];
+  string to_host = 5 [deprecated = true];
 
   // What is the IP address of the called number
-  string src_address = 4 [deprecated=true];
+  string src_address = 4 [deprecated = true];
 
   SIPCall call = 8;
 
@@ -107,7 +108,7 @@ message GetSIPTrunkAuthenticationResponse {
     (logger.redact) = true,
     (logger.redact_format) = "<redacted ({{ .Size }} bytes)>"
   ];
-  bool   drop = 3;
+  bool drop = 3;
   // Trunk used to fulfill this request
   string sip_trunk_id = 4;
   // Used in Cloud only
@@ -121,22 +122,22 @@ message GetSIPTrunkAuthenticationResponse {
 }
 
 message EvaluateSIPDispatchRulesRequest {
-  string sip_call_id = 8 [deprecated=true];
-  string sip_participant_id = 1 [deprecated=true];
+  string sip_call_id = 8 [deprecated = true];
+  string sip_participant_id = 1 [deprecated = true];
   // Trunk from the auth response, if any
   string sip_trunk_id = 10;
 
   // What Number is calling
-  string calling_number = 2 [deprecated=true];
+  string calling_number = 2 [deprecated = true];
 
   // What Host is calling
-  string calling_host = 11 [deprecated=true];
+  string calling_host = 11 [deprecated = true];
 
   // What Number was called
-  string called_number = 3 [deprecated=true];
+  string called_number = 3 [deprecated = true];
 
   // What is the IP address of the called number
-  string src_address = 4 [deprecated=true];
+  string src_address = 4 [deprecated = true];
 
   // What pin has been entered if any
   string pin = 5;
@@ -145,7 +146,7 @@ message EvaluateSIPDispatchRulesRequest {
   bool no_pin = 6;
 
   // What Host was called
-  string called_host = 7 [deprecated=true];
+  string called_host = 7 [deprecated = true];
 
   // Extra participant attributes added for this call.
   // Usually include provider-specific metadata.
@@ -181,7 +182,7 @@ message EvaluateSIPDispatchRulesResponse {
     (logger.redact_format) = "<redacted ({{ .Size }} bytes)>"
   ];
 
-  bool request_pin = 3 [deprecated=true]; // see result
+  bool request_pin = 3 [deprecated = true];  // see result
 
   // optional token that should be used when creating LiveKit participant
   string token = 4 [
@@ -246,7 +247,7 @@ message UpdateSIPCallStateRequest {
   livekit.SIPCallInfo call_info = 1;
   livekit.SIPTransferInfo transfer_info = 2;
 
-   // NEXT ID: 3
+  // NEXT ID: 3
 }
 
 message RecordCallContextRequest {
@@ -256,7 +257,7 @@ message RecordCallContextRequest {
 }
 
 enum SIPDispatchResult {
-  LEGACY_ACCEPT_OR_PIN = 0; // check request_pin field
+  LEGACY_ACCEPT_OR_PIN = 0;  // check request_pin field
   ACCEPT = 1;
   REQUEST_PIN = 2;
   REJECT = 3;
@@ -271,11 +272,11 @@ enum SIPTrunkAuthenticationError {
 
 message SIPCall {
   string lk_call_id = 1;
-  string source_ip = 2; // source ip (without port)
-  livekit.SIPUri address = 3; // address in the request line (INVITE)
-  livekit.SIPUri from = 4; // From header
-  livekit.SIPUri to = 5; // To header
-  repeated livekit.SIPUri via = 6; // Via headers
-  string sip_call_id = 7; // SIP protocol generated call ID
-  string project_id = 8; // LiveKit project ID (Cloud only)
+  string source_ip = 2;             // source ip (without port)
+  livekit.SIPUri address = 3;       // address in the request line (INVITE)
+  livekit.SIPUri from = 4;          // From header
+  livekit.SIPUri to = 5;            // To header
+  repeated livekit.SIPUri via = 6;  // Via headers
+  string sip_call_id = 7;           // SIP protocol generated call ID
+  string project_id = 8;            // LiveKit project ID (Cloud only)
 }