Remove no longer used metrics for Vespa 8.

11 files changed, 4 insertions, 59 deletions

diff --git a/searchcore/src/tests/proton/matching/matching_stats_test.cpp b/searchcore/src/tests/proton/matching/matching_stats_test.cpp
index ce623aa877e..b8bc4eaa7e6 100644
--- a/searchcore/src/tests/proton/matching/matching_stats_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_stats_test.cpp
@@ -47,51 +47,43 @@ TEST("requireThatAverageTimesAreRecorded") {
     EXPECT_APPROX(0.0, stats.matchTimeAvg(), 0.00001);
     EXPECT_APPROX(0.0, stats.groupingTimeAvg(), 0.00001);
     EXPECT_APPROX(0.0, stats.rerankTimeAvg(), 0.00001);
-    EXPECT_APPROX(0.0, stats.queryCollateralTimeAvg(), 0.00001);
     EXPECT_APPROX(0.0, stats.querySetupTimeAvg(), 0.00001);
     EXPECT_APPROX(0.0, stats.queryLatencyAvg(), 0.00001);
     EXPECT_EQUAL(0u, stats.matchTimeCount());
     EXPECT_EQUAL(0u, stats.groupingTimeCount());
     EXPECT_EQUAL(0u, stats.rerankTimeCount());
-    EXPECT_EQUAL(0u, stats.queryCollateralTimeCount());
     EXPECT_EQUAL(0u, stats.querySetupTimeCount());
     EXPECT_EQUAL(0u, stats.queryLatencyCount());
-    stats.matchTime(0.01).groupingTime(0.1).rerankTime(0.5).queryCollateralTime(2.0).querySetupTime(2.0).queryLatency(1.0);
+    stats.matchTime(0.01).groupingTime(0.1).rerankTime(0.5).querySetupTime(2.0).queryLatency(1.0);
     EXPECT_APPROX(0.01, stats.matchTimeAvg(), 0.00001);
     EXPECT_APPROX(0.1, stats.groupingTimeAvg(), 0.00001);
     EXPECT_APPROX(0.5, stats.rerankTimeAvg(), 0.00001);
-    EXPECT_APPROX(2.0, stats.queryCollateralTimeAvg(), 0.00001);
     EXPECT_APPROX(2.0, stats.querySetupTimeAvg(), 0.00001);
     EXPECT_APPROX(1.0, stats.queryLatencyAvg(), 0.00001);
-    stats.add(MatchingStats().matchTime(0.03).groupingTime(0.3).rerankTime(1.5).queryCollateralTime(6.0).querySetupTime(6.0).queryLatency(3.0));
+    stats.add(MatchingStats().matchTime(0.03).groupingTime(0.3).rerankTime(1.5).querySetupTime(6.0).queryLatency(3.0));
     EXPECT_APPROX(0.02, stats.matchTimeAvg(), 0.00001);
     EXPECT_APPROX(0.2, stats.groupingTimeAvg(), 0.00001);
     EXPECT_APPROX(1.0, stats.rerankTimeAvg(), 0.00001);
-    EXPECT_APPROX(4.0, stats.queryCollateralTimeAvg(), 0.00001);
     EXPECT_APPROX(4.0, stats.querySetupTimeAvg(), 0.00001);
     EXPECT_APPROX(2.0, stats.queryLatencyAvg(), 0.00001);
     stats.add(MatchingStats().matchTime(0.05)
               .groupingTime(0.5)
               .rerankTime(2.5)
-              .queryCollateralTime(10.0)
               .querySetupTime(10.0)
               .queryLatency(5.0));
     stats.add(MatchingStats().matchTime(0.05).matchTime(0.03)
               .groupingTime(0.5).groupingTime(0.3)
               .rerankTime(2.5).rerankTime(1.5)
-              .queryCollateralTime(10.0).queryCollateralTime(6.0)
               .querySetupTime(10.0).querySetupTime(6.0)
               .queryLatency(5.0).queryLatency(3.0));
     EXPECT_APPROX(0.03, stats.matchTimeAvg(), 0.00001);
     EXPECT_APPROX(0.3, stats.groupingTimeAvg(), 0.00001);
     EXPECT_APPROX(1.5, stats.rerankTimeAvg(), 0.00001);
-    EXPECT_APPROX(6.0, stats.queryCollateralTimeAvg(), 0.00001);
     EXPECT_APPROX(6.0, stats.querySetupTimeAvg(), 0.00001);
     EXPECT_APPROX(3.0, stats.queryLatencyAvg(), 0.00001);
     EXPECT_EQUAL(4u, stats.matchTimeCount());
     EXPECT_EQUAL(4u, stats.groupingTimeCount());
     EXPECT_EQUAL(4u, stats.rerankTimeCount());
-    EXPECT_EQUAL(4u, stats.queryCollateralTimeCount());
     EXPECT_EQUAL(4u, stats.querySetupTimeCount());
     EXPECT_EQUAL(4u, stats.queryLatencyCount());
 }
