Merge pull request #7193 from vespa-engine/arnej/drop-dimension-key

Arnej/drop dimension key

3 files changed, 6 insertions, 6 deletions

diff --git a/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.cpp b/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.cpp
index 84b90ceedec..b95fb6b814c 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.cpp
+++ b/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.cpp
@@ -10,7 +10,7 @@ using vespalib::IllegalStateException;
 using vespalib::make_string;
 
 DataStoredMetrics::DataStoredMetrics(const std::string& name, metrics::MetricSet* owner)
-    : metrics::MetricSet(name, "partofsum yamasdefault", "", owner, "disk"),
+    : metrics::MetricSet(name, "partofsum yamasdefault", "", owner),
       buckets("buckets", "", "buckets managed", this),
       docs("docs", "", "documents stored", this),
       bytes("bytes", "", "bytes stored", this),
diff --git a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp
index d5f73a9e916..30fa2797ef4 100644
--- a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp
+++ b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp
@@ -55,7 +55,7 @@ PersistenceFailuresMetricSet::clone(std::vector<Metric::UP>& ownerList, CopyType
 }
 
 PersistenceOperationMetricSet::PersistenceOperationMetricSet(const std::string& name, MetricSet* owner)
-    : MetricSet(name, "", vespalib::make_string("Statistics for the %s command", name.c_str()), owner, "operationtype"),
+    : MetricSet(name, "", vespalib::make_string("Statistics for the %s command", name.c_str()), owner),
       latency("latency", "yamasdefault", vespalib::make_string("The average latency of %s operations", name.c_str()), this),
       ok("ok", "logdefault yamasdefault", vespalib::make_string("The number of successful %s operations performed", name.c_str()), this),
       failures(this)
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
index 1293b5d1808..52d95e9a3ed 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
@@ -10,7 +10,7 @@ using metrics::MetricSet;
 using metrics::LoadTypeSet;
 
 FileStorThreadMetrics::Op::Op(const std::string& id, const std::string& name, MetricSet* owner)
-    : MetricSet(id, id, name + " load in filestor thread", owner, "operationtype"),
+    : MetricSet(id, "", name + " load in filestor thread", owner),
       _name(name),
       count("count", "yamasdefault", "Number of requests processed.", this),
       latency("latency", "yamasdefault", "Latency of successful requests.", this),
@@ -118,7 +118,7 @@ FileStorThreadMetrics::Visitor::clone(std::vector<Metric::UP>& ownerList,
 }
 
 FileStorThreadMetrics::FileStorThreadMetrics(const std::string& name, const std::string& desc, const LoadTypeSet& lt)
-    : MetricSet(name, "filestor partofsum thread", desc, nullptr, "thread"),
+    : MetricSet(name, "filestor partofsum", desc),
       operations("operations", "", "Number of operations processed.", this),
       failedOperations("failedoperations", "", "Number of operations throwing exceptions.", this),
       put(lt, OpWithRequestSize<Op>("put", "Put"), this),
@@ -176,7 +176,7 @@ FileStorThreadMetrics::~FileStorThreadMetrics() = default;
 
 FileStorStripeMetrics::FileStorStripeMetrics(const std::string& name, const std::string& description,
                                              const LoadTypeSet& loadTypes)
-    : MetricSet(name, "partofsum stripe", description, nullptr, "stripe"),
+    : MetricSet(name, "partofsum", description),
       averageQueueWaitingTime(loadTypes,
                               metrics::DoubleAverageMetric("averagequeuewait", "",
                                                            "Average time an operation spends in input queue."),
@@ -188,7 +188,7 @@ FileStorStripeMetrics::~FileStorStripeMetrics() = default;
 
 FileStorDiskMetrics::FileStorDiskMetrics(const std::string& name, const std::string& description,
                                          const metrics::LoadTypeSet& loadTypes, MetricSet* owner)
-    : MetricSet(name, "partofsum disk", description, owner, "disk"),
+    : MetricSet(name, "partofsum", description, owner),
       sumThreads("allthreads", "sum", "", this),
       sumStripes("allstripes", "sum", "", this),
       averageQueueWaitingTime(loadTypes,