SERVER-50916 Add $operationMetrics aggregation stage to return resource consumption metrics

1 files changed, 19 insertions, 1 deletions

diff --git a/src/mongo/db/stats/resource_consumption_metrics_test.cpp b/src/mongo/db/stats/resource_consumption_metrics_test.cpp
index 58f95bf1448..fdfb7ac4e8f 100644
--- a/src/mongo/db/stats/resource_consumption_metrics_test.cpp
+++ b/src/mongo/db/stats/resource_consumption_metrics_test.cpp
@@ -41,7 +41,7 @@ public:
     void setUp() {
         _opCtx = makeOperationContext();
         gMeasureOperationResourceConsumption = true;
-        gAggregateOperationResourceConsumption = true;
+        gAggregateOperationResourceConsumptionMetrics = true;
     }
 
     typedef std::pair<ServiceContext::UniqueClient, ServiceContext::UniqueOperationContext>
@@ -126,6 +126,15 @@ TEST_F(ResourceConsumptionMetricsTest, ScopedMetricsCollector) {
     metricsCopy = globalResourceConsumption.getMetrics();
     ASSERT_EQ(metricsCopy.count("db1"), 1);
     ASSERT_EQ(metricsCopy.count("db2"), 1);
+
+    // Ensure fetch and clear works.
+    auto metrics = globalResourceConsumption.getAndClearMetrics();
+    ASSERT_EQ(metrics.count("db1"), 1);
+    ASSERT_EQ(metrics.count("db2"), 1);
+
+    metricsCopy = globalResourceConsumption.getMetrics();
+    ASSERT_EQ(metricsCopy.count("db1"), 0);
+    ASSERT_EQ(metricsCopy.count("db2"), 0);
 }
 
 TEST_F(ResourceConsumptionMetricsTest, NestedScopedMetricsCollector) {
@@ -171,5 +180,14 @@ TEST_F(ResourceConsumptionMetricsTest, NestedScopedMetricsCollector) {
 
     metricsCopy = globalResourceConsumption.getMetrics();
     ASSERT_EQ(metricsCopy.count("db2"), 0);
+
+    // Ensure fetch and clear works.
+    auto metrics = globalResourceConsumption.getAndClearMetrics();
+    ASSERT_EQ(metrics.count("db1"), 1);
+    ASSERT_EQ(metrics.count("db2"), 0);
+
+    metricsCopy = globalResourceConsumption.getMetrics();
+    ASSERT_EQ(metricsCopy.count("db1"), 0);
+    ASSERT_EQ(metricsCopy.count("db2"), 0);
 }
 }  // namespace mongo