SERVER-68826 Move logical_time into server_base

2 files changed, 12 insertions, 25 deletions

diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index 55a2d9b2a74..fc59a929ee0 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -195,15 +195,14 @@ env.Library(
 )
 
 env.Library(
-    target="fail_point",
+    target='fail_point',
     source=[
-        "fail_point.cpp",
+        'fail_point.cpp',
         'fail_point_server_parameter.idl',
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/bson/util/bson_extract",
-        "$BUILD_DIR/mongo/idl/server_parameter",
+        '$BUILD_DIR/mongo/bson/util/bson_extract',
+        '$BUILD_DIR/mongo/db/server_base',
     ],
 )
 
@@ -223,9 +222,8 @@ env.Library(
         "testing_options.cpp",
         'testing_options.idl',
     ],
-    LIBDEPS=[
-        "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/idl/server_parameter",
+    LIBDEPS_PRIVATE=[
+        "$BUILD_DIR/mongo/db/server_base",
     ],
 )
 
@@ -343,10 +341,9 @@ if env['MONGO_ALLOCATOR'] in ['tcmalloc', 'tcmalloc-experimental']:
             'tcmalloc_parameters.idl',
             'heap_profiler.cpp',
         ],
-        LIBDEPS=[],
         LIBDEPS_PRIVATE=[
-            '$BUILD_DIR/mongo/db/commands/server_status',
-            '$BUILD_DIR/mongo/idl/server_parameter',
+            '$BUILD_DIR/mongo/db/commands/server_status_core',
+            '$BUILD_DIR/mongo/db/server_base',
             '$BUILD_DIR/mongo/transport/service_executor',
             'processinfo',
         ],
@@ -406,13 +403,11 @@ if get_option('use-diagnostic-latches') == 'on':
         source=[
             'latch_analyzer.cpp',
         ],
-        LIBDEPS=[
+        LIBDEPS_PRIVATE=[
             '$BUILD_DIR/mongo/base',
+            '$BUILD_DIR/mongo/db/commands/server_status_core',
             '$BUILD_DIR/mongo/db/service_context',
         ],
-        LIBDEPS_PRIVATE=[
-            '$BUILD_DIR/mongo/db/commands/server_status',
-        ],
     )
 
 env.Benchmark(
@@ -497,11 +492,8 @@ env.Library(
         'password.cpp',
         'password_params.idl',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-    ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/server_parameter',
+        '$BUILD_DIR/mongo/db/server_base',
     ],
 )
 
diff --git a/src/mongo/util/latch_analyzer.cpp b/src/mongo/util/latch_analyzer.cpp
index 509d3aa7d8d..aea8e3eba1d 100644
--- a/src/mongo/util/latch_analyzer.cpp
+++ b/src/mongo/util/latch_analyzer.cpp
@@ -27,9 +27,6 @@
  *    it in the license file.
  */
 
-
-#include "mongo/platform/basic.h"
-
 #include "mongo/util/latch_analyzer.h"
 
 #include <boost/iterator/transform_iterator.hpp>
@@ -37,20 +34,18 @@
 
 #include <fmt/format.h>
 
-#include "mongo/util/hierarchical_acquisition.h"
-
 #include "mongo/base/init.h"
 #include "mongo/db/client.h"
 #include "mongo/db/service_context.h"
 #include "mongo/logv2/log.h"
 #include "mongo/platform/mutex.h"
 #include "mongo/util/fail_point.h"
+#include "mongo/util/hierarchical_acquisition.h"
 #include "mongo/util/latch_analyzer.h"
 #include "mongo/util/testing_proctor.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
-
 namespace mongo {
 
 using namespace fmt::literals;