Rename TransientMemoryUsageProvider to TransientResourceUsageProvider.

20 files changed, 125 insertions, 121 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/attribute_usage_sampler_functor_test.cpp b/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/attribute_usage_sampler_functor_test.cpp
index cb092aaa910..c99abcdaa59 100644
--- a/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/attribute_usage_sampler_functor_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/attribute_usage_sampler_functor_test.cpp
@@ -8,7 +8,7 @@
 #include <vespa/searchcore/proton/attribute/attribute_usage_filter.h>
 #include <vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h>
 #include <vespa/searchcore/proton/attribute/attribute_usage_sampler_functor.h>
-#include <vespa/searchcore/proton/common/transient_memory_usage_provider.h>
+#include <vespa/searchcore/proton/common/transient_resource_usage_provider.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/stllike/string.h>
 
@@ -61,18 +61,18 @@ std::shared_ptr<AttributeVector> build_attribute_vector(const vespalib::string&
 class AttributeUsageSamplerFunctorTest : public ::testing::Test {
 protected:
     AttributeUsageFilter                          _filter;
-    std::shared_ptr<TransientMemoryUsageProvider> _transient_memory_usage_provider;
+    std::shared_ptr<TransientResourceUsageProvider> _transient_usage_provider;
 public:
     AttributeUsageSamplerFunctorTest();
     ~AttributeUsageSamplerFunctorTest();
 protected:
     void sample_usage(bool sample_a1, bool sample_a2, bool old_fast_search, bool new_fast_search = true);
-    size_t get_transient_memory_usage() const { return _transient_memory_usage_provider->get_transient_memory_usage(); }
+    size_t get_transient_memory_usage() const { return _transient_usage_provider->get_transient_memory_usage(); }
 };
 
 AttributeUsageSamplerFunctorTest::AttributeUsageSamplerFunctorTest()
     : _filter(),
-      _transient_memory_usage_provider(std::make_shared<TransientMemoryUsageProvider>())
+      _transient_usage_provider(std::make_shared<TransientResourceUsageProvider>())
 {
 }
 
@@ -88,7 +88,7 @@ AttributeUsageSamplerFunctorTest::sample_usage(bool sample_a1, bool sample_a2, b
     EXPECT_EQ(av1->getEnumeratedSave(), old_fast_search);
     auto new_config = build_config(new_fast_search);
     auto new_inspector = std::make_shared<AttributeConfigInspector>(new_config);
-    auto context = std::make_shared<AttributeUsageSamplerContext>(_filter, new_inspector, _transient_memory_usage_provider);
+    auto context = std::make_shared<AttributeUsageSamplerContext>(_filter, new_inspector, _transient_usage_provider);
     if (sample_a1) {
         AttributeUsageSamplerFunctor functor1(context, "ready");
         functor1(*av1);
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index 476579a6816..ff1b29d646e 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -6,7 +6,7 @@
 #include <vespa/searchcore/proton/attribute/i_attribute_manager.h>
 #include <vespa/searchcore/proton/bucketdb/bucket_create_notifier.h>
 #include <vespa/searchcore/proton/common/doctypename.h>
-#include <vespa/searchcore/proton/common/transient_memory_usage_provider.h>
+#include <vespa/searchcore/proton/common/transient_resource_usage_provider.h>
 #include <vespa/searchcore/proton/documentmetastore/operation_listener.h>
 #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include <vespa/searchcore/proton/feedoperation/moveoperation.h>
@@ -869,7 +869,7 @@ MaintenanceControllerFixture::injectMaintenanceJobs()
                                             _bmc, _clusterStateHandler, _bucketHandler, _calc, _diskMemUsageNotifier,
                                             _jobTrackers, _readyAttributeManager, _notReadyAttributeManager,
                                             std::make_unique<const AttributeConfigInspector>(AttributesConfigBuilder()),
-                                            std::make_shared<TransientMemoryUsageProvider>(),
+                                            std::make_shared<TransientResourceUsageProvider>(),
                                             _attributeUsageFilter);
     }
 }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.cpp
index 43c9e52315b..c299581835d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.cpp
@@ -2,24 +2,26 @@
 
 #include "attribute_usage_sampler_context.h"
 #include "attribute_usage_filter.h"
