Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 4 insertions, 12 deletions

diff --git a/src/mongo/db/stats/server_write_concern_metrics.cpp b/src/mongo/db/stats/server_write_concern_metrics.cpp
index 544d611f01c..7dcedc40ef6 100644
--- a/src/mongo/db/stats/server_write_concern_metrics.cpp
+++ b/src/mongo/db/stats/server_write_concern_metrics.cpp
@@ -134,25 +134,17 @@ void ServerWriteConcernMetrics::WriteConcernMetricsForOperationType::recordWrite
         } else {
             // Provenance is either:
             //  - "implicitDefault" : implicit default WC (w:1 or w:"majority") is used.
+            //  - "clientSupplied"  : set without "w" value, so implicit default WC (w:1) is used.
             //  - "internalWriteDefault" : if internal command sets empty WC ({writeConcern: {}}),
             //    then default constructed WC (w:1) is used.
             implicitDefaultWC.recordWriteConcern(writeConcernOptions, numOps);
         }
 
         notExplicitWCount += numOps;
-    } else {
-        // Supplied write concern contains 'w' field, the provenance can still be default if it is
-        // being set by mongos.
-        if (writeConcernOptions.getProvenance().isCustomDefault()) {
-            cWWC.recordWriteConcern(writeConcernOptions, numOps);
-            notExplicitWCount += numOps;
-        } else if (writeConcernOptions.getProvenance().isImplicitDefault()) {
-            implicitDefaultWC.recordWriteConcern(writeConcernOptions, numOps);
-            notExplicitWCount += numOps;
-        } else {
-            explicitWC.recordWriteConcern(writeConcernOptions, numOps);
-        }
+        return;
     }
+
+    explicitWC.recordWriteConcern(writeConcernOptions, numOps);
 }
 
 void ServerWriteConcernMetrics::WriteConcernCounters::toBSON(BSONObjBuilder* builder) const {