Add server_tunnel.tunnel_id

psiphon/common/protocol/protocol.go

@@ -82,6 +82,8 @@ const (
 
 	PSIPHON_API_CLIENT_SESSION_ID_LENGTH = 16
 
+	PSIPHON_API_TUNNEL_ID_LENGTH = 16
+
 	PSIPHON_API_PROTOCOL_SSH  = "ssh"
 	PSIPHON_API_PROTOCOL_WEB  = "web"
 	PSIPHON_API_ENCODING_CBOR = "cbor"

psiphon/server/server_test.go

@@ -2347,6 +2347,7 @@ func checkExpectedServerTunnelLogFields(
 
 	for _, name := range []string{
 		"host_id",
+		"tunnel_id",
 		"start_time",
 		"duration",
 		"session_id",

psiphon/server/tunnelServer.go

@@ -3563,6 +3563,8 @@ func (sshClient *sshClient) logTunnel(additionalMetrics []LogFields) {
 		sshClient.handshakeState.apiParams,
 		serverTunnelStatParams)
 
+	logFields["tunnel_id"] = base64.RawURLEncoding.EncodeToString(prng.Bytes(protocol.PSIPHON_API_TUNNEL_ID_LENGTH))
+
 	if sshClient.isInproxyTunnelProtocol {
 		sshClient.peerGeoIPData.SetLogFieldsWithPrefix("", "inproxy_proxy", logFields)
 		logFields.Add(