Add protobuf support for new metrics in 3561db46

psiphon/server/pb/psiphond/inproxy_broker.pb.go

@@ -64,6 +64,8 @@ type InproxyBroker struct {
 	MeekServerHttpVersion         *string                `protobuf:"bytes,137,opt,name=meek_server_http_version,json=meekServerHttpVersion,proto3,oneof" json:"meek_server_http_version,omitempty"`
 	PendingAnswersSize            *int64                 `protobuf:"varint,138,opt,name=pending_answers_size,json=pendingAnswersSize,proto3,oneof" json:"pending_answers_size,omitempty"`
 	OfferDeadline                 *int64                 `protobuf:"varint,139,opt,name=offer_deadline,json=offerDeadline,proto3,oneof" json:"offer_deadline,omitempty"`
+	MaxCommonClients              *int64                 `protobuf:"varint,140,opt,name=max_common_clients,json=maxCommonClients,proto3,oneof" json:"max_common_clients,omitempty"`
+	MaxPersonalClients            *int64                 `protobuf:"varint,141,opt,name=max_personal_clients,json=maxPersonalClients,proto3,oneof" json:"max_personal_clients,omitempty"`
 	unknownFields                 protoimpl.UnknownFields
 	sizeCache                     protoimpl.SizeCache
 }
@@ -385,11 +387,25 @@ func (x *InproxyBroker) GetOfferDeadline() int64 {
 	return 0
 }
 
+func (x *InproxyBroker) GetMaxCommonClients() int64 {
+	if x != nil && x.MaxCommonClients != nil {
+		return *x.MaxCommonClients
+	}
+	return 0
+}
+
+func (x *InproxyBroker) GetMaxPersonalClients() int64 {
+	if x != nil && x.MaxPersonalClients != nil {
+		return *x.MaxPersonalClients
+	}
+	return 0
+}
+
 var File_ca_psiphon_psiphond_inproxy_broker_proto protoreflect.FileDescriptor
 
 const file_ca_psiphon_psiphond_inproxy_broker_proto_rawDesc = "" +
 	"\n" +
-	"(ca.psiphon.psiphond/inproxy_broker.proto\x12\x13ca.psiphon.psiphond\x1a%ca.psiphon.psiphond/base_params.proto\"\xd3\x16\n" +
+	"(ca.psiphon.psiphond/inproxy_broker.proto\x12\x13ca.psiphon.psiphond\x1a%ca.psiphon.psiphond/base_params.proto\"\xef\x17\n" +
 	"\rInproxyBroker\x12E\n" +
 	"\vbase_params\x18\x01 \x01(\v2\x1f.ca.psiphon.psiphond.BaseParamsH\x00R\n" +
 	"baseParams\x88\x01\x01\x12=\n" +
@@ -435,7 +451,9 @@ const file_ca_psiphon_psiphond_inproxy_broker_proto_rawDesc = "" +
 	"\ttimed_out\x18\x88\x01 \x01(\bH!R\btimedOut\x88\x01\x01\x12=\n" +
 	"\x18meek_server_http_version\x18\x89\x01 \x01(\tH\"R\x15meekServerHttpVersion\x88\x01\x01\x126\n" +
 	"\x14pending_answers_size\x18\x8a\x01 \x01(\x03H#R\x12pendingAnswersSize\x88\x01\x01\x12+\n" +
-	"\x0eoffer_deadline\x18\x8b\x01 \x01(\x03H$R\rofferDeadline\x88\x01\x01B\x0e\n" +
+	"\x0eoffer_deadline\x18\x8b\x01 \x01(\x03H$R\rofferDeadline\x88\x01\x01\x122\n" +
+	"\x12max_common_clients\x18\x8c\x01 \x01(\x03H%R\x10maxCommonClients\x88\x01\x01\x126\n" +
+	"\x14max_personal_clients\x18\x8d\x01 \x01(\x03H&R\x12maxPersonalClients\x88\x01\x01B\x0e\n" +
 	"\f_base_paramsB\x1b\n" +
 	"\x19_announcement_match_indexB\x1a\n" +
 	"\x18_announcement_queue_sizeB\x0f\n" +