@@ -101,63 +93,53 @@ TEST("requireThatMinMaxTimesAreRecorded") {
     EXPECT_APPROX(0.0, stats.matchTimeMin(), 0.00001);
     EXPECT_APPROX(0.0, stats.groupingTimeMin(), 0.00001);
     EXPECT_APPROX(0.0, stats.rerankTimeMin(), 0.00001);
-    EXPECT_APPROX(0.0, stats.queryCollateralTimeMin(), 0.00001);
     EXPECT_APPROX(0.0, stats.querySetupTimeMin(), 0.00001);
     EXPECT_APPROX(0.0, stats.queryLatencyMin(), 0.00001);
     EXPECT_APPROX(0.0, stats.matchTimeMax(), 0.00001);
     EXPECT_APPROX(0.0, stats.groupingTimeMax(), 0.00001);
     EXPECT_APPROX(0.0, stats.rerankTimeMax(), 0.00001);
-    EXPECT_APPROX(0.0, stats.queryCollateralTimeMax(), 0.00001);
     EXPECT_APPROX(0.0, stats.querySetupTimeMax(), 0.00001);
     EXPECT_APPROX(0.0, stats.queryLatencyMax(), 0.00001);
-    stats.matchTime(0.01).groupingTime(0.1).rerankTime(0.5).queryCollateralTime(2.0).querySetupTime(2.0).queryLatency(1.0);
+    stats.matchTime(0.01).groupingTime(0.1).rerankTime(0.5).querySetupTime(2.0).queryLatency(1.0);
     EXPECT_APPROX(0.01, stats.matchTimeMin(), 0.00001);
     EXPECT_APPROX(0.1, stats.groupingTimeMin(), 0.00001);
     EXPECT_APPROX(0.5, stats.rerankTimeMin(), 0.00001);
-    EXPECT_APPROX(2.0, stats.queryCollateralTimeMin(), 0.00001);
     EXPECT_APPROX(2.0, stats.querySetupTimeMin(), 0.00001);
     EXPECT_APPROX(1.0, stats.queryLatencyMin(), 0.00001);
     EXPECT_APPROX(0.01, stats.matchTimeMax(), 0.00001);
     EXPECT_APPROX(0.1, stats.groupingTimeMax(), 0.00001);
     EXPECT_APPROX(0.5, stats.rerankTimeMax(), 0.00001);
-    EXPECT_APPROX(2.0, stats.queryCollateralTimeMax(), 0.00001);
     EXPECT_APPROX(2.0, stats.querySetupTimeMax(), 0.00001);
     EXPECT_APPROX(1.0, stats.queryLatencyMax(), 0.00001);
-    stats.add(MatchingStats().matchTime(0.03).groupingTime(0.3).rerankTime(1.5).queryCollateralTime(6.0).querySetupTime(6.0).queryLatency(3.0));
+    stats.add(MatchingStats().matchTime(0.03).groupingTime(0.3).rerankTime(1.5).querySetupTime(6.0).queryLatency(3.0));
     EXPECT_APPROX(0.01, stats.matchTimeMin(), 0.00001);
     EXPECT_APPROX(0.1, stats.groupingTimeMin(), 0.00001);
     EXPECT_APPROX(0.5, stats.rerankTimeMin(), 0.00001);
-    EXPECT_APPROX(2.0, stats.queryCollateralTimeMin(), 0.00001);
     EXPECT_APPROX(2.0, stats.querySetupTimeMin(), 0.00001);
     EXPECT_APPROX(1.0, stats.queryLatencyMin(), 0.00001);
     EXPECT_APPROX(0.03, stats.matchTimeMax(), 0.00001);
     EXPECT_APPROX(0.3, stats.groupingTimeMax(), 0.00001);
     EXPECT_APPROX(1.5, stats.rerankTimeMax(), 0.00001);
-    EXPECT_APPROX(6.0, stats.queryCollateralTimeMax(), 0.00001);
     EXPECT_APPROX(6.0, stats.querySetupTimeMax(), 0.00001);
     EXPECT_APPROX(3.0, stats.queryLatencyMax(), 0.00001);
     stats.add(MatchingStats().matchTime(0.05)
               .groupingTime(0.5)
               .rerankTime(2.5)
-              .queryCollateralTime(10.0)
               .querySetupTime(10.0)
               .queryLatency(5.0));
     stats.add(MatchingStats().matchTime(0.05).matchTime(0.03)
               .groupingTime(0.5).groupingTime(0.3)
               .rerankTime(2.5).rerankTime(1.5)
-              .queryCollateralTime(10.0).queryCollateralTime(6.0)
               .querySetupTime(10.0).querySetupTime(6.0)
               .queryLatency(5.0).queryLatency(3.0));
     EXPECT_APPROX(0.01, stats.matchTimeMin(), 0.00001);
     EXPECT_APPROX(0.1, stats.groupingTimeMin(), 0.00001);
     EXPECT_APPROX(0.5, stats.rerankTimeMin(), 0.00001);
-    EXPECT_APPROX(2.0, stats.queryCollateralTimeMin(), 0.00001);
     EXPECT_APPROX(2.0, stats.querySetupTimeMin(), 0.00001);
     EXPECT_APPROX(1.0, stats.queryLatencyMin(), 0.00001);
     EXPECT_APPROX(0.05, stats.matchTimeMax(), 0.00001);
     EXPECT_APPROX(0.5, stats.groupingTimeMax(), 0.00001);
     EXPECT_APPROX(2.5, stats.rerankTimeMax(), 0.00001);
-    EXPECT_APPROX(10.0, stats.queryCollateralTimeMax(), 0.00001);
     EXPECT_APPROX(10.0, stats.querySetupTimeMax(), 0.00001);
     EXPECT_APPROX(5.0, stats.queryLatencyMax(), 0.00001);
 }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
