Do not generate metrics at all for distributor, there are none.

2 files changed, 5 insertions, 4 deletions

diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.cpp b/storage/src/vespa/storage/storageserver/servicelayernode.cpp
index b5bed68259a..65615bea2dd 100644
--- a/storage/src/vespa/storage/storageserver/servicelayernode.cpp
+++ b/storage/src/vespa/storage/storageserver/servicelayernode.cpp
@@ -40,10 +40,13 @@ ServiceLayerNode::ServiceLayerNode(const config::ConfigUri & configUri, ServiceL
 }
 
 void
-ServiceLayerNode::report(vespalib::JsonStream &writer) const
+ServiceLayerNode::report(vespalib::JsonStream &stream) const
 {
+    using namespace vespalib::jsonstream;
     if (_bucket_manager) {
-        _bucket_manager->report(writer);
+        stream << "metrics" << Object() << "values" << Array();
+        _bucket_manager->report(stream);
+        stream << End() << End();
     }
 }
 
diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp
index 49957d1d321..742f994cb2d 100644
--- a/storage/src/vespa/storage/storageserver/statemanager.cpp
+++ b/storage/src/vespa/storage/storageserver/statemanager.cpp
@@ -573,9 +573,7 @@ StateManager::getNodeInfo() const
     stream << Object();
     { // Print metrics
         try {
-            stream << "metrics" << Object() << "values" << Array();
             _nodeStateReporter.report(stream);
-            stream << End() << End();
         } catch (vespalib::Exception& e) {
             stream << Object() << "error" << e.getMessage() << End();
         }