@@ -475,7 +493,9 @@ const file_ca_psiphon_psiphond_inproxy_broker_proto_rawDesc = "" +
 	"_timed_outB\x1b\n" +
 	"\x19_meek_server_http_versionB\x17\n" +
 	"\x15_pending_answers_sizeB\x11\n" +
-	"\x0f_offer_deadlineBHZFgithub.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/psiphondb\x06proto3"
+	"\x0f_offer_deadlineB\x15\n" +
+	"\x13_max_common_clientsB\x17\n" +
+	"\x15_max_personal_clientsBHZFgithub.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/psiphondb\x06proto3"
 
 var (
 	file_ca_psiphon_psiphond_inproxy_broker_proto_rawDescOnce sync.Once

psiphon/server/pb/psiphond/inproxy_dial_params.pb.go

@@ -112,6 +112,8 @@ type InproxyDialParams struct {
 	InproxyWebrtcStunServer_RFC5780ResolvedIpAddress *string                `protobuf:"bytes,87,opt,name=inproxy_webrtc_stun_server_RFC5780_resolved_ip_address,json=inproxyWebrtcStunServerRFC5780ResolvedIpAddress,proto3,oneof" json:"inproxy_webrtc_stun_server_RFC5780_resolved_ip_address,omitempty"`
 	InproxyWebrtcStunServerResolvedIpAddress         *string                `protobuf:"bytes,88,opt,name=inproxy_webrtc_stun_server_resolved_ip_address,json=inproxyWebrtcStunServerResolvedIpAddress,proto3,oneof" json:"inproxy_webrtc_stun_server_resolved_ip_address,omitempty"`
 	InproxyWebrtcUseMediaStreams                     *bool                  `protobuf:"varint,89,opt,name=inproxy_webrtc_use_media_streams,json=inproxyWebrtcUseMediaStreams,proto3,oneof" json:"inproxy_webrtc_use_media_streams,omitempty"`
+	InproxyProxyMaxCommonClients                     *int64                 `protobuf:"varint,90,opt,name=inproxy_proxy_max_common_clients,json=inproxyProxyMaxCommonClients,proto3,oneof" json:"inproxy_proxy_max_common_clients,omitempty"`
+	InproxyProxyMaxPersonalClients                   *int64                 `protobuf:"varint,91,opt,name=inproxy_proxy_max_personal_clients,json=inproxyProxyMaxPersonalClients,proto3,oneof" json:"inproxy_proxy_max_personal_clients,omitempty"`
 	unknownFields                                    protoimpl.UnknownFields
 	sizeCache                                        protoimpl.SizeCache
 }
@@ -769,11 +771,25 @@ func (x *InproxyDialParams) GetInproxyWebrtcUseMediaStreams() bool {
 	return false
 }
 
+func (x *InproxyDialParams) GetInproxyProxyMaxCommonClients() int64 {
+	if x != nil && x.InproxyProxyMaxCommonClients != nil {
+		return *x.InproxyProxyMaxCommonClients
+	}
+	return 0
+}
+
+func (x *InproxyDialParams) GetInproxyProxyMaxPersonalClients() int64 {
+	if x != nil && x.InproxyProxyMaxPersonalClients != nil {
+		return *x.InproxyProxyMaxPersonalClients
+	}
+	return 0
+}
+
 var File_ca_psiphon_psiphond_inproxy_dial_params_proto protoreflect.FileDescriptor
 
 const file_ca_psiphon_psiphond_inproxy_dial_params_proto_rawDesc = "" +
 	"\n" +
-	"-ca.psiphon.psiphond/inproxy_dial_params.proto\x12\x13ca.psiphon.psiphond\"\xf1M\n" +
+	"-ca.psiphon.psiphond/inproxy_dial_params.proto\x12\x13ca.psiphon.psiphond\"\xdbO\n" +
 	"\x11InproxyDialParams\x12>\n" +
 	"\x19inproxy_broker_client_bpf\x18\x01 \x01(\tH\x00R\x16inproxyBrokerClientBpf\x88\x01\x01\x12B\n" +
 	"\x1binproxy_broker_dial_address\x18\x02 \x01(\tH\x01R\x18inproxyBrokerDialAddress\x88\x01\x01\x12@\n" +
@@ -865,7 +881,9 @@ const file_ca_psiphon_psiphond_inproxy_dial_params_proto_rawDesc = "" +
 	"\"inproxy_webrtc_stun_server_RFC5780\x18V \x01(\tHRR\x1einproxyWebrtcStunServerRFC5780\x88\x01\x01\x12t\n" +
 	"6inproxy_webrtc_stun_server_RFC5780_resolved_ip_address\x18W \x01(\tHSR/inproxyWebrtcStunServerRFC5780ResolvedIpAddress\x88\x01\x01\x12e\n" +
 	".inproxy_webrtc_stun_server_resolved_ip_address\x18X \x01(\tHTR(inproxyWebrtcStunServerResolvedIpAddress\x88\x01\x01\x12K\n" +
-	" inproxy_webrtc_use_media_streams\x18Y \x01(\bHUR\x1cinproxyWebrtcUseMediaStreams\x88\x01\x01B\x1c\n" +
+	" inproxy_webrtc_use_media_streams\x18Y \x01(\bHUR\x1cinproxyWebrtcUseMediaStreams\x88\x01\x01\x12K\n" +
+	" inproxy_proxy_max_common_clients\x18Z \x01(\x03HVR\x1cinproxyProxyMaxCommonClients\x88\x01\x01\x12O\n" +
+	"\"inproxy_proxy_max_personal_clients\x18[ \x01(\x03HWR\x1einproxyProxyMaxPersonalClients\x88\x01\x01B\x1c\n" +
 	"\x1a_inproxy_broker_client_bpfB\x1e\n" +
 	"\x1c_inproxy_broker_dial_addressB\x1d\n" +
 	"\x1b_inproxy_broker_dns_attemptB\x1f\n" +
@@ -951,7 +969,9 @@ const file_ca_psiphon_psiphond_inproxy_dial_params_proto_rawDesc = "" +
 	"#_inproxy_webrtc_stun_server_RFC5780B9\n" +
 	"7_inproxy_webrtc_stun_server_RFC5780_resolved_ip_addressB1\n" +
 	"/_inproxy_webrtc_stun_server_resolved_ip_addressB#\n" +
-	"!_inproxy_webrtc_use_media_streamsBHZFgithub.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/psiphondb\x06proto3"
+	"!_inproxy_webrtc_use_media_streamsB#\n" +
+	"!_inproxy_proxy_max_common_clientsB%\n" +
+	"#_inproxy_proxy_max_personal_clientsBHZFgithub.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/server/pb/psiphondb\x06proto3"
 
 var (
 	file_ca_psiphon_psiphond_inproxy_dial_params_proto_rawDescOnce sync.Once

psiphon/server/proto/ca.psiphon.psiphond/inproxy_broker.proto

@@ -51,4 +51,6 @@ message InproxyBroker {
     optional string meek_server_http_version = 137;
     optional int64 pending_answers_size = 138;
     optional int64 offer_deadline = 139;
+    optional int64 max_common_clients = 140;
+    optional int64 max_personal_clients = 141;
 }

psiphon/server/proto/ca.psiphon.psiphond/inproxy_dial_params.proto

@@ -94,5 +94,6 @@ message InproxyDialParams {
     optional string inproxy_webrtc_stun_server_RFC5780_resolved_ip_address = 87;
     optional string inproxy_webrtc_stun_server_resolved_ip_address = 88;
     optional bool inproxy_webrtc_use_media_streams = 89;
+    optional int64 inproxy_proxy_max_common_clients = 90;
+    optional int64 inproxy_proxy_max_personal_clients = 91;
 }
-

psiphon/server/server_test.go

@@ -3277,6 +3277,8 @@ func checkExpectedServerTunnelLogFields(
 			"inproxy_proxy_network_type",
 			"inproxy_proxy_protocol_version",
 			"inproxy_proxy_nat_type",
+			"inproxy_proxy_max_common_clients",
+			"inproxy_proxy_max_personal_clients",
 			"inproxy_proxy_max_clients",
 			"inproxy_proxy_connecting_clients",
 			"inproxy_proxy_connected_clients",