1 files changed, 33 insertions, 25 deletions

diff --git a/src/mongo/client/dbclient_connection.cpp b/src/mongo/client/dbclient_connection.cpp
index a5a6f3005ce..6f0940faf49 100644
--- a/src/mongo/client/dbclient_connection.cpp
+++ b/src/mongo/client/dbclient_connection.cpp
@@ -342,8 +342,9 @@ Status DBClientConnection::connect(const HostAndPort& serverAddress, StringData
         rpc::validateWireVersion(WireSpec::instance().outgoing, swProtocolSet.getValue().version);
     if (!validateStatus.isOK()) {
         LOGV2_WARNING(20126,
-                      "remote host has incompatible wire version: {validateStatus}",
-                      "validateStatus"_attr = validateStatus);
+                      "Remote host has incompatible wire version: {error}",
+                      "Remote host has incompatible wire version",
+                      "error"_attr = validateStatus);
 
         return validateStatus;
     }
@@ -426,7 +427,11 @@ Status DBClientConnection::connectSocketOnly(const HostAndPort& serverAddress) {
     _lastConnectivityCheck = Date_t::now();
     _session->setTimeout(_socketTimeout);
     _session->setTags(_tagMask);
-    LOGV2_DEBUG(20119, 1, "connected to server {}", ""_attr = toString());
+    LOGV2_DEBUG(20119,
+                1,
+                "Connected to host {connString}",
+                "Connected to host",
+                "connString"_attr = toString());
     return Status::OK();
 }
 
@@ -555,17 +560,19 @@ void DBClientConnection::_checkConnection() {
 
     LOGV2_DEBUG(20120,
                 logSeverityV1toV2(_logLevel).toInt(),
-                "trying reconnect to {}",
-                ""_attr = toString());
+                "Trying to reconnect to {connString}",
+                "Trying to reconnnect",
+                "connString"_attr = toString());
     string errmsg;
     auto connectStatus = connect(_serverAddress, _applicationName);
     if (!connectStatus.isOK()) {
         _markFailed(kSetFlag);
         LOGV2_DEBUG(20121,
                     logSeverityV1toV2(_logLevel).toInt(),
-                    "reconnect {} failed {errmsg}",
-                    ""_attr = toString(),
-                    "errmsg"_attr = errmsg);
+                    "Reconnect attempt to {connString} failed: {reason}",
+                    "Reconnect attempt failed",
+                    "connString"_attr = toString(),
+                    "error"_attr = errmsg);
         if (connectStatus == ErrorCodes::IncompatibleCatalogManager) {
             uassertStatusOK(connectStatus);  // Will always throw
         } else {
@@ -573,8 +580,11 @@ void DBClientConnection::_checkConnection() {
         }
     }
 
-    LOGV2_DEBUG(
-        20122, logSeverityV1toV2(_logLevel).toInt(), "reconnect {} ok", ""_attr = toString());
+    LOGV2_DEBUG(20122,
+                logSeverityV1toV2(_logLevel).toInt(),
+                "Reconnected to {connString}",
+                "Reconnected",
+                "connString"_attr = toString());
     if (_internalAuthOnReconnect) {
         uassertStatusOK(authenticateInternalUser());
     } else {
@@ -584,14 +594,11 @@ void DBClientConnection::_checkConnection() {
             } catch (ExceptionFor<ErrorCodes::AuthenticationFailed>& ex) {
                 LOGV2_DEBUG(20123,
                             logSeverityV1toV2(_logLevel).toInt(),
-                            "reconnect: auth failed "
-                            "{kv_second_auth_getSaslCommandUserDBFieldName}{kv_second_auth_"
-                            "getSaslCommandUserFieldName} {ex_what}",
-                            "kv_second_auth_getSaslCommandUserDBFieldName"_attr =
-                                kv.second[auth::getSaslCommandUserDBFieldName()],
-                            "kv_second_auth_getSaslCommandUserFieldName"_attr =
-                                kv.second[auth::getSaslCommandUserFieldName()],
-                            "ex_what"_attr = ex.what());
+                            "Reconnect: auth failed for on {db} using {user}: {reason}",
+                            "Reconnect: auth failed",
+                            "db"_attr = kv.second[auth::getSaslCommandUserDBFieldName()],
+                            "user"_attr = kv.second[auth::getSaslCommandUserFieldName()],
+                            "error"_attr = ex.what());
             }
         }
     }
@@ -747,9 +754,10 @@ bool DBClientConnection::call(Message& toSend,
     auto sinkStatus = _session->sinkMessage(swm.getValue());
     if (!sinkStatus.isOK()) {
         LOGV2(20124,
-              "DBClientConnection failed to send message to {getServerAddress} - {sinkStatus}",
-              "getServerAddress"_attr = getServerAddress(),
-              "sinkStatus"_attr = redact(sinkStatus));
+              "DBClientConnection failed to send message to {connString}: {error}",
+              "DBClientConnection failed to send message",
+              "connString"_attr = getServerAddress(),
+              "error"_attr = redact(sinkStatus));
         return maybeThrow(sinkStatus);
     }
 
@@ -758,10 +766,10 @@ bool DBClientConnection::call(Message& toSend,
         response = std::move(swm.getValue());
     } else {
         LOGV2(20125,
-              "DBClientConnection failed to receive message from {getServerAddress} - "
-              "{swm_getStatus}",
-              "getServerAddress"_attr = getServerAddress(),
-              "swm_getStatus"_attr = redact(swm.getStatus()));
+              "DBClientConnection failed to receive message from {connString}: {error}",
+              "DBClientConnection failed to receive message",
+              "connString"_attr = getServerAddress(),
+              "error"_attr = redact(swm.getStatus()));
         return maybeThrow(swm.getStatus());
     }