gc dead debug code.

1 files changed, 5 insertions, 33 deletions

diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 03c39509fbd..7fc8222c703 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -509,34 +509,17 @@ MetricManager::getConsumerSpec(const MetricLockGuard &, const Metric::String& co
     return (it != _consumerConfig.end() ? &it->second : nullptr);
 }
 
-//#define VERIFY_ALL_METRICS_VISITED 1
 
 namespace {
 
 struct ConsumerMetricVisitor : public MetricVisitor {
     const MetricManager::ConsumerSpec& _metricsToMatch;
     MetricVisitor& _client;
-    std::unique_ptr<std::set<Metric::String>> _visitedMetrics;
 
-    ConsumerMetricVisitor(const MetricManager::ConsumerSpec& spec, MetricVisitor& clientVisitor, bool verify)
+    ConsumerMetricVisitor(const MetricManager::ConsumerSpec& spec, MetricVisitor& clientVisitor)
         : _metricsToMatch(spec),
-          _client(clientVisitor),
-          _visitedMetrics()
-    {
-        if (verify) {
-            _visitedMetrics = std::make_unique<std::set<Metric::String>>();
-        }
-    }
-    ~ConsumerMetricVisitor() {
-        if (_visitedMetrics) {
-            for (auto metric: _metricsToMatch.includedMetrics) {
-                if ( ! _visitedMetrics->contains(metric)) {
-                    LOG(info, "Failed to find metric %s to be visited.", metric.c_str());
-                }
-            }
-        }
-    }
-
+          _client(clientVisitor)
+    { }
 
     bool visitMetricSet(const MetricSet& metricSet, bool autoGenerated) override {
         if (metricSet.isTopSet()) return true;
@@ -545,29 +528,21 @@ struct ConsumerMetricVisitor : public MetricVisitor {
     }
     void doneVisitingMetricSet(const MetricSet& metricSet) override {
         if (!metricSet.isTopSet()) {
-            record(metricSet);
             _client.doneVisitingMetricSet(metricSet);
         }
     }
     bool visitCountMetric(const AbstractCountMetric& metric, bool autoGenerated) override {
         if (_metricsToMatch.contains(metric)) {
-            record(metric);
             return _client.visitCountMetric(metric, autoGenerated);
         }
         return true;
     }
     bool visitValueMetric(const AbstractValueMetric& metric, bool autoGenerated) override {
         if (_metricsToMatch.contains(metric)) {
-            record(metric);
             return _client.visitValueMetric(metric, autoGenerated);
         }
         return true;
     }
-    void record(const Metric & m) {
-        if (_visitedMetrics) {
-            _visitedMetrics->insert(m.getPath());
-        }
-    }
 };
 
 }
@@ -582,11 +557,8 @@ MetricManager::visit(const MetricLockGuard & guard, const MetricSnapshot& snapsh
         } else {
             const ConsumerSpec * consumerSpec = getConsumerSpec(guard, consumer);
             if (consumerSpec) {
-#ifdef VERIFY_ALL_METRICS_VISITED
-                ConsumerMetricVisitor consumerVis(*consumerSpec, visitor, true);
-#else
-                ConsumerMetricVisitor consumerVis(*consumerSpec, visitor, false);
-#endif
+
+                ConsumerMetricVisitor consumerVis(*consumerSpec, visitor);
                 snapshot.getMetrics().visit(consumerVis);
             } else {
                 LOGBP(debug, "Requested metrics for non-defined consumer '%s'.", consumer.c_str());