Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 26 insertions, 0 deletions

diff --git a/jstests/noPassthrough/ftdc_omit_api_versions.js b/jstests/noPassthrough/ftdc_omit_api_versions.js
new file mode 100644
index 00000000000..a4a864f3871
--- /dev/null
+++ b/jstests/noPassthrough/ftdc_omit_api_versions.js
@@ -0,0 +1,26 @@
+/**
+ * This test is to make sure that 'apiVersions' section is omitted from serverStatus metrics in
+ * FTDC data.
+ */
+load('jstests/libs/ftdc.js');
+
+(function() {
+'use strict';
+let conn = MongoRunner.runMongod();
+let adminDb = conn.getDB('admin');
+
+// Verify 'apiVersions' section is omitted from serverStatus metrics.
+let ftdcData = verifyGetDiagnosticData(adminDb);
+assert(ftdcData["serverStatus"].hasOwnProperty("metrics"),
+       "does not have 'serverStatus.metrics' in '" + tojson(ftdcData) + "'");
+assert(!ftdcData["serverStatus"]["metrics"].hasOwnProperty("apiVersions"),
+       "'serverStatus.metrics.apiVersions' should be omitted from FTDC data: '" + tojson(ftdcData) +
+           "'");
+
+// Make sure that 'apiVersions' section still be returned with serverStatus metrics.
+let serverStatusMetrics = adminDb.serverStatus().metrics;
+assert(serverStatusMetrics.hasOwnProperty("apiVersions"),
+       "does not have 'apiVersions' in '" + tojson(serverStatusMetrics) + "'");
+
+MongoRunner.stopMongod(conn);
+})();