RUST-1844 Consolidate server ID fields in ConnectionInfo (#1041)

Author: isabelatkinson

src/cmap/conn.rs

@@ -46,14 +46,7 @@ pub struct ConnectionInfo {
 
     /// A server-generated identifier that uniquely identifies the connection. Available on server
     /// versions 4.2+. This may be used to correlate driver connections with server logs.
-    /// If the connection ID sent by the server is too large for an i32, this will be a truncated
-    /// value.
-    pub server_id: Option<i32>,
-
-    /// A server-generated identifier that uniquely identifies the connection. Available on server
-    /// versions 4.2+. This may be used to correlate driver connections with server logs. This
-    /// value will not be truncated and should be used rather than `server_id`.
-    pub server_id_i64: Option<i64>,
+    pub server_id: Option<i64>,
 
     /// The address that the connection is connected to.
     pub address: ServerAddress,
@@ -188,8 +181,7 @@ impl Connection {
     pub(crate) fn info(&self) -> ConnectionInfo {
         ConnectionInfo {
             id: self.id,
-            server_id: self.server_id.map(|value| value as i32),
-            server_id_i64: self.server_id,
+            server_id: self.server_id,
             address: self.address.clone(),
         }
     }