1 files changed, 9 insertions, 19 deletions

diff --git a/src/mongo/db/transaction_participant_test.cpp b/src/mongo/db/transaction_participant_test.cpp
index c2c18a05c8f..831cab5b825 100644
--- a/src/mongo/db/transaction_participant_test.cpp
+++ b/src/mongo/db/transaction_participant_test.cpp
@@ -2704,7 +2704,7 @@ TEST_F(TransactionsMetricsTest, ReportStashedResources) {
 
     auto sessionCheckout = checkOutSession();
 
-    // Create a ClientMetadata object and set it on ClientMetadataIsMasterState.
+    // Create a ClientMetadata object and set it.
     BSONObjBuilder builder;
     ASSERT_OK(ClientMetadata::serializePrivate("driverName",
                                                "driverVersion",
@@ -2716,9 +2716,7 @@ TEST_F(TransactionsMetricsTest, ReportStashedResources) {
                                                &builder));
     auto obj = builder.obj();
     auto clientMetadata = ClientMetadata::parse(obj["client"]);
-    auto& clientMetadataIsMasterState = ClientMetadataIsMasterState::get(opCtx()->getClient());
-    clientMetadataIsMasterState.setClientMetadata(opCtx()->getClient(),
-                                                  std::move(clientMetadata.getValue()));
+    ClientMetadata::setAndFinalize(opCtx()->getClient(), std::move(clientMetadata.getValue()));
 
     repl::ReadConcernArgs readConcernArgs;
     ASSERT_OK(
@@ -2948,12 +2946,10 @@ BSONObj constructClientMetadata(StringData appName) {
 }  // namespace
 
 TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponStash) {
-    // Create a ClientMetadata object and set it on ClientMetadataIsMasterState.
+    // Create a ClientMetadata object and set it.
     auto obj = constructClientMetadata("appName");
     auto clientMetadata = ClientMetadata::parse(obj["client"]);
-    auto& clientMetadataIsMasterState = ClientMetadataIsMasterState::get(opCtx()->getClient());
-    clientMetadataIsMasterState.setClientMetadata(opCtx()->getClient(),
-                                                  std::move(clientMetadata.getValue()));
+    ClientMetadata::setAndFinalize(opCtx()->getClient(), std::move(clientMetadata.getValue()));
 
     auto sessionCheckout = checkOutSession();
     auto txnParticipant = TransactionParticipant::get(opCtx());
@@ -2972,8 +2968,7 @@ TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponStash) {
     // Create another ClientMetadata object.
     auto newObj = constructClientMetadata("newAppName");
     auto newClientMetadata = ClientMetadata::parse(newObj["client"]);
-    clientMetadataIsMasterState.setClientMetadata(opCtx()->getClient(),
-                                                  std::move(newClientMetadata.getValue()));
+    ClientMetadata::setAndFinalize(opCtx()->getClient(), std::move(newClientMetadata.getValue()));
 
     txnParticipant.unstashTransactionResources(opCtx(), "insert");
     txnParticipant.stashTransactionResources(opCtx());
@@ -2985,12 +2980,10 @@ TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponStash) {
 }
 
 TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponCommit) {
-    // Create a ClientMetadata object and set it on ClientMetadataIsMasterState.
+    // Create a ClientMetadata object and set it.
     auto obj = constructClientMetadata("appName");
     auto clientMetadata = ClientMetadata::parse(obj["client"]);
-    auto& clientMetadataIsMasterState = ClientMetadataIsMasterState::get(opCtx()->getClient());
-    clientMetadataIsMasterState.setClientMetadata(opCtx()->getClient(),
-                                                  std::move(clientMetadata.getValue()));
+    ClientMetadata::setAndFinalize(opCtx()->getClient(), std::move(clientMetadata.getValue()));
 
     auto sessionCheckout = checkOutSession();
     auto txnParticipant = TransactionParticipant::get(opCtx());
@@ -3008,13 +3001,10 @@ TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponCommit) {
 }
 
 TEST_F(TransactionsMetricsTest, LastClientInfoShouldUpdateUponAbort) {
-    // Create a ClientMetadata object and set it on ClientMetadataIsMasterState.
+    // Create a ClientMetadata object and set it.
     auto obj = constructClientMetadata("appName");
     auto clientMetadata = ClientMetadata::parse(obj["client"]);
-
-    auto& clientMetadataIsMasterState = ClientMetadataIsMasterState::get(opCtx()->getClient());
-    clientMetadataIsMasterState.setClientMetadata(opCtx()->getClient(),
-                                                  std::move(clientMetadata.getValue()));
+    ClientMetadata::setAndFinalize(opCtx()->getClient(), std::move(clientMetadata.getValue()));
 
     auto sessionCheckout = checkOutSession();
     auto txnParticipant = TransactionParticipant::get(opCtx());