index 381915f53d4..88d5281535a 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
@@ -290,7 +290,6 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl
             request.ranking.c_str());
     }
     double querySetupTime = vespalib::to_s(total_matching_time.elapsed()) - my_stats.queryLatencyAvg();
-    my_stats.queryCollateralTime(querySetupTime); // TODO: Remove in Vespa 8
     my_stats.querySetupTime(querySetupTime);
     {
         vespalib::duration duration = request.getTimeUsed();
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matching_stats.cpp b/searchcore/src/vespa/searchcore/proton/matching/matching_stats.cpp
index bbb9dba9a30..86fb3cf8107 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matching_stats.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matching_stats.cpp
@@ -29,7 +29,6 @@ MatchingStats::MatchingStats(double prev_soft_doom_factor)
       _softDoomed(0),
       _doomOvertime(),
       _softDoomFactor(prev_soft_doom_factor),
-      _queryCollateralTime(), // TODO: Remove in Vespa 8
       _querySetupTime(),
       _queryLatency(),
       _matchTime(),
@@ -70,7 +69,6 @@ MatchingStats::add(const MatchingStats &rhs)
     _softDoomed += rhs.softDoomed();
     _doomOvertime.add(rhs._doomOvertime);
 
-    _queryCollateralTime.add(rhs._queryCollateralTime); // TODO: Remove in Vespa 8
     _querySetupTime.add(rhs._querySetupTime);
     _queryLatency.add(rhs._queryLatency);
     _matchTime.add(rhs._matchTime);
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matching_stats.h b/searchcore/src/vespa/searchcore/proton/matching/matching_stats.h
index eafa14870fa..4139bfbaf66 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matching_stats.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/matching_stats.h
@@ -127,7 +127,6 @@ private:
     Avg                    _doomOvertime;
     using SoftDoomFactor = vespalib::datastore::AtomicValueWrapper<double>;
     SoftDoomFactor         _softDoomFactor;
-    Avg                    _queryCollateralTime; // TODO: Remove in Vespa 8
     Avg                    _querySetupTime;
     Avg                    _queryLatency;
     Avg                    _matchTime;
@@ -171,13 +170,6 @@ public:
     double softDoomFactor() const { return _softDoomFactor.load_relaxed(); }
     MatchingStats &updatesoftDoomFactor(vespalib::duration hardLimit, vespalib::duration softLimit, vespalib::duration duration);
 
-    // TODO: Remove in Vespa 8
-    MatchingStats &queryCollateralTime(double time_s) { _queryCollateralTime.set(time_s); return *this; }
-    double queryCollateralTimeAvg() const { return _queryCollateralTime.avg(); }
-    size_t queryCollateralTimeCount() const { return _queryCollateralTime.count(); }
-    double queryCollateralTimeMin() const { return _queryCollateralTime.min(); }
-    double queryCollateralTimeMax() const { return _queryCollateralTime.max(); }
-
     MatchingStats &querySetupTime(double time_s) { _querySetupTime.set(time_s); return *this; }
     double querySetupTimeAvg() const { return _querySetupTime.avg(); }
     size_t querySetupTimeCount() const { return _querySetupTime.count(); }
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
index e895a03b190..2535b518335 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
@@ -118,8 +118,6 @@ DocumentDBTaggedMetrics::MatchingMetrics::update(const MatchingStats &stats)
     docsReRanked.inc(stats.docsReRanked());
     softDoomedQueries.inc(stats.softDoomed());
     queries.inc(stats.queries());
-    queryCollateralTime.addValueBatch(stats.queryCollateralTimeAvg(), stats.queryCollateralTimeCount(),
-                                      stats.queryCollateralTimeMin(), stats.queryCollateralTimeMax());
     querySetupTime.addValueBatch(stats.querySetupTimeAvg(), stats.querySetupTimeCount(),
                                       stats.querySetupTimeMin(), stats.querySetupTimeMax());
     queryLatency.addValueBatch(stats.queryLatencyAvg(), stats.queryLatencyCount(),
@@ -133,7 +131,6 @@ DocumentDBTaggedMetrics::MatchingMetrics::MatchingMetrics(MetricSet *parent)
       docsReRanked("docs_reranked", {}, "Number of documents re-ranked (second phase)", this),
       queries("queries", {}, "Number of queries executed", this),
       softDoomedQueries("soft_doomed_queries", {}, "Number of queries hitting the soft timeout", this),
-      queryCollateralTime("query_collateral_time", {}, "Average time (sec) spent setting up and tearing down queries", this),
       querySetupTime("query_setup_time", {}, "Average time (sec) spent setting up and tearing down queries", this),
       queryLatency("query_latency", {}, "Total average latency (sec) when matching and ranking a query", this)
 {
@@ -155,7 +152,6 @@ DocumentDBTaggedMetrics::MatchingMetrics::RankProfileMetrics::RankProfileMetrics
       matchTime("match_time", {}, "Average time (sec) for matching a query (1st phase)", this),
       groupingTime("grouping_time", {}, "Average time (sec) spent on grouping", this),
       rerankTime("rerank_time", {}, "Average time (sec) spent on 2nd phase ranking", this),
-      queryCollateralTime("query_collateral_time", {}, "Average time (sec) spent setting up and tearing down queries", this),
       querySetupTime("query_setup_time", {}, "Average time (sec) spent setting up and tearing down queries", this),
       queryLatency("query_latency", {}, "Total average latency (sec) when matching and ranking a query", this)
 {
@@ -208,8 +204,6 @@ DocumentDBTaggedMetrics::MatchingMetrics::RankProfileMetrics::update(const metri
                                stats.groupingTimeMin(), stats.groupingTimeMax());
     rerankTime.addValueBatch(stats.rerankTimeAvg(), stats.rerankTimeCount(),
                              stats.rerankTimeMin(), stats.rerankTimeMax());
-    queryCollateralTime.addValueBatch(stats.queryCollateralTimeAvg(), stats.queryCollateralTimeCount(),
-                                      stats.queryCollateralTimeMin(), stats.queryCollateralTimeMax());
     querySetupTime.addValueBatch(stats.querySetupTimeAvg(), stats.querySetupTimeCount(),
                                       stats.querySetupTimeMin(), stats.querySetupTimeMax());
     queryLatency.addValueBatch(stats.queryLatencyAvg(), stats.queryLatencyCount(),
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
index c9d321d6752..7d3a50647b9 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
@@ -117,7 +117,6 @@ struct DocumentDBTaggedMetrics : metrics::MetricSet
         metrics::LongCountMetric docsReRanked;
         metrics::LongCountMetric queries;
         metrics::LongCountMetric softDoomedQueries;
-        metrics::DoubleAverageMetric queryCollateralTime;
         metrics::DoubleAverageMetric querySetupTime;
         metrics::DoubleAverageMetric queryLatency;
 
@@ -147,7 +146,6 @@ struct DocumentDBTaggedMetrics : metrics::MetricSet
             metrics::DoubleAverageMetric matchTime;
             metrics::DoubleAverageMetric groupingTime;
             metrics::DoubleAverageMetric rerankTime;
-            metrics::DoubleAverageMetric queryCollateralTime;
             metrics::DoubleAverageMetric querySetupTime;
             metrics::DoubleAverageMetric queryLatency;
             DocIdPartitions              partitions;
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
index 406432ef697..7c4dcf434a3 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
@@ -7,7 +7,6 @@ namespace proton {
 void
 ExecutorMetrics::update(const vespalib::ExecutorStats &stats)
 {
-    maxPending.set(stats.queueSize.max());
     accepted.inc(stats.acceptedTasks);
     rejected.inc(stats.rejectedTasks);
     wakeupCount.inc(stats.wakeupCount);
@@ -18,7 +17,6 @@ ExecutorMetrics::update(const vespalib::ExecutorStats &stats)
 
 ExecutorMetrics::ExecutorMetrics(const std::string &name, metrics::MetricSet *parent)
     : metrics::MetricSet(name, {}, "Instance specific thread executor metrics", parent),
-      maxPending("maxpending", {}, "Maximum number of pending (active + queued) tasks", this),
       accepted("accepted", {}, "Number of accepted tasks", this),
       rejected("rejected", {}, "Number of rejected tasks", this),
       wakeupCount("wakeups", {}, "Number of times a worker thread has been woken up", this),
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
index 31d959a399f..af3a27da240 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
@@ -11,7 +11,6 @@ namespace proton {
 
 struct ExecutorMetrics : metrics::MetricSet
 {
-    metrics::LongValueMetric   maxPending; // TODO Remove on Vespa 8 or sooner if possible.
     metrics::LongCountMetric   accepted;
     metrics::LongCountMetric   rejected;
     metrics::LongCountMetric   wakeupCount;
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.cpp
index d026ef549d4..0ad248060fd 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.cpp
@@ -36,11 +36,7 @@ ResourceUsageMetrics::DetailedResourceMetrics::~DetailedResourceMetrics() = defa
 ResourceUsageMetrics::ResourceUsageMetrics(metrics::MetricSet *parent)
     : MetricSet("resource_usage", {}, "Usage metrics for various resources in this content node", parent),
       disk("disk", {}, "The relative amount of disk used by this content node (transient usage not included, value in the range [0, 1]). Same value as reported to the cluster controller", this),
-      diskUtilization("disk_utilization", {}, "The relative amount of disk used compared to the disk resource limit", this),
       memory("memory", {}, "The relative amount of memory used by this content node (transient usage not included, value in the range [0, 1]). Same value as reported to the cluster controller", this),
-      memoryUtilization("memory_utilization", {}, "The relative amount of memory used compared to the memory resource limit", this),
-      transient_memory("transient_memory", {}, "The relative amount of transient memory needed for loading attributes. Max value among all attributes (value in the range [0, 1])", this),
-      transient_disk("transient_disk", {}, "The relative amount of transient disk needed for running disk index fusion. Max value among all disk indexes (value in the range [0, 1])", this),
       disk_usage("disk", this),
       memory_usage("memory", this),
       memoryMappings("memory_mappings", {}, "The number of mapped memory areas", this),
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
index 97cad935dba..6f0f16d822e 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
@@ -32,15 +32,8 @@ struct ResourceUsageMetrics : metrics::MetricSet
         ~DetailedResourceMetrics();
     };
 
-    // TODO Vespa 8: Remove diskUtilization, memoryUtilization, transient_memory, transient_disk.
-    // These are now included in disk_usage and memory_usage.
-
     metrics::DoubleValueMetric disk;
-    metrics::DoubleValueMetric diskUtilization;
     metrics::DoubleValueMetric memory;
-    metrics::DoubleValueMetric memoryUtilization;
-    metrics::DoubleValueMetric transient_memory;
-    metrics::DoubleValueMetric transient_disk;
     DetailedResourceMetrics disk_usage;
     DetailedResourceMetrics memory_usage;
     metrics::LongValueMetric memoryMappings;
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 871a72de3ca..ff5924fa6bc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -760,15 +760,11 @@ Proton::updateMetrics(const metrics::MetricLockGuard &)
         const DiskMemUsageFilter &usageFilter = _diskMemUsageSampler->writeFilter();
         auto dm_metrics = usageFilter.get_metrics();
         metrics.resourceUsage.disk.set(dm_metrics.non_transient_disk_usage());
-        metrics.resourceUsage.diskUtilization.set(dm_metrics.total_disk_utilization());
-        metrics.resourceUsage.transient_disk.set(dm_metrics.transient_disk_usage());
         metrics.resourceUsage.disk_usage.total.set(dm_metrics.total_disk_usage());
         metrics.resourceUsage.disk_usage.total_util.set(dm_metrics.total_disk_utilization());
         metrics.resourceUsage.disk_usage.transient.set(dm_metrics.transient_disk_usage());
 
         metrics.resourceUsage.memory.set(dm_metrics.non_transient_memory_usage());
-        metrics.resourceUsage.memoryUtilization.set(dm_metrics.total_memory_utilization());
-        metrics.resourceUsage.transient_memory.set(dm_metrics.transient_memory_usage());
         metrics.resourceUsage.memory_usage.total.set(dm_metrics.total_memory_usage());
         metrics.resourceUsage.memory_usage.total_util.set(dm_metrics.total_memory_utilization());
         metrics.resourceUsage.memory_usage.transient.set(dm_metrics.transient_memory_usage());