-#include <vespa/searchcore/proton/common/transient_memory_usage_provider.h>
+#include <vespa/searchcore/proton/common/transient_resource_usage_provider.h>
 
 namespace proton {
 
-AttributeUsageSamplerContext::AttributeUsageSamplerContext(AttributeUsageFilter &filter, std::shared_ptr<const AttributeConfigInspector> attribute_config_inspector, std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider)
+AttributeUsageSamplerContext::AttributeUsageSamplerContext(AttributeUsageFilter& filter,
+                                                           std::shared_ptr<const AttributeConfigInspector> attribute_config_inspector,
+                                                           std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider)
     : _usage(),
       _transient_memory_usage(0u),
       _lock(),
       _filter(filter),
       _attribute_config_inspector(std::move(attribute_config_inspector)),
-      _transient_memory_usage_provider(std::move(transient_memory_usage_provider))
+      _transient_usage_provider(std::move(transient_usage_provider))
 {
 }
 
 AttributeUsageSamplerContext::~AttributeUsageSamplerContext()
 {
     _filter.setAttributeStats(_usage);
-    _transient_memory_usage_provider->set_transient_memory_usage(_transient_memory_usage);
+    _transient_usage_provider->set_transient_memory_usage(_transient_memory_usage);
 }
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
index b2fa3137927..becff58fdd7 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_sampler_context.h
@@ -10,7 +10,7 @@ namespace proton {
 
 class AttributeUsageFilter;
 class AttributeConfigInspector;
-class TransientMemoryUsageProvider;
+class TransientResourceUsageProvider;
 
 /*
  * Context for sampling attribute usage stats and transient memory usage.
@@ -27,9 +27,11 @@ class AttributeUsageSamplerContext
     Mutex _lock;
     AttributeUsageFilter &_filter;
     std::shared_ptr<const AttributeConfigInspector> _attribute_config_inspector;
-    std::shared_ptr<TransientMemoryUsageProvider> _transient_memory_usage_provider;
+    std::shared_ptr<TransientResourceUsageProvider> _transient_usage_provider;
 public:
-    AttributeUsageSamplerContext(AttributeUsageFilter &filter, std::shared_ptr<const AttributeConfigInspector> attribute_config_inspector, std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider);
+    AttributeUsageSamplerContext(AttributeUsageFilter& filter,
+                                 std::shared_ptr<const AttributeConfigInspector> attribute_config_inspector,
+                                 std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider);
     ~AttributeUsageSamplerContext();
     void merge(const search::AddressSpaceUsage &usage,
                size_t transient_memory_usage,
diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
index a91c35f0485..9838b598df9 100644
--- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
@@ -24,7 +24,7 @@ vespa_add_library(searchcore_pcommon STATIC
     selectpruner.cpp
     state_reporter_utils.cpp
     statusreport.cpp
-    transient_memory_usage_provider.cpp
+    transient_resource_usage_provider.cpp
     DEPENDS
     searchcore_proton_metrics
     searchcore_fconfig
diff --git a/searchcore/src/vespa/searchcore/proton/common/i_transient_memory_usage_provider.h b/searchcore/src/vespa/searchcore/proton/common/i_transient_memory_usage_provider.h
deleted file mode 100644
index cd87150195c..00000000000
--- a/searchcore/src/vespa/searchcore/proton/common/i_transient_memory_usage_provider.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include <cstddef>
-
-namespace proton {
-
-/*
- * Interface class providing transient memory usage, e.g. extra memory needed
- * for loading or saving an attribute vector. It provides an aggregated view
- * over several components (e.g. all attribute vectors for a document type).
- */
-class ITransientMemoryUsageProvider {
-public:
-    virtual ~ITransientMemoryUsageProvider() = default;
-    virtual size_t get_transient_memory_usage() const = 0;
-};
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/common/i_transient_resource_usage_provider.h b/searchcore/src/vespa/searchcore/proton/common/i_transient_resource_usage_provider.h
new file mode 100644
index 00000000000..e51a5fa5827
--- /dev/null
+++ b/searchcore/src/vespa/searchcore/proton/common/i_transient_resource_usage_provider.h
@@ -0,0 +1,20 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include <cstddef>
+
+namespace proton {
+
+/**
+ * Interface class providing transient resource usage.
+ * E.g. extra memory needed for loading or saving an attribute vector.
+ * It provides an aggregated view over several components (e.g. all attribute vectors for a document type).
+ */
+class ITransientResourceUsageProvider {
+public:
+    virtual ~ITransientResourceUsageProvider() = default;
+    virtual size_t get_transient_memory_usage() const = 0;
+};
+
+}
diff --git a/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.cpp b/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.cpp
deleted file mode 100644
index 0752af29a0a..00000000000
--- a/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "transient_memory_usage_provider.h"
-
-namespace proton {
-
-TransientMemoryUsageProvider::TransientMemoryUsageProvider()
-    : ITransientMemoryUsageProvider(),
-      _transient_memory_usage(0u)
-{
-}
-
-TransientMemoryUsageProvider::~TransientMemoryUsageProvider() = default;
-
-size_t
-TransientMemoryUsageProvider::get_transient_memory_usage() const
-{
-    return _transient_memory_usage.load(std::memory_order_relaxed);
-}
-
-void
-TransientMemoryUsageProvider::set_transient_memory_usage(size_t transient_memory_usage)
-{
-    _transient_memory_usage.store(transient_memory_usage, std::memory_order_relaxed);
-}
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.h b/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.h
deleted file mode 100644
index 8cda4278ad8..00000000000
--- a/searchcore/src/vespa/searchcore/proton/common/transient_memory_usage_provider.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include "i_transient_memory_usage_provider.h"
-
-#include <atomic>
-
-namespace proton {
-
-/*
- * Class providing transient memory usage, e.g. extra memory needed
- * for loading or saving an attribute vector. It provides an aggregated view
- * over several components (e.g. all attribute vectors for a document type).
- */
-class TransientMemoryUsageProvider : public ITransientMemoryUsageProvider {
-    std::atomic<size_t> _transient_memory_usage;
-public:
-    TransientMemoryUsageProvider();
-    virtual ~TransientMemoryUsageProvider();
-    size_t get_transient_memory_usage() const override;
-    void set_transient_memory_usage(size_t transient_memory_usage);
-};
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.cpp b/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.cpp
new file mode 100644
index 00000000000..7643b82855d
--- /dev/null
+++ b/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.cpp
@@ -0,0 +1,27 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "transient_resource_usage_provider.h"
+
+namespace proton {
+
+TransientResourceUsageProvider::TransientResourceUsageProvider()
+    : ITransientResourceUsageProvider(),
+      _transient_memory_usage(0u)
+{
+}
+
+TransientResourceUsageProvider::~TransientResourceUsageProvider() = default;
+
+size_t
+TransientResourceUsageProvider::get_transient_memory_usage() const
+{
+    return _transient_memory_usage.load(std::memory_order_relaxed);
+}
+
+void
+TransientResourceUsageProvider::set_transient_memory_usage(size_t transient_memory_usage)
+{
+    _transient_memory_usage.store(transient_memory_usage, std::memory_order_relaxed);
+}
+
+}
diff --git a/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.h b/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.h
new file mode 100644
index 00000000000..79a007f29af
--- /dev/null
+++ b/searchcore/src/vespa/searchcore/proton/common/transient_resource_usage_provider.h
@@ -0,0 +1,25 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include "i_transient_resource_usage_provider.h"
+
+#include <atomic>
+
+namespace proton {
+
+/**
+ * Class providing transient resource usage.
+ * E.g. extra memory needed for loading or saving an attribute vector.
+ * It provides an aggregated view over several components (e.g. all attribute vectors for a document type).
+ */
+class TransientResourceUsageProvider : public ITransientResourceUsageProvider {
+    std::atomic<size_t> _transient_memory_usage;
+public:
+    TransientResourceUsageProvider();
+    virtual ~TransientResourceUsageProvider();
+    size_t get_transient_memory_usage() const override;
+    void set_transient_memory_usage(size_t transient_memory_usage);
+};
+
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
index f7f505cd754..2c79abcc602 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
@@ -3,7 +3,7 @@
 #include "disk_mem_usage_sampler.h"
 #include <vespa/vespalib/util/scheduledexecutor.h>
 #include <vespa/vespalib/util/lambdatask.h>
-#include <vespa/searchcore/proton/common/i_transient_memory_usage_provider.h>
+#include <vespa/searchcore/proton/common/i_transient_resource_usage_provider.h>
 #include <filesystem>
 
 using vespalib::makeLambdaTask;
@@ -17,7 +17,7 @@ DiskMemUsageSampler::DiskMemUsageSampler(const std::string &path_in, const Confi
       _lastSampleTime(vespalib::steady_clock::now()),
       _periodicTimer(),
       _lock(),
-      _transient_memory_usage_providers()
+      _transient_usage_providers()
 {
     setConfig(config);
 }
@@ -128,7 +128,7 @@ DiskMemUsageSampler::sample_transient_memory_usage()
     size_t max_transient_memory_usage = 0;
     {
         std::lock_guard<std::mutex> guard(_lock);
-        for (auto provider : _transient_memory_usage_providers) {
+        for (auto provider : _transient_usage_providers) {
             auto transient_memory_usage = provider->get_transient_memory_usage();
             max_transient_memory_usage = std::max(max_transient_memory_usage, transient_memory_usage);
         }
@@ -137,19 +137,19 @@ DiskMemUsageSampler::sample_transient_memory_usage()
 }
 
 void
-DiskMemUsageSampler::add_transient_memory_usage_provider(std::shared_ptr<const ITransientMemoryUsageProvider> provider)
+DiskMemUsageSampler::add_transient_usage_provider(std::shared_ptr<const ITransientResourceUsageProvider> provider)
 {
     std::lock_guard<std::mutex> guard(_lock);
-    _transient_memory_usage_providers.push_back(provider);
+    _transient_usage_providers.push_back(provider);
 }
 
 void
-DiskMemUsageSampler::remove_transient_memory_usage_provider(std::shared_ptr<const ITransientMemoryUsageProvider> provider)
+DiskMemUsageSampler::remove_transient_usage_provider(std::shared_ptr<const ITransientResourceUsageProvider> provider)
 {
     std::lock_guard<std::mutex> guard(_lock);
-    for (auto itr = _transient_memory_usage_providers.begin(); itr != _transient_memory_usage_providers.end(); ++itr) {
+    for (auto itr = _transient_usage_providers.begin(); itr != _transient_usage_providers.end(); ++itr) {
         if (*itr == provider) {
-            _transient_memory_usage_providers.erase(itr);
+            _transient_usage_providers.erase(itr);
             break;
         }
     }
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
index 38e80a6cec1..ef639c3b727 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.h
@@ -9,7 +9,7 @@ namespace vespalib { class ScheduledExecutor; }
 
 namespace proton {
 
-class ITransientMemoryUsageProvider;
+class ITransientResourceUsageProvider;
 
 /*
  * Class to sample disk and memory usage used for filtering write operations.
@@ -21,7 +21,7 @@ class DiskMemUsageSampler {
     vespalib::steady_time _lastSampleTime;
     std::unique_ptr<vespalib::ScheduledExecutor> _periodicTimer;
     std::mutex            _lock;
-    std::vector<std::shared_ptr<const ITransientMemoryUsageProvider>> _transient_memory_usage_providers;
+    std::vector<std::shared_ptr<const ITransientResourceUsageProvider>> _transient_usage_providers;
 
     void sampleUsage();
     void sampleDiskUsage();
@@ -60,8 +60,8 @@ public:
 
     const DiskMemUsageFilter &writeFilter() const { return _filter; }
     IDiskMemUsageNotifier &notifier() { return _filter; }
-    void add_transient_memory_usage_provider(std::shared_ptr<const ITransientMemoryUsageProvider> provider);
-    void remove_transient_memory_usage_provider(std::shared_ptr<const ITransientMemoryUsageProvider> provider);
+    void add_transient_usage_provider(std::shared_ptr<const ITransientResourceUsageProvider> provider);
+    void remove_transient_usage_provider(std::shared_ptr<const ITransientResourceUsageProvider> provider);
 };
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 46d4c09ea67..4a6a4b7115d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -20,7 +20,7 @@
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
 #include <vespa/searchcore/proton/common/eventlogger.h>
 #include <vespa/searchcore/proton/common/statusreport.h>
-#include <vespa/searchcore/proton/common/transient_memory_usage_provider.h>
+#include <vespa/searchcore/proton/common/transient_resource_usage_provider.h>
 #include <vespa/searchcore/proton/docsummary/isummarymanager.h>
 #include <vespa/searchcore/proton/feedoperation/noopoperation.h>
 #include <vespa/searchcore/proton/index/index_writer.h>
@@ -152,7 +152,7 @@ DocumentDB::DocumentDB(const vespalib::string &baseDir,
       _state(),
       _dmUsageForwarder(_writeService.master()),
       _writeFilter(),
-      _transient_memory_usage_provider(std::make_shared<TransientMemoryUsageProvider>()),
+      _transient_usage_provider(std::make_shared<TransientResourceUsageProvider>()),
       _feedHandler(std::make_unique<FeedHandler>(_writeService, tlsSpec, docTypeName, *this, _writeFilter, *this, tlsWriterFactory)),
       _subDBs(*this, *this, *_feedHandler, _docTypeName, _writeService, warmupExecutor, fileHeaderContext,
               metricsWireService, getMetrics(), queryLimiter, clock, _configMutex, _baseDir,
@@ -938,7 +938,7 @@ DocumentDB::injectMaintenanceJobs(const DocumentDBMaintenanceConfig &config, std
             _subDBs.getReadySubDB()->getAttributeManager(),
             _subDBs.getNotReadySubDB()->getAttributeManager(),
             std::move(attribute_config_inspector),
-            _transient_memory_usage_provider,
+            _transient_usage_provider,
             _writeFilter);
 }
 
@@ -1085,10 +1085,10 @@ DocumentDB::getDistributionKey() const
     return _owner.getDistributionKey();
 }
 
-std::shared_ptr<const ITransientMemoryUsageProvider>
-DocumentDB::transient_memory_usage_provider()
+std::shared_ptr<const ITransientResourceUsageProvider>
+DocumentDB::transient_usage_provider()
 {
-    return _transient_memory_usage_provider;
+    return _transient_usage_provider;
 }
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index 3fec997d1bc..d8bba30e650 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -50,11 +50,11 @@ namespace storage::spi { struct BucketExecutor; }
 namespace proton {
 class AttributeConfigInspector;
 class IDocumentDBOwner;
-class ITransientMemoryUsageProvider;
+class ITransientResourceUsageProvider;
 struct MetricsWireService;
 class StatusReport;
 class ExecutorThreadingServiceStats;
-class TransientMemoryUsageProvider;
+class TransientResourceUsageProvider;
 
 namespace matching { class SessionManager; }
 
@@ -119,7 +119,7 @@ private:
     DDBState                      _state;
     DiskMemUsageForwarder         _dmUsageForwarder;
     AttributeUsageFilter          _writeFilter;
-    std::shared_ptr<TransientMemoryUsageProvider> _transient_memory_usage_provider;
+    std::shared_ptr<TransientResourceUsageProvider> _transient_usage_provider;
     std::unique_ptr<FeedHandler>                  _feedHandler;
     DocumentSubDBCollection                       _subDBs;
     MaintenanceController                         _maintenanceController;
@@ -414,7 +414,7 @@ public:
     void enterOnlineState();
     void waitForOnlineState();
     IDiskMemUsageListener *diskMemUsageListener() { return &_dmUsageForwarder; }
-    std::shared_ptr<const ITransientMemoryUsageProvider> transient_memory_usage_provider();
+    std::shared_ptr<const ITransientResourceUsageProvider> transient_usage_provider();
     ExecutorThreadingService & getWriteService() { return _writeService; }
 
     void set_attribute_usage_listener(std::unique_ptr<IAttributeUsageListener> listener);
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
index ce6acb4795e..bd6c09934be 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -134,7 +134,7 @@ MaintenanceJobsInjector::injectJobs(MaintenanceController &controller,
                                     IAttributeManagerSP readyAttributeManager,
                                     IAttributeManagerSP notReadyAttributeManager,
                                     std::unique_ptr<const AttributeConfigInspector> attribute_config_inspector,
-                                    std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider,
+                                    std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider,
                                     AttributeUsageFilter &attributeUsageFilter)
 {
     controller.registerJobInMasterThread(std::make_unique<HeartBeatJob>(hbHandler, config.getHeartBeatConfig()));
@@ -160,7 +160,7 @@ MaintenanceJobsInjector::injectJobs(MaintenanceController &controller,
                                                       attributeUsageFilter, docTypeName,
                                                       config.getAttributeUsageSampleInterval(),
                                                       std::move(attribute_config_inspector),
-                                                      transient_memory_usage_provider));
+                                                      transient_usage_provider));
 }
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
index 8ec479084d2..86049736a38 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
@@ -22,7 +22,7 @@ struct IBucketStateCalculator;
 struct IAttributeManager;
 class AttributeUsageFilter;
 class IDiskMemUsageNotifier;
-class TransientMemoryUsageProvider;
+class TransientResourceUsageProvider;
 namespace bucketdb { class IBucketCreateNotifier; }
 
 /**
@@ -54,7 +54,7 @@ struct MaintenanceJobsInjector
                            IAttributeManagerSP readyAttributeManager,
                            IAttributeManagerSP notReadyAttributeManager,
                            std::unique_ptr<const AttributeConfigInspector> attribute_config_inspector,
-                           std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider,
+                           std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider,
                            AttributeUsageFilter &attributeUsageFilter);
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index f6c09b6b7c4..bcd9b7d24d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -643,7 +643,7 @@ Proton::addDocumentDB(const document::DocumentType &docType,
     auto flushHandler = std::make_shared<FlushHandlerProxy>(ret);
     _flushEngine->putFlushHandler(docTypeName, flushHandler);
     _diskMemUsageSampler->notifier().addDiskMemUsageListener(ret->diskMemUsageListener());
-    _diskMemUsageSampler->add_transient_memory_usage_provider(ret->transient_memory_usage_provider());
+    _diskMemUsageSampler->add_transient_usage_provider(ret->transient_usage_provider());
     return ret;
 }
 
@@ -681,7 +681,7 @@ Proton::removeDocumentDB(const DocTypeName &docTypeName)
     _metricsEngine->removeMetricsHook(old->getMetricsUpdateHook());
     _metricsEngine->removeDocumentDBMetrics(old->getMetrics());
     _diskMemUsageSampler->notifier().removeDiskMemUsageListener(old->diskMemUsageListener());
-    _diskMemUsageSampler->remove_transient_memory_usage_provider(old->transient_memory_usage_provider());
+    _diskMemUsageSampler->remove_transient_usage_provider(old->transient_usage_provider());
     // Caller should have removed & drained relevant timer tasks
     old->close();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp
index a6497966891..a8397d95313 100644
--- a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp
@@ -16,13 +16,13 @@ SampleAttributeUsageJob(IAttributeManagerSP readyAttributeManager,
                         const vespalib::string &docTypeName,
                         vespalib::duration interval,
                         std::unique_ptr<const AttributeConfigInspector> attribute_config_inspector,
-                        std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider)
+                        std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider)
     : IMaintenanceJob("sample_attribute_usage." + docTypeName, vespalib::duration::zero(), interval),
       _readyAttributeManager(readyAttributeManager),
       _notReadyAttributeManager(notReadyAttributeManager),
       _attributeUsageFilter(attributeUsageFilter),
       _attribute_config_inspector(std::move(attribute_config_inspector)),
-      _transient_memory_usage_provider(std::move(transient_memory_usage_provider))
+      _transient_usage_provider(std::move(transient_usage_provider))
 {
 }
 
@@ -31,7 +31,7 @@ SampleAttributeUsageJob::~SampleAttributeUsageJob() = default;
 bool
 SampleAttributeUsageJob::run()
 {
-    auto context = std::make_shared<AttributeUsageSamplerContext> (_attributeUsageFilter, _attribute_config_inspector, _transient_memory_usage_provider);
+    auto context = std::make_shared<AttributeUsageSamplerContext> (_attributeUsageFilter, _attribute_config_inspector, _transient_usage_provider);
     _readyAttributeManager->asyncForEachAttribute(std::make_shared<AttributeUsageSamplerFunctor>(context, "ready"));
     _notReadyAttributeManager->asyncForEachAttribute(std::make_shared<AttributeUsageSamplerFunctor>(context, "notready"));
     return true;
diff --git a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
index 96cf82df362..bb5cf4154aa 100644
--- a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
@@ -9,7 +9,7 @@ namespace proton {
 struct IAttributeManager;
 class AttributeConfigInspector;
 class AttributeUsageFilter;
-class TransientMemoryUsageProvider;
+class TransientResourceUsageProvider;
 
 /**
  * Class used to sample attribute resource usage and pass aggregated
@@ -24,7 +24,7 @@ class SampleAttributeUsageJob : public IMaintenanceJob
     IAttributeManagerSP   _notReadyAttributeManager;
     AttributeUsageFilter &_attributeUsageFilter;
     std::shared_ptr<const AttributeConfigInspector> _attribute_config_inspector;
-    std::shared_ptr<TransientMemoryUsageProvider> _transient_memory_usage_provider;
+    std::shared_ptr<TransientResourceUsageProvider> _transient_usage_provider;
 public:
     SampleAttributeUsageJob(IAttributeManagerSP readyAttributeManager,
                             IAttributeManagerSP notReadyAttributeManager,
@@ -32,7 +32,7 @@ public:
                             const vespalib::string &docTypeName,
                             vespalib::duration interval,
                             std::unique_ptr<const AttributeConfigInspector> attribute_config_inspector,
-                            std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider);
+                            std::shared_ptr<TransientResourceUsageProvider> transient_usage_provider);
     ~SampleAttributeUsageJob() override;
 
     bool run() override;