Revert "SERVER-27750 Attach LogicalTimeMetadata to globalConnPool and shardConnectionPool"

This reverts commit 34dbe2a42d1db621f16555878b57f48efb30cc28.

4 files changed, 8 insertions, 7 deletions

diff --git a/src/mongo/executor/network_interface_asio.cpp b/src/mongo/executor/network_interface_asio.cpp
index d60bc787731..8fb4733bbb6 100644
--- a/src/mongo/executor/network_interface_asio.cpp
+++ b/src/mongo/executor/network_interface_asio.cpp
@@ -233,6 +233,7 @@ Status attachMetadataIfNeeded(RemoteCommandRequest& request,
         auto writeStatus = callNoexcept(*metadataHook,
                                         &rpc::EgressMetadataHook::writeRequestMetadata,
                                         request.opCtx,
+                                        request.target,
                                         &augmentedBob);
         if (!writeStatus.isOK()) {
             return writeStatus;
diff --git a/src/mongo/executor/network_interface_asio_command.cpp b/src/mongo/executor/network_interface_asio_command.cpp
index 9498c292b22..c72a7b74505 100644
--- a/src/mongo/executor/network_interface_asio_command.cpp
+++ b/src/mongo/executor/network_interface_asio_command.cpp
@@ -159,10 +159,8 @@ ResponseStatus decodeRPC(Message* received,
 
         // Handle incoming reply metadata.
         if (metadataHook) {
-            auto listenStatus = callNoexcept(*metadataHook,
-                                             &rpc::EgressMetadataHook::readReplyMetadata,
-                                             source.toString(),
-                                             replyMetadata);
+            auto listenStatus = callNoexcept(
+                *metadataHook, &rpc::EgressMetadataHook::readReplyMetadata, source, replyMetadata);
             if (!listenStatus.isOK()) {
                 return {listenStatus, elapsed};
             }
diff --git a/src/mongo/executor/network_interface_asio_test.cpp b/src/mongo/executor/network_interface_asio_test.cpp
index 1f14d4063f5..f7e6d4a091e 100644
--- a/src/mongo/executor/network_interface_asio_test.cpp
+++ b/src/mongo/executor/network_interface_asio_test.cpp
@@ -988,13 +988,15 @@ public:
     TestMetadataHook(bool* wroteRequestMetadata, bool* gotReplyMetadata)
         : _wroteRequestMetadata(wroteRequestMetadata), _gotReplyMetadata(gotReplyMetadata) {}
 
-    Status writeRequestMetadata(OperationContext* opCtx, BSONObjBuilder* metadataBob) override {
+    Status writeRequestMetadata(OperationContext* opCtx,
+                                const HostAndPort& requestDestination,
+                                BSONObjBuilder* metadataBob) override {
         metadataBob->append("foo", "bar");
         *_wroteRequestMetadata = true;
         return Status::OK();
     }
 
-    Status readReplyMetadata(StringData replySource, const BSONObj& metadataObj) override {
+    Status readReplyMetadata(const HostAndPort& replySource, const BSONObj& metadataObj) override {
         *_gotReplyMetadata = (metadataObj["baz"].str() == "garply");
         return Status::OK();
     }
diff --git a/src/mongo/executor/network_interface_mock.cpp b/src/mongo/executor/network_interface_mock.cpp
index 81198e74ee2..8a0c44d90fc 100644
--- a/src/mongo/executor/network_interface_mock.cpp
+++ b/src/mongo/executor/network_interface_mock.cpp
@@ -302,7 +302,7 @@ void NetworkInterfaceMock::scheduleResponse(NetworkOperationIterator noi,
     // If no RemoteCommandResponse was returned (for example, on a simulated network error), then
     // do not attempt to run the metadata hook, since there is no returned metadata.
     if (_metadataHook && response.isOK()) {
-        _metadataHook->readReplyMetadata(noi->getRequest().target.toString(), response.metadata);
+        _metadataHook->readReplyMetadata(noi->getRequest().target, response.metadata);
     }
 
     noi->setResponse(when, response);