SERVER-43933 open namespace mongo::logv2 C++17 syntax

38 files changed, 88 insertions, 159 deletions

diff --git a/src/mongo/logv2/attribute_storage.h b/src/mongo/logv2/attribute_storage.h
index 29ff0ed7dd8..656302ba4de 100644
--- a/src/mongo/logv2/attribute_storage.h
+++ b/src/mongo/logv2/attribute_storage.h
@@ -39,8 +39,7 @@
 #include <functional>
 #include <string_view>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class TypeErasedAttributeStorage;
 
@@ -735,5 +734,4 @@ auto mapLog(It begin, It end) {
     return detail::AssociativeContainerLogger(begin, end);
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/attributes.cpp b/src/mongo/logv2/attributes.cpp
index c53c030a988..379bb11e2e7 100644
--- a/src/mongo/logv2/attributes.cpp
+++ b/src/mongo/logv2/attributes.cpp
@@ -29,9 +29,7 @@
 
 #include <boost/log/attributes/attribute_name.hpp>
 
-namespace mongo {
-namespace logv2 {
-namespace attributes {
+namespace mongo::logv2::attributes {
 
 const boost::log::attribute_name& domain() {
     static const boost::log::attribute_name attr("domain");
@@ -88,6 +86,4 @@ const boost::log::attribute_name& userassert() {
     return attr;
 }
 
-}  // namespace attributes
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2::attributes
diff --git a/src/mongo/logv2/attributes.h b/src/mongo/logv2/attributes.h
index 8118faaaf0f..99b601da854 100644
--- a/src/mongo/logv2/attributes.h
+++ b/src/mongo/logv2/attributes.h
@@ -31,9 +31,7 @@
 
 #include <boost/log/attributes/attribute_name.hpp>
 
-namespace mongo {
-namespace logv2 {
-namespace attributes {
+namespace mongo::logv2::attributes {
 
 // Reusable attribute names, so they only need to be constructed once.
 const boost::log::attribute_name& domain();
@@ -48,6 +46,4 @@ const boost::log::attribute_name& attributes();
 const boost::log::attribute_name& truncation();
 const boost::log::attribute_name& userassert();
 
-}  // namespace attributes
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2::attributes
diff --git a/src/mongo/logv2/bson_formatter.cpp b/src/mongo/logv2/bson_formatter.cpp
index 116f537273a..5cf150a02c3 100644
--- a/src/mongo/logv2/bson_formatter.cpp
+++ b/src/mongo/logv2/bson_formatter.cpp
@@ -45,8 +45,7 @@
 
 #include <fmt/format.h>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 namespace {
 struct BSONValueExtractor {
@@ -154,5 +153,4 @@ BSONObj BSONFormatter::operator()(boost::log::record_view const& rec) const {
     return builder.obj();
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/bson_formatter.h b/src/mongo/logv2/bson_formatter.h
index 61053b1f15f..e099658c38f 100644
--- a/src/mongo/logv2/bson_formatter.h
+++ b/src/mongo/logv2/bson_formatter.h
@@ -35,8 +35,7 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/logv2/constants.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class BSONFormatter {
 public:
@@ -47,5 +46,4 @@ public:
     BSONObj operator()(boost::log::record_view const& rec) const;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/component_settings_filter.h b/src/mongo/logv2/component_settings_filter.h
index ce548cf0e71..9da1d1976d6 100644
--- a/src/mongo/logv2/component_settings_filter.h
+++ b/src/mongo/logv2/component_settings_filter.h
@@ -38,8 +38,7 @@
 #include "mongo/logv2/log_component_settings.h"
 #include "mongo/logv2/log_severity.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 // Boost::log filter that enables logging if Component+Severity match current settings
 class ComponentSettingsFilter : public DomainFilter<ComponentSettingsFilter> {
@@ -59,5 +58,4 @@ private:
     const LogComponentSettings& _settings;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/composite_backend.h b/src/mongo/logv2/composite_backend.h
index 65afa437d14..5c35ca42fcb 100644
--- a/src/mongo/logv2/composite_backend.h
+++ b/src/mongo/logv2/composite_backend.h
@@ -37,8 +37,7 @@
 #include <boost/log/sinks/frontend_requirements.hpp>
 #include <tuple>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 template <typename... Backend>
 class CompositeBackend
@@ -159,5 +158,4 @@ private:
     std::tuple<BackendTraits<Backend>...> _backendTraits;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/console.cpp b/src/mongo/logv2/console.cpp
index 331ffbbc3b1..48fc9a16b84 100644
--- a/src/mongo/logv2/console.cpp
+++ b/src/mongo/logv2/console.cpp
@@ -40,8 +40,7 @@
 #include <io.h>
 #endif
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 namespace {
 
 #if defined(_WIN32)
@@ -263,5 +262,4 @@ std::ostream& Console::out() {
     return std::cout;
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/console.h b/src/mongo/logv2/console.h
index 061ad77cf05..50a1425d0fe 100644
--- a/src/mongo/logv2/console.h
+++ b/src/mongo/logv2/console.h
@@ -33,8 +33,7 @@
 
 #include "mongo/platform/mutex.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 /**
  * Representation of the console.  Use this in place of cout/cin, in applications that write to
@@ -57,5 +56,4 @@ public:
     static std::ostream& out();
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/domain_filter.h b/src/mongo/logv2/domain_filter.h
index a84d9086c8d..3f8dbefcd68 100644
--- a/src/mongo/logv2/domain_filter.h
+++ b/src/mongo/logv2/domain_filter.h
@@ -35,8 +35,7 @@
 #include "mongo/logv2/attributes.h"
 #include "mongo/logv2/log_domain.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 // Boost::log filter that enables logging if domain match. Using CRTP, users should inherit from
 // this and provide the concrete type as the template argument to this class.
@@ -66,5 +65,4 @@ public:
     }
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_component.cpp b/src/mongo/logv2/log_component.cpp
index dc91fb20aee..1b9bda788ef 100644
--- a/src/mongo/logv2/log_component.cpp
+++ b/src/mongo/logv2/log_component.cpp
@@ -35,8 +35,7 @@
 #include "mongo/base/static_assert.h"
 #include "mongo/util/assert_util.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 namespace {
 
@@ -256,5 +255,4 @@ std::ostream& operator<<(std::ostream& os, LogComponent component) {
     return os << component.getNameForLog();
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_component.h b/src/mongo/logv2/log_component.h
index 59824df897b..434aeff992f 100644
--- a/src/mongo/logv2/log_component.h
+++ b/src/mongo/logv2/log_component.h
@@ -34,8 +34,7 @@
 
 #include "mongo/base/string_data.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 /**
  * Log components.
@@ -122,5 +121,4 @@ private:
 
 std::ostream& operator<<(std::ostream& os, LogComponent component);
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_component_settings.cpp b/src/mongo/logv2/log_component_settings.cpp
index c85d33c8487..122a845d0ca 100644
--- a/src/mongo/logv2/log_component_settings.cpp
+++ b/src/mongo/logv2/log_component_settings.cpp
@@ -33,8 +33,7 @@
 
 #include "mongo/util/assert_util.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 LogComponentSettings::LogComponentSettings() {
     _minimumLoggedSeverity[LogComponent::kDefault].store(LogSeverity::Log().toInt());
@@ -117,5 +116,4 @@ bool LogComponentSettings::shouldLog(LogComponent component, LogSeverity severit
     return severity >= LogSeverity::cast(_minimumLoggedSeverity[component].loadRelaxed());
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_component_settings.h b/src/mongo/logv2/log_component_settings.h
index 72e0b00358c..3aab96a688c 100644
--- a/src/mongo/logv2/log_component_settings.h
+++ b/src/mongo/logv2/log_component_settings.h
@@ -34,8 +34,7 @@
 #include "mongo/platform/atomic_word.h"
 #include "mongo/platform/mutex.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 /**
  * Contains log severities for a list of log components.
@@ -102,5 +101,4 @@ private:
     AtomicWord<int> _minimumLoggedSeverity[LogComponent::kNumLogComponents];
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_detail.cpp b/src/mongo/logv2/log_detail.cpp
index 71bc1fb9b5d..7b46f4076b0 100644
--- a/src/mongo/logv2/log_detail.cpp
+++ b/src/mongo/logv2/log_detail.cpp
@@ -38,9 +38,7 @@
 #include "mongo/logv2/log_options.h"
 #include "mongo/logv2/log_source.h"
 
-namespace mongo {
-namespace logv2 {
-namespace detail {
+namespace mongo::logv2::detail {
 
 void doLogImpl(int32_t id,
                LogSeverity const& severity,
@@ -71,6 +69,4 @@ void doLogImpl(int32_t id,
     }
 }
 
-}  // namespace detail
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2::detail
diff --git a/src/mongo/logv2/log_detail.h b/src/mongo/logv2/log_detail.h
index ffa07990ef6..9c594028d20 100644
--- a/src/mongo/logv2/log_detail.h
+++ b/src/mongo/logv2/log_detail.h
@@ -39,8 +39,7 @@
 #include "mongo/util/errno_util.h"
 
 namespace mongo {
-namespace logv2 {
-namespace detail {
+namespace logv2::detail {
 
 void doLogImpl(int32_t id,
                LogSeverity const& severity,
@@ -81,8 +80,7 @@ void doLog(int32_t id,
     doLogImpl(id, severity, options, StringData(msg.data(), msg.size()), dynamicAttrs);
 }
 
-}  // namespace detail
-}  // namespace logv2
+}  // namespace logv2::detail
 
 inline namespace literals {
 inline fmt::internal::udl_arg<char> operator"" _attr(const char* s, std::size_t) {
diff --git a/src/mongo/logv2/log_domain.cpp b/src/mongo/logv2/log_domain.cpp
index 4d49cbb1cae..68dd59b4d99 100644
--- a/src/mongo/logv2/log_domain.cpp
+++ b/src/mongo/logv2/log_domain.cpp
@@ -28,13 +28,16 @@
  */
 
 #include "mongo/logv2/log_domain.h"
+
+#include <memory>
+#include <utility>
+
 #include "mongo/logv2/log_domain_internal.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
+
 LogDomain::LogDomain(std::unique_ptr<LogDomain::Internal> internalDomain)
     : _internal(std::move(internalDomain)) {}
 LogDomain::~LogDomain() = default;
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_domain.h b/src/mongo/logv2/log_domain.h
index 018c4ea65a1..914a794a98b 100644
--- a/src/mongo/logv2/log_domain.h
+++ b/src/mongo/logv2/log_domain.h
@@ -33,8 +33,7 @@
 #include "mongo/logv2/log_severity.h"
 #include "mongo/logv2/log_tag.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 class LogComponentSettings;
 
 // Log domain class, implemented with the pimpl idiom to not leak out boost::log types
@@ -56,5 +55,4 @@ private:
     std::unique_ptr<Internal> _internal;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_domain_global.cpp b/src/mongo/logv2/log_domain_global.cpp
index 35d4d6427ba..b8429fb2609 100644
--- a/src/mongo/logv2/log_domain_global.cpp
+++ b/src/mongo/logv2/log_domain_global.cpp
@@ -47,8 +47,7 @@
 #include <boost/log/core.hpp>
 #include <boost/log/sinks.hpp>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 void LogDomainGlobal::ConfigurationOptions::makeDisabled() {
     consoleEnabled = false;
@@ -286,5 +285,4 @@ LogComponentSettings& LogDomainGlobal::settings() {
     return _impl->_settings;
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_domain_global.h b/src/mongo/logv2/log_domain_global.h
index c19c2a62b9d..58467c33b86 100644
--- a/src/mongo/logv2/log_domain_global.h
+++ b/src/mongo/logv2/log_domain_global.h
@@ -33,8 +33,7 @@
 #include "mongo/logv2/log_domain_internal.h"
 #include "mongo/logv2/log_format.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 class LogDomainGlobal : public LogDomain::Internal {
 public:
     struct ConfigurationOptions {
@@ -71,5 +70,4 @@ private:
     struct Impl;
     std::unique_ptr<Impl> _impl;
 };
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_domain_internal.cpp b/src/mongo/logv2/log_domain_internal.cpp
index 9b0e4454962..1daeb880733 100644
--- a/src/mongo/logv2/log_domain_internal.cpp
+++ b/src/mongo/logv2/log_domain_internal.cpp
@@ -29,8 +29,8 @@
 
 #include "log_domain_internal.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
+
 LogDomain::Internal::~Internal() = default;
-}  // namespace logv2
-}  // namespace mongo
+
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_domain_internal.h b/src/mongo/logv2/log_domain_internal.h
index 1c4d03c83fa..d310686e4d5 100644
--- a/src/mongo/logv2/log_domain_internal.h
+++ b/src/mongo/logv2/log_domain_internal.h
@@ -33,8 +33,8 @@
 #include "mongo/logv2/log_domain.h"
 #include "mongo/logv2/log_source.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
+
 class LogDomain::Internal {
 public:
     Internal() = default;
@@ -43,5 +43,4 @@ public:
     virtual LogSource& source() = 0;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_format.h b/src/mongo/logv2/log_format.h
index b95a5c297b2..503c4e90596 100644
--- a/src/mongo/logv2/log_format.h
+++ b/src/mongo/logv2/log_format.h
@@ -29,9 +29,9 @@
 
 #pragma once
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
+
 enum class LogFormat { kDefault, kJson, kPlain };
 enum class LogTimestampFormat { kISO8601UTC, kISO8601Local };
-}  // namespace logv2
-}  // namespace mongo
+
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_manager.cpp b/src/mongo/logv2/log_manager.cpp
index d4710dc4977..a9c6ca5013e 100644
--- a/src/mongo/logv2/log_manager.cpp
+++ b/src/mongo/logv2/log_manager.cpp
@@ -39,8 +39,7 @@
 #include "mongo/logv2/log_domain.h"
 #include "mongo/logv2/log_domain_global.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 struct LogManager::Impl {
     Impl() {}
@@ -99,5 +98,4 @@ LogComponentSettings& LogManager::getGlobalSettings() {
     return getGlobalDomainInternal().settings();
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_manager.h b/src/mongo/logv2/log_manager.h
index 7540d37bff2..245a4e4cb7b 100644
--- a/src/mongo/logv2/log_manager.h
+++ b/src/mongo/logv2/log_manager.h
@@ -34,8 +34,7 @@
 #include <memory>
 #include <string>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class LogDomain;
 class LogDomainGlobal;
@@ -76,5 +75,4 @@ private:
     std::unique_ptr<Impl> _impl;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_options.h b/src/mongo/logv2/log_options.h
index cdf07b03ea5..d19ae151a0a 100644
--- a/src/mongo/logv2/log_options.h
+++ b/src/mongo/logv2/log_options.h
@@ -34,8 +34,7 @@
 #include "mongo/logv2/log_tag.h"
 #include "mongo/logv2/log_truncation.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class UserAssertAfterLog {
 public:
@@ -119,5 +118,4 @@ private:
     FatalMode _fatalMode = FatalMode::kAssert;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_severity.cpp b/src/mongo/logv2/log_severity.cpp
index 896509f5d39..6bdd40ce292 100644
--- a/src/mongo/logv2/log_severity.cpp
+++ b/src/mongo/logv2/log_severity.cpp
@@ -33,8 +33,7 @@
 
 #include <iostream>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 namespace {
 
@@ -97,5 +96,4 @@ std::ostream& operator<<(std::ostream& os, LogSeverity severity) {
     return os << severity.toStringData();
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_severity.h b/src/mongo/logv2/log_severity.h
index dd6f4d1429c..1d5a54132ca 100644
--- a/src/mongo/logv2/log_severity.h
+++ b/src/mongo/logv2/log_severity.h
@@ -34,8 +34,7 @@
 
 #include "mongo/base/string_data.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 /**
  * Representation of the severity / priority of a log message.
@@ -199,5 +198,4 @@ bool LogSeverity::operator>=(LogSeverity other) const {
     return _severity <= other._severity;
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_source.h b/src/mongo/logv2/log_source.h
index 7e389bd4548..6d106138c64 100644
--- a/src/mongo/logv2/log_source.h
+++ b/src/mongo/logv2/log_source.h
@@ -46,8 +46,7 @@
 #include "mongo/logv2/log_truncation.h"
 #include "mongo/util/time_support.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 // Custom logging source that automatically add our set of attributes
 class LogSource : public boost::log::sources::
@@ -122,6 +121,4 @@ private:
     boost::log::attributes::mutable_constant<int32_t> _id;
 };
 
-
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_tag.cpp b/src/mongo/logv2/log_tag.cpp
index 23b90cb60a5..6fdd543a721 100644
--- a/src/mongo/logv2/log_tag.cpp
+++ b/src/mongo/logv2/log_tag.cpp
@@ -31,8 +31,7 @@
 
 #include "mongo/bson/bsonobjbuilder.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 BSONArray LogTag::toBSONArray() {
     BSONArrayBuilder builder;
@@ -45,5 +44,5 @@ BSONArray LogTag::toBSONArray() {
 
     return builder.arr();
 }
-}  // namespace logv2
-}  // namespace mongo
+
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_tag.h b/src/mongo/logv2/log_tag.h
index f88a66a60b2..d51d270626f 100644
--- a/src/mongo/logv2/log_tag.h
+++ b/src/mongo/logv2/log_tag.h
@@ -34,8 +34,8 @@
 #include <cstdint>
 #include <string>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
+
 class LogTag {
 public:
     enum Value {
@@ -80,5 +80,4 @@ private:
     uint64_t _value;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_test_v2.cpp b/src/mongo/logv2/log_test_v2.cpp
index 9611c94e7dc..b64ea21ff6b 100644
--- a/src/mongo/logv2/log_test_v2.cpp
+++ b/src/mongo/logv2/log_test_v2.cpp
@@ -65,8 +65,7 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 namespace {
 
 struct TypeWithoutBSON {
@@ -1640,5 +1639,4 @@ TEST_F(LogTestV2, UserAssert) {
 }
 
 }  // namespace
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_test_v2.h b/src/mongo/logv2/log_test_v2.h
index 334023444f3..c6f79127316 100644
--- a/src/mongo/logv2/log_test_v2.h
+++ b/src/mongo/logv2/log_test_v2.h
@@ -35,8 +35,7 @@
 #include "mongo/logv2/log_manager.h"
 #include "mongo/unittest/unittest.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class LogTestV2 : public unittest::Test {
 
@@ -66,5 +65,4 @@ private:
     std::vector<boost::shared_ptr<boost::log::sinks::sink>> _attachedSinks;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/log_truncation.h b/src/mongo/logv2/log_truncation.h
index 5336a2ff0c0..3cae21daf07 100644
--- a/src/mongo/logv2/log_truncation.h
+++ b/src/mongo/logv2/log_truncation.h
@@ -29,10 +29,8 @@
 
 #pragma once
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 enum class LogTruncation { Enabled, Disabled };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/ramlog.cpp b/src/mongo/logv2/ramlog.cpp
index 14c9a6d47f0..ee04ff0e0be 100644
--- a/src/mongo/logv2/ramlog.cpp
+++ b/src/mongo/logv2/ramlog.cpp
@@ -36,8 +36,7 @@
 #include "mongo/util/map_util.h"
 #include "mongo/util/str.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 using std::string;
 
@@ -208,5 +207,4 @@ MONGO_INITIALIZER(RamLogCatalogV2)(InitializerContext*) {
     return Status::OK();
 }
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/ramlog.h b/src/mongo/logv2/ramlog.h
index 1dd29d4eae0..b48b9e1be5e 100644
--- a/src/mongo/logv2/ramlog.h
+++ b/src/mongo/logv2/ramlog.h
@@ -37,8 +37,7 @@
 #include "mongo/util/concurrency/mutex.h"
 #include "mongo/util/concurrency/with_lock.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 /**
  * Variable-capacity circular log of line-oriented messages.
@@ -181,5 +180,4 @@ private:
     size_t _nextLineIndex;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/ramlog_sink.h b/src/mongo/logv2/ramlog_sink.h
index 6b4d03218f5..f56b0dca657 100644
--- a/src/mongo/logv2/ramlog_sink.h
+++ b/src/mongo/logv2/ramlog_sink.h
@@ -34,8 +34,7 @@
 
 #include "mongo/logv2/ramlog.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 class RamLogSink : public boost::log::sinks::
                        basic_formatted_sink_backend<char, boost::log::sinks::concurrent_feeding> {
@@ -63,5 +62,4 @@ private:
     RamLog* _ramlog;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2
diff --git a/src/mongo/logv2/tagged_severity_filter.h b/src/mongo/logv2/tagged_severity_filter.h
index c6febf8a3a8..52c3fa3b8ed 100644
--- a/src/mongo/logv2/tagged_severity_filter.h
+++ b/src/mongo/logv2/tagged_severity_filter.h
@@ -37,8 +37,7 @@
 #include "mongo/logv2/log_severity.h"
 #include "mongo/logv2/log_tag.h"
 
-namespace mongo {
-namespace logv2 {
+namespace mongo::logv2 {
 
 // Boost::log filter that enables logging if Tag exists with Severity over threshold
 class TaggedSeverityFilter : public DomainFilter<TaggedSeverityFilter> {
@@ -59,5 +58,4 @@ private:
     LogSeverity _severity;
 };
 
-}  // namespace logv2
-}  // namespace mongo
+}  // namespace mongo::logv2