SERVER-73115 Always include tenant in collection name attributes in log lines

1 files changed, 19 insertions, 0 deletions

diff --git a/src/mongo/db/namespace_string_test.cpp b/src/mongo/db/namespace_string_test.cpp
index 0d8e25255d4..69e4b6348ac 100644
--- a/src/mongo/db/namespace_string_test.cpp
+++ b/src/mongo/db/namespace_string_test.cpp
@@ -35,13 +35,32 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/repl/optime.h"
 #include "mongo/idl/server_parameter_test_util.h"
+#include "mongo/logv2/log.h"
 #include "mongo/unittest/unittest.h"
+#include "mongo/util/namespace_string_util.h"
+
+#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage
 
 namespace mongo {
 namespace {
 
 using namespace fmt::literals;
 
+TEST(NamespaceStringTest, CheckNamespaceStringLogAttrs) {
+    TenantId tenantId(OID::gen());
+    DatabaseName dbName(tenantId, "foo");
+    NamespaceString nss = NamespaceString::createNamespaceString_forTest(dbName, "bar");
+
+    startCapturingLogMessages();
+    LOGV2(7311500, "Msg nss:", logAttrs(nss));
+
+    std::string nssAsString = str::stream() << *(nss.tenantId()) << '_' << nss.ns();
+
+    ASSERT_EQUALS(
+        1, countBSONFormatLogLinesIsSubset(BSON("attr" << BSON("namespace" << nssAsString))));
+    stopCapturingLogMessages();
+}
+
 TEST(NamespaceStringTest, Oplog) {
     ASSERT(!NamespaceString::oplog("a"));
     ASSERT(!NamespaceString::oplog("a.b"));