SERVER-42437 Make ReplicaSetMonitorManager a ServiceContext decoration

4 files changed, 2 insertions, 6 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index f09e88afb7f..350e3057526 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -1665,7 +1665,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         'op_observer',
-        '$BUILD_DIR/mongo/client/clientdriver_network', # TODO Remove this in SERVER-42437
     ],
 )
 
diff --git a/src/mongo/db/commands/conn_pool_stats.cpp b/src/mongo/db/commands/conn_pool_stats.cpp
index 5a6684f3fec..d7badb6e336 100644
--- a/src/mongo/db/commands/conn_pool_stats.cpp
+++ b/src/mongo/db/commands/conn_pool_stats.cpp
@@ -107,7 +107,7 @@ public:
         stats.appendToBSON(result);
 
         // Always report all replica sets being tracked.
-        globalRSMonitorManager.report(&result);
+        ReplicaSetMonitorManager::get()->report(&result);
 
         return true;
     }
diff --git a/src/mongo/db/ftdc/ftdc_mongos.cpp b/src/mongo/db/ftdc/ftdc_mongos.cpp
index 1eb5015bb8f..6c9471c3df0 100644
--- a/src/mongo/db/ftdc/ftdc_mongos.cpp
+++ b/src/mongo/db/ftdc/ftdc_mongos.cpp
@@ -76,7 +76,7 @@ public:
         stats.appendToBSON(builder, true /* forFTDC */);
 
         // All replica sets being tracked.
-        globalRSMonitorManager.report(&builder, true /* forFTDC */);
+        ReplicaSetMonitorManager::get()->report(&builder, true /* forFTDC */);
     }
 
     std::string name() const override {
diff --git a/src/mongo/db/service_context_test_fixture.cpp b/src/mongo/db/service_context_test_fixture.cpp
index 98bab228070..a0d480a3924 100644
--- a/src/mongo/db/service_context_test_fixture.cpp
+++ b/src/mongo/db/service_context_test_fixture.cpp
@@ -49,9 +49,6 @@ ScopedGlobalServiceContextForTest::ScopedGlobalServiceContextForTest() {
 }
 
 ScopedGlobalServiceContextForTest::~ScopedGlobalServiceContextForTest() {
-    // TODO Remove in SERVER-42437
-    ReplicaSetMonitor::shutdown();
-
     setGlobalServiceContext({});
 }