SERVER-48351 Clean up additional logv2 lines

5 files changed, 5 insertions, 6 deletions

diff --git a/src/mongo/db/ftdc/controller.cpp b/src/mongo/db/ftdc/controller.cpp
index edea5b8a8ef..4486ec7e345 100644
--- a/src/mongo/db/ftdc/controller.cpp
+++ b/src/mongo/db/ftdc/controller.cpp
@@ -183,7 +183,7 @@ void FTDCController::stop() {
         if (!s.isOK()) {
             LOGV2(20627,
                   "Failed to close full-time diagnostic data capture file manager",
-                  "status"_attr = s);
+                  "error"_attr = s);
         }
     }
 }
diff --git a/src/mongo/db/ftdc/file_manager.cpp b/src/mongo/db/ftdc/file_manager.cpp
index b9422079c74..fc1c2a9a025 100644
--- a/src/mongo/db/ftdc/file_manager.cpp
+++ b/src/mongo/db/ftdc/file_manager.cpp
@@ -276,7 +276,7 @@ FTDCFileManager::recoverInterimFile() {
         LOGV2(20630,
               "Unclean full-time diagnostic data capture shutdown detected, found interim file,  "
               "but failed to open it, some metrics may have been lost",
-              "status"_attr = s);
+              "error"_attr = s);
 
         // Note: We ignore any actual errors as reading from the interim files is a best-effort
         return docs;
@@ -294,7 +294,7 @@ FTDCFileManager::recoverInterimFile() {
         LOGV2(20631,
               "Unclean full-time diagnostic data capture shutdown detected, found interim file, "
               "some metrics may have been lost",
-              "status"_attr = m.getStatus());
+              "error"_attr = m.getStatus());
     }
 
     // Note: We ignore any actual errors as reading from the interim files is a best-effort
diff --git a/src/mongo/db/ftdc/file_manager_test.cpp b/src/mongo/db/ftdc/file_manager_test.cpp
index 801bb8a3a86..908389f6e62 100644
--- a/src/mongo/db/ftdc/file_manager_test.cpp
+++ b/src/mongo/db/ftdc/file_manager_test.cpp
@@ -116,6 +116,7 @@ TEST_F(FTDCFileManagerTest, TestFull) {
         ASSERT_TRUE(fs < c.maxFileSizeBytes * 1.10);
         LOGV2(20632,
               "File {fileName} has size {fileSize}",
+              "File size",
               "fileName"_attr = file.generic_string(),
               "fileSize"_attr = fs);
         if (file.generic_string().find("interim") == std::string::npos) {
diff --git a/src/mongo/db/ftdc/file_writer.cpp b/src/mongo/db/ftdc/file_writer.cpp
index 03ebd6560df..6eaa88ee872 100644
--- a/src/mongo/db/ftdc/file_writer.cpp
+++ b/src/mongo/db/ftdc/file_writer.cpp
@@ -27,8 +27,6 @@
  *    it in the license file.
  */
 
-#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kFTDC
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/ftdc/file_writer.h"
diff --git a/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp b/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp
index 3cded8a6a95..eb877638a7b 100644
--- a/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp
+++ b/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp
@@ -146,7 +146,7 @@ void installSystemMetricsCollector(FTDCController* controller) {
     if (!swCollector.getStatus().isOK()) {
         LOGV2_WARNING(23718,
                       "Failed to initialize Performance Counters for FTDC",
-                      "status"_attr = swCollector.getStatus());
+                      "error"_attr = swCollector.getStatus());
         return;
     }