diff options
Diffstat (limited to 'src/mongo/db/stats/resource_consumption_metrics.cpp')
| -rw-r--r-- | src/mongo/db/stats/resource_consumption_metrics.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mongo/db/stats/resource_consumption_metrics.cpp b/src/mongo/db/stats/resource_consumption_metrics.cpp index 98a804b0694..e4a4bdb4c2a 100644 --- a/src/mongo/db/stats/resource_consumption_metrics.cpp +++ b/src/mongo/db/stats/resource_consumption_metrics.cpp @@ -328,7 +328,7 @@ void ResourceConsumption::MetricsCollector::incrementOneIdxEntryWritten(StringDa } void ResourceConsumption::MetricsCollector::beginScopedCollecting(OperationContext* opCtx, - const std::string& dbName) { + const DatabaseName& dbName) { invariant(!isInScope()); _dbName = dbName; _collecting = ScopedCollectionState::kInScopeCollecting; @@ -366,7 +366,7 @@ void ResourceConsumption::MetricsCollector::incrementOneCursorSeek(StringData ur } ResourceConsumption::ScopedMetricsCollector::ScopedMetricsCollector(OperationContext* opCtx, - const std::string& dbName, + const DatabaseName& dbName, bool commandCollectsMetrics) : _opCtx(opCtx) { @@ -415,9 +415,9 @@ ResourceConsumption& ResourceConsumption::get(OperationContext* opCtx) { } void ResourceConsumption::merge(OperationContext* opCtx, - const std::string& dbName, + const DatabaseName& dbName, const OperationMetrics& metrics) { - invariant(!dbName.empty()); + invariant(!dbName.isEmpty()); LOGV2_DEBUG(7527700, 1, @@ -446,8 +446,9 @@ void ResourceConsumption::merge(OperationContext* opCtx, } // Add all metrics into the the globally-aggregated metrics. + const auto& dbNameStr = dbName.toStringWithTenantId(); stdx::lock_guard<Mutex> lk(_mutex); - _dbMetrics[dbName] += newMetrics; + _dbMetrics[dbNameStr] += newMetrics; _cpuTime += newMetrics.cpuNanos; } |