Use int64 for all protobuf integer fields

psiphon/server/pb/psiphond/dial_params.pb.go

@@ -68,7 +68,7 @@ type DialParams struct {
 	ServerReplayFragmentation         *bool                  `protobuf:"varint,42,opt,name=server_replay_fragmentation,json=serverReplayFragmentation,proto3,oneof" json:"server_replay_fragmentation,omitempty"`
 	ServerReplayPacketManipulation    *bool                  `protobuf:"varint,43,opt,name=server_replay_packet_manipulation,json=serverReplayPacketManipulation,proto3,oneof" json:"server_replay_packet_manipulation,omitempty"`
 	ServerEntryValid                  *bool                  `protobuf:"varint,44,opt,name=server_entry_valid,json=serverEntryValid,proto3,oneof" json:"server_entry_valid,omitempty"`
-	CandidateNumber                   *int32                 `protobuf:"varint,45,opt,name=candidate_number,json=candidateNumber,proto3,oneof" json:"candidate_number,omitempty"`
+	CandidateNumber                   *int64                 `protobuf:"varint,45,opt,name=candidate_number,json=candidateNumber,proto3,oneof" json:"candidate_number,omitempty"`
 	IsReplay                          *bool                  `protobuf:"varint,46,opt,name=is_replay,json=isReplay,proto3,oneof" json:"is_replay,omitempty"`
 	DialPortNumber                    *int64                 `protobuf:"varint,47,opt,name=dial_port_number,json=dialPortNumber,proto3,oneof" json:"dial_port_number,omitempty"`
 	DialDuration                      *int64                 `protobuf:"varint,48,opt,name=dial_duration,json=dialDuration,proto3,oneof" json:"dial_duration,omitempty"`
@@ -449,7 +449,7 @@ func (x *DialParams) GetServerEntryValid() bool {
 	return false
 }
 
-func (x *DialParams) GetCandidateNumber() int32 {
+func (x *DialParams) GetCandidateNumber() int64 {
 	if x != nil && x.CandidateNumber != nil {
 		return *x.CandidateNumber
 	}
@@ -778,7 +778,7 @@ const file_ca_psiphon_psiphond_dial_params_proto_rawDesc = "" +
 	"\x1bserver_replay_fragmentation\x18* \x01(\bH)R\x19serverReplayFragmentation\x88\x01\x01\x12N\n" +
 	"!server_replay_packet_manipulation\x18+ \x01(\bH*R\x1eserverReplayPacketManipulation\x88\x01\x01\x121\n" +
 	"\x12server_entry_valid\x18, \x01(\bH+R\x10serverEntryValid\x88\x01\x01\x12.\n" +
-	"\x10candidate_number\x18- \x01(\x05H,R\x0fcandidateNumber\x88\x01\x01\x12 \n" +
+	"\x10candidate_number\x18- \x01(\x03H,R\x0fcandidateNumber\x88\x01\x01\x12 \n" +
 	"\tis_replay\x18. \x01(\bH-R\bisReplay\x88\x01\x01\x12-\n" +
 	"\x10dial_port_number\x18/ \x01(\x03H.R\x0edialPortNumber\x88\x01\x01\x12(\n" +
 	"\rdial_duration\x180 \x01(\x03H/R\fdialDuration\x88\x01\x01\x125\n" +

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

@@ -24,8 +24,8 @@ const (
 type InproxyBroker struct {
 	state                         protoimpl.MessageState `protogen:"open.v1"`
 	BaseParams                    *BaseParams            `protobuf:"bytes,1,opt,name=base_params,json=baseParams,proto3,oneof" json:"base_params,omitempty"`
-	AnnouncementMatchIndex        *int32                 `protobuf:"varint,100,opt,name=announcement_match_index,json=announcementMatchIndex,proto3,oneof" json:"announcement_match_index,omitempty"`
-	AnnouncementQueueSize         *int32                 `protobuf:"varint,101,opt,name=announcement_queue_size,json=announcementQueueSize,proto3,oneof" json:"announcement_queue_size,omitempty"`
+	AnnouncementMatchIndex        *int64                 `protobuf:"varint,100,opt,name=announcement_match_index,json=announcementMatchIndex,proto3,oneof" json:"announcement_match_index,omitempty"`
+	AnnouncementQueueSize         *int64                 `protobuf:"varint,101,opt,name=announcement_queue_size,json=announcementQueueSize,proto3,oneof" json:"announcement_queue_size,omitempty"`
 	AnswerError                   *string                `protobuf:"bytes,102,opt,name=answer_error,json=answerError,proto3,oneof" json:"answer_error,omitempty"`
 	BrokerEvent                   *string                `protobuf:"bytes,103,opt,name=broker_event,json=brokerEvent,proto3,oneof" json:"broker_event,omitempty"`
 	BrokerId                      *string                `protobuf:"bytes,104,opt,name=broker_id,json=brokerId,proto3,oneof" json:"broker_id,omitempty"`
@@ -55,7 +55,7 @@ type InproxyBroker struct {
 	PeakUpstreamBytesPerSecond    *int64                 `protobuf:"varint,128,opt,name=peak_upstream_bytes_per_second,json=peakUpstreamBytesPerSecond,proto3,oneof" json:"peak_upstream_bytes_per_second,omitempty"`
 	PortMappingTypes              []string               `protobuf:"bytes,129,rep,name=port_mapping_types,json=portMappingTypes,proto3" json:"port_mapping_types,omitempty"`
 	PreferredNatMatch             *bool                  `protobuf:"varint,130,opt,name=preferred_nat_match,json=preferredNatMatch,proto3,oneof" json:"preferred_nat_match,omitempty"`
-	ProtocolVersion               *int32                 `protobuf:"varint,131,opt,name=protocol_version,json=protocolVersion,proto3,oneof" json:"protocol_version,omitempty"`
+	ProtocolVersion               *int64                 `protobuf:"varint,131,opt,name=protocol_version,json=protocolVersion,proto3,oneof" json:"protocol_version,omitempty"`
 	ProxyId                       *string                `protobuf:"bytes,132,opt,name=proxy_id,json=proxyId,proto3,oneof" json:"proxy_id,omitempty"`
 	ProxyNatType                  *string                `protobuf:"bytes,133,opt,name=proxy_nat_type,json=proxyNatType,proto3,oneof" json:"proxy_nat_type,omitempty"`
 	ProxyPortMappingTypes         []string               `protobuf:"bytes,134,rep,name=proxy_port_mapping_types,json=proxyPortMappingTypes,proto3" json:"proxy_port_mapping_types,omitempty"`
@@ -105,14 +105,14 @@ func (x *InproxyBroker) GetBaseParams() *BaseParams {
 	return nil
 }
 
-func (x *InproxyBroker) GetAnnouncementMatchIndex() int32 {
+func (x *InproxyBroker) GetAnnouncementMatchIndex() int64 {
 	if x != nil && x.AnnouncementMatchIndex != nil {
 		return *x.AnnouncementMatchIndex
 	}
 	return 0
 }
 
-func (x *InproxyBroker) GetAnnouncementQueueSize() int32 {
+func (x *InproxyBroker) GetAnnouncementQueueSize() int64 {
 	if x != nil && x.AnnouncementQueueSize != nil {
 		return *x.AnnouncementQueueSize
 	}
@@ -322,7 +322,7 @@ func (x *InproxyBroker) GetPreferredNatMatch() bool {
 	return false
 }
 
-func (x *InproxyBroker) GetProtocolVersion() int32 {
+func (x *InproxyBroker) GetProtocolVersion() int64 {
 	if x != nil && x.ProtocolVersion != nil {
 		return *x.ProtocolVersion
 	}
@@ -393,8 +393,8 @@ const file_ca_psiphon_psiphond_inproxy_broker_proto_rawDesc = "" +
 	"\rInproxyBroker\x12E\n" +
 	"\vbase_params\x18\x01 \x01(\v2\x1f.ca.psiphon.psiphond.BaseParamsH\x00R\n" +
 	"baseParams\x88\x01\x01\x12=\n" +
-	"\x18announcement_match_index\x18d \x01(\x05H\x01R\x16announcementMatchIndex\x88\x01\x01\x12;\n" +
-	"\x17announcement_queue_size\x18e \x01(\x05H\x02R\x15announcementQueueSize\x88\x01\x01\x12&\n" +
+	"\x18announcement_match_index\x18d \x01(\x03H\x01R\x16announcementMatchIndex\x88\x01\x01\x12;\n" +
+	"\x17announcement_queue_size\x18e \x01(\x03H\x02R\x15announcementQueueSize\x88\x01\x01\x12&\n" +
 	"\fanswer_error\x18f \x01(\tH\x03R\vanswerError\x88\x01\x01\x12&\n" +
 	"\fbroker_event\x18g \x01(\tH\x04R\vbrokerEvent\x88\x01\x01\x12 \n" +
 	"\tbroker_id\x18h \x01(\tH\x05R\bbrokerId\x88\x01\x01\x120\n" +
@@ -427,7 +427,7 @@ const file_ca_psiphon_psiphond_inproxy_broker_proto_rawDesc = "" +
 	"\x1epeak_upstream_bytes_per_second\x18\x80\x01 \x01(\x03H\x1bR\x1apeakUpstreamBytesPerSecond\x88\x01\x01\x12-\n" +
 	"\x12port_mapping_types\x18\x81\x01 \x03(\tR\x10portMappingTypes\x124\n" +
 	"\x13preferred_nat_match\x18\x82\x01 \x01(\bH\x1cR\x11preferredNatMatch\x88\x01\x01\x12/\n" +
-	"\x10protocol_version\x18\x83\x01 \x01(\x05H\x1dR\x0fprotocolVersion\x88\x01\x01\x12\x1f\n" +
+	"\x10protocol_version\x18\x83\x01 \x01(\x03H\x1dR\x0fprotocolVersion\x88\x01\x01\x12\x1f\n" +
 	"\bproxy_id\x18\x84\x01 \x01(\tH\x1eR\aproxyId\x88\x01\x01\x12*\n" +
 	"\x0eproxy_nat_type\x18\x85\x01 \x01(\tH\x1fR\fproxyNatType\x88\x01\x01\x128\n" +
 	"\x18proxy_port_mapping_types\x18\x86\x01 \x03(\tR\x15proxyPortMappingTypes\x12!\n" +

psiphon/server/pb/psiphond/irregular_tunnel.pb.go

@@ -34,7 +34,7 @@ type IrregularTunnel struct {
 	DuplicateElapsedTimeMs             *int64                 `protobuf:"varint,107,opt,name=duplicate_elapsed_time_ms,json=duplicateElapsedTimeMs,proto3,oneof" json:"duplicate_elapsed_time_ms,omitempty"`
 	DuplicateSeed                      *string                `protobuf:"bytes,108,opt,name=duplicate_seed,json=duplicateSeed,proto3,oneof" json:"duplicate_seed,omitempty"`
 	DuplicateSeedType                  *string                `protobuf:"bytes,109,opt,name=duplicate_seed_type,json=duplicateSeedType,proto3,oneof" json:"duplicate_seed_type,omitempty"`
-	ListenerPortNumber                 *uint32                `protobuf:"varint,110,opt,name=listener_port_number,json=listenerPortNumber,proto3,oneof" json:"listener_port_number,omitempty"`
+	ListenerPortNumber                 *int64                 `protobuf:"varint,110,opt,name=listener_port_number,json=listenerPortNumber,proto3,oneof" json:"listener_port_number,omitempty"`
 	ListenerProtocol                   *string                `protobuf:"bytes,111,opt,name=listener_protocol,json=listenerProtocol,proto3,oneof" json:"listener_protocol,omitempty"`
 	TunnelError                        *string                `protobuf:"bytes,112,opt,name=tunnel_error,json=tunnelError,proto3,oneof" json:"tunnel_error,omitempty"`
 	unknownFields                      protoimpl.UnknownFields
@@ -148,7 +148,7 @@ func (x *IrregularTunnel) GetDuplicateSeedType() string {
 	return ""
 }
 
-func (x *IrregularTunnel) GetListenerPortNumber() uint32 {
+func (x *IrregularTunnel) GetListenerPortNumber() int64 {
 	if x != nil && x.ListenerPortNumber != nil {
 		return *x.ListenerPortNumber
 	}
@@ -189,7 +189,7 @@ const file_ca_psiphon_psiphond_irregular_tunnel_proto_rawDesc = "" +
 	"\x0eduplicate_seed\x18l \x01(\tH\tR\rduplicateSeed\x88\x01\x01\x123\n" +
 	"\x13duplicate_seed_type\x18m \x01(\tH\n" +
 	"R\x11duplicateSeedType\x88\x01\x01\x125\n" +
-	"\x14listener_port_number\x18n \x01(\rH\vR\x12listenerPortNumber\x88\x01\x01\x120\n" +
+	"\x14listener_port_number\x18n \x01(\x03H\vR\x12listenerPortNumber\x88\x01\x01\x120\n" +
 	"\x11listener_protocol\x18o \x01(\tH\fR\x10listenerProtocol\x88\x01\x01\x12&\n" +
 	"\ftunnel_error\x18p \x01(\tH\rR\vtunnelError\x88\x01\x01B\x0e\n" +
 	"\f_base_paramsB%\n" +

psiphon/server/pb/psiphond/server_load.pb.go

@@ -169,20 +169,20 @@ func (x *ServerLoadDNS) GetDnsFailedDuration() int64 {
 type ServerLoad struct {
 	state                                   protoimpl.MessageState `protogen:"open.v1"`
 	CpuPercent                              *float64               `protobuf:"fixed64,100,opt,name=cpu_percent,json=cpuPercent,proto3,oneof" json:"cpu_percent,omitempty"`
-	HeapAlloc                               *uint64                `protobuf:"varint,101,opt,name=heap_alloc,json=heapAlloc,proto3,oneof" json:"heap_alloc,omitempty"`
-	HeapIdle                                *uint64                `protobuf:"varint,102,opt,name=heap_idle,json=heapIdle,proto3,oneof" json:"heap_idle,omitempty"`
-	HeapInuse                               *uint64                `protobuf:"varint,103,opt,name=heap_inuse,json=heapInuse,proto3,oneof" json:"heap_inuse,omitempty"`
-	HeapObjects                             *uint64                `protobuf:"varint,104,opt,name=heap_objects,json=heapObjects,proto3,oneof" json:"heap_objects,omitempty"`
-	HeapReleased                            *uint64                `protobuf:"varint,105,opt,name=heap_released,json=heapReleased,proto3,oneof" json:"heap_released,omitempty"`
-	HeapSys                                 *uint64                `protobuf:"varint,106,opt,name=heap_sys,json=heapSys,proto3,oneof" json:"heap_sys,omitempty"`
+	HeapAlloc                               *int64                 `protobuf:"varint,101,opt,name=heap_alloc,json=heapAlloc,proto3,oneof" json:"heap_alloc,omitempty"`
+	HeapIdle                                *int64                 `protobuf:"varint,102,opt,name=heap_idle,json=heapIdle,proto3,oneof" json:"heap_idle,omitempty"`
+	HeapInuse                               *int64                 `protobuf:"varint,103,opt,name=heap_inuse,json=heapInuse,proto3,oneof" json:"heap_inuse,omitempty"`
+	HeapObjects                             *int64                 `protobuf:"varint,104,opt,name=heap_objects,json=heapObjects,proto3,oneof" json:"heap_objects,omitempty"`
+	HeapReleased                            *int64                 `protobuf:"varint,105,opt,name=heap_released,json=heapReleased,proto3,oneof" json:"heap_released,omitempty"`
+	HeapSys                                 *int64                 `protobuf:"varint,106,opt,name=heap_sys,json=heapSys,proto3,oneof" json:"heap_sys,omitempty"`
 	NetworkBytesReceived                    *int64                 `protobuf:"varint,107,opt,name=network_bytes_received,json=networkBytesReceived,proto3,oneof" json:"network_bytes_received,omitempty"`
 	NetworkBytesSent                        *int64                 `protobuf:"varint,108,opt,name=network_bytes_sent,json=networkBytesSent,proto3,oneof" json:"network_bytes_sent,omitempty"`
 	EstablishTunnels                        *bool                  `protobuf:"varint,109,opt,name=establish_tunnels,json=establishTunnels,proto3,oneof" json:"establish_tunnels,omitempty"`
 	EstablishTunnelsLimitedCount            *int64                 `protobuf:"varint,110,opt,name=establish_tunnels_limited_count,json=establishTunnelsLimitedCount,proto3,oneof" json:"establish_tunnels_limited_count,omitempty"`
 	LastGc                                  *timestamppb.Timestamp `protobuf:"bytes,111,opt,name=last_gc,json=lastGc,proto3,oneof" json:"last_gc,omitempty"`
-	NumForcedGc                             *uint32                `protobuf:"varint,112,opt,name=num_forced_gc,json=numForcedGc,proto3,oneof" json:"num_forced_gc,omitempty"`
-	NumGc                                   *uint32                `protobuf:"varint,113,opt,name=num_gc,json=numGc,proto3,oneof" json:"num_gc,omitempty"`
-	NumGoroutine                            *uint32                `protobuf:"varint,114,opt,name=num_goroutine,json=numGoroutine,proto3,oneof" json:"num_goroutine,omitempty"`
+	NumForcedGc                             *int64                 `protobuf:"varint,112,opt,name=num_forced_gc,json=numForcedGc,proto3,oneof" json:"num_forced_gc,omitempty"`
+	NumGc                                   *int64                 `protobuf:"varint,113,opt,name=num_gc,json=numGc,proto3,oneof" json:"num_gc,omitempty"`
+	NumGoroutine                            *int64                 `protobuf:"varint,114,opt,name=num_goroutine,json=numGoroutine,proto3,oneof" json:"num_goroutine,omitempty"`
 	ReplayDeleteReplayCount                 *int64                 `protobuf:"varint,115,opt,name=replay_delete_replay_count,json=replayDeleteReplayCount,proto3,oneof" json:"replay_delete_replay_count,omitempty"`
 	ReplayFailedReplayCount                 *int64                 `protobuf:"varint,116,opt,name=replay_failed_replay_count,json=replayFailedReplayCount,proto3,oneof" json:"replay_failed_replay_count,omitempty"`
 	ReplayGetReplayHitCount                 *int64                 `protobuf:"varint,117,opt,name=replay_get_replay_hit_count,json=replayGetReplayHitCount,proto3,oneof" json:"replay_get_replay_hit_count,omitempty"`
@@ -254,42 +254,42 @@ func (x *ServerLoad) GetCpuPercent() float64 {
 	return 0
 }
 
-func (x *ServerLoad) GetHeapAlloc() uint64 {
+func (x *ServerLoad) GetHeapAlloc() int64 {
 	if x != nil && x.HeapAlloc != nil {
 		return *x.HeapAlloc
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetHeapIdle() uint64 {
+func (x *ServerLoad) GetHeapIdle() int64 {
 	if x != nil && x.HeapIdle != nil {
 		return *x.HeapIdle
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetHeapInuse() uint64 {
+func (x *ServerLoad) GetHeapInuse() int64 {
 	if x != nil && x.HeapInuse != nil {
 		return *x.HeapInuse
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetHeapObjects() uint64 {
+func (x *ServerLoad) GetHeapObjects() int64 {
 	if x != nil && x.HeapObjects != nil {
 		return *x.HeapObjects
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetHeapReleased() uint64 {
+func (x *ServerLoad) GetHeapReleased() int64 {
 	if x != nil && x.HeapReleased != nil {
 		return *x.HeapReleased
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetHeapSys() uint64 {
+func (x *ServerLoad) GetHeapSys() int64 {
 	if x != nil && x.HeapSys != nil {
 		return *x.HeapSys
 	}
@@ -331,21 +331,21 @@ func (x *ServerLoad) GetLastGc() *timestamppb.Timestamp {
 	return nil
 }
 
-func (x *ServerLoad) GetNumForcedGc() uint32 {
+func (x *ServerLoad) GetNumForcedGc() int64 {
 	if x != nil && x.NumForcedGc != nil {
 		return *x.NumForcedGc
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetNumGc() uint32 {
+func (x *ServerLoad) GetNumGc() int64 {
 	if x != nil && x.NumGc != nil {
 		return *x.NumGc
 	}
 	return 0
 }
 
-func (x *ServerLoad) GetNumGoroutine() uint32 {
+func (x *ServerLoad) GetNumGoroutine() int64 {
 	if x != nil && x.NumGoroutine != nil {
 		return *x.NumGoroutine
 	}
@@ -594,22 +594,22 @@ const file_ca_psiphon_psiphond_server_load_proto_rawDesc = "" +
 	"\vcpu_percent\x18d \x01(\x01H\x00R\n" +
 	"cpuPercent\x88\x01\x01\x12\"\n" +
 	"\n" +
-	"heap_alloc\x18e \x01(\x04H\x01R\theapAlloc\x88\x01\x01\x12 \n" +
-	"\theap_idle\x18f \x01(\x04H\x02R\bheapIdle\x88\x01\x01\x12\"\n" +
+	"heap_alloc\x18e \x01(\x03H\x01R\theapAlloc\x88\x01\x01\x12 \n" +
+	"\theap_idle\x18f \x01(\x03H\x02R\bheapIdle\x88\x01\x01\x12\"\n" +
 	"\n" +
-	"heap_inuse\x18g \x01(\x04H\x03R\theapInuse\x88\x01\x01\x12&\n" +
-	"\fheap_objects\x18h \x01(\x04H\x04R\vheapObjects\x88\x01\x01\x12(\n" +
-	"\rheap_released\x18i \x01(\x04H\x05R\fheapReleased\x88\x01\x01\x12\x1e\n" +
-	"\bheap_sys\x18j \x01(\x04H\x06R\aheapSys\x88\x01\x01\x129\n" +
+	"heap_inuse\x18g \x01(\x03H\x03R\theapInuse\x88\x01\x01\x12&\n" +
+	"\fheap_objects\x18h \x01(\x03H\x04R\vheapObjects\x88\x01\x01\x12(\n" +
+	"\rheap_released\x18i \x01(\x03H\x05R\fheapReleased\x88\x01\x01\x12\x1e\n" +
+	"\bheap_sys\x18j \x01(\x03H\x06R\aheapSys\x88\x01\x01\x129\n" +
 	"\x16network_bytes_received\x18k \x01(\x03H\aR\x14networkBytesReceived\x88\x01\x01\x121\n" +
 	"\x12network_bytes_sent\x18l \x01(\x03H\bR\x10networkBytesSent\x88\x01\x01\x120\n" +
 	"\x11establish_tunnels\x18m \x01(\bH\tR\x10establishTunnels\x88\x01\x01\x12J\n" +
 	"\x1festablish_tunnels_limited_count\x18n \x01(\x03H\n" +
 	"R\x1cestablishTunnelsLimitedCount\x88\x01\x01\x128\n" +
 	"\alast_gc\x18o \x01(\v2\x1a.google.protobuf.TimestampH\vR\x06lastGc\x88\x01\x01\x12'\n" +
-	"\rnum_forced_gc\x18p \x01(\rH\fR\vnumForcedGc\x88\x01\x01\x12\x1a\n" +
-	"\x06num_gc\x18q \x01(\rH\rR\x05numGc\x88\x01\x01\x12(\n" +
-	"\rnum_goroutine\x18r \x01(\rH\x0eR\fnumGoroutine\x88\x01\x01\x12@\n" +
+	"\rnum_forced_gc\x18p \x01(\x03H\fR\vnumForcedGc\x88\x01\x01\x12\x1a\n" +
+	"\x06num_gc\x18q \x01(\x03H\rR\x05numGc\x88\x01\x01\x12(\n" +
+	"\rnum_goroutine\x18r \x01(\x03H\x0eR\fnumGoroutine\x88\x01\x01\x12@\n" +
 	"\x1areplay_delete_replay_count\x18s \x01(\x03H\x0fR\x17replayDeleteReplayCount\x88\x01\x01\x12@\n" +
 	"\x1areplay_failed_replay_count\x18t \x01(\x03H\x10R\x17replayFailedReplayCount\x88\x01\x01\x12A\n" +
 	"\x1breplay_get_replay_hit_count\x18u \x01(\x03H\x11R\x17replayGetReplayHitCount\x88\x01\x01\x12C\n" +

psiphon/server/proto/ca.psiphon.psiphond/dial_params.proto

@@ -57,7 +57,7 @@ message DialParams {
     optional bool server_replay_packet_manipulation = 43;
     optional bool server_entry_valid = 44;
 
-    optional int32 candidate_number = 45;
+    optional int64 candidate_number = 45;
     optional bool is_replay = 46;
     optional int64 dial_port_number = 47;
     optional int64 dial_duration = 48;

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

@@ -11,8 +11,8 @@ message InproxyBroker {
 
     // Fields 1-99 are reserved for field groupings.
 
-    optional int32 announcement_match_index = 100;
-    optional int32 announcement_queue_size = 101;
+    optional int64 announcement_match_index = 100;
+    optional int64 announcement_queue_size = 101;
     optional string answer_error = 102;
     optional string broker_event = 103;
     optional string broker_id = 104;
@@ -42,7 +42,7 @@ message InproxyBroker {
     optional int64 peak_upstream_bytes_per_second = 128;
     repeated string port_mapping_types = 129;
     optional bool preferred_nat_match = 130;
-    optional int32 protocol_version = 131;
+    optional int64 protocol_version = 131;
     optional string proxy_id = 132;
     optional string proxy_nat_type = 133;
     repeated string proxy_port_mapping_types = 134;

psiphon/server/proto/ca.psiphon.psiphond/irregular_tunnel.proto

@@ -21,7 +21,7 @@ message IrregularTunnel {
     optional int64 duplicate_elapsed_time_ms = 107;
     optional string duplicate_seed = 108;
     optional string duplicate_seed_type = 109;
-    optional uint32 listener_port_number = 110;
+    optional int64 listener_port_number = 110;
     optional string listener_protocol = 111;
     optional string tunnel_error = 112;
 }

psiphon/server/proto/ca.psiphon.psiphond/server_load.proto

@@ -31,12 +31,12 @@ message ServerLoad {
 
   optional double cpu_percent = 100;
 
-  optional uint64 heap_alloc = 101;
-  optional uint64 heap_idle = 102;
-  optional uint64 heap_inuse = 103;
-  optional uint64 heap_objects = 104;
-  optional uint64 heap_released = 105;
-  optional uint64 heap_sys = 106;
+  optional int64 heap_alloc = 101;
+  optional int64 heap_idle = 102;
+  optional int64 heap_inuse = 103;
+  optional int64 heap_objects = 104;
+  optional int64 heap_released = 105;
+  optional int64 heap_sys = 106;
 
   optional int64 network_bytes_received = 107;
   optional int64 network_bytes_sent = 108;
@@ -45,9 +45,9 @@ message ServerLoad {
   optional int64 establish_tunnels_limited_count = 110;
 
   optional google.protobuf.Timestamp last_gc = 111;
-  optional uint32 num_forced_gc = 112;
-  optional uint32 num_gc = 113;
-  optional uint32 num_goroutine = 114;
+  optional int64 num_forced_gc = 112;
+  optional int64 num_gc = 113;
+  optional int64 num_goroutine = 114;
 
   optional int64 replay_delete_replay_count = 115;
   optional int64 replay_failed_replay_count = 116;

psiphon/server/services.go

@@ -461,15 +461,15 @@ func getRuntimeMetrics() LogFields {
 	}
 
 	return LogFields{
-		"num_goroutine": numGoroutine,
-		"heap_alloc":    memStats.HeapAlloc,
-		"heap_sys":      memStats.HeapSys,
-		"heap_idle":     memStats.HeapIdle,
-		"heap_inuse":    memStats.HeapInuse,
-		"heap_released": memStats.HeapReleased,
-		"heap_objects":  memStats.HeapObjects,
-		"num_gc":        memStats.NumGC,
-		"num_forced_gc": memStats.NumForcedGC,
+		"num_goroutine": int64(numGoroutine),
+		"heap_alloc":    int64(memStats.HeapAlloc),
+		"heap_sys":      int64(memStats.HeapSys),
+		"heap_idle":     int64(memStats.HeapIdle),
+		"heap_inuse":    int64(memStats.HeapInuse),
+		"heap_released": int64(memStats.HeapReleased),
+		"heap_objects":  int64(memStats.HeapObjects),
+		"num_gc":        int64(memStats.NumGC),
+		"num_forced_gc": int64(memStats.NumForcedGC),
 		"last_gc":       lastGC,
 	}
 }