Start the metrics manager after everything has been setup to avoid the expensive metrics altered handling. This causes valgrind runs to be way too costly.

1 files changed, 2 insertions, 5 deletions

diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index d02cfcb8dff..180815554fe 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -194,11 +194,6 @@ App::Main()
             const ProtonConfig &protonConfig = configSnapshot->getProtonConfig();
             vespalib::string basedir = protonConfig.basedir;
             vespalib::mkdir(basedir, true);
-            if ( ! params.serviceidentity.empty()) {
-                proton.getMetricManager().init(params.serviceidentity, proton.getThreadPool());
-            } else {
-                proton.getMetricManager().init(params.identity, proton.getThreadPool());
-            }
             {
                 ExitOnSignal exit_on_signal;
                 proton.init(configSnapshot);
@@ -210,6 +205,8 @@ App::Main()
                 spiProton->setupConfig(std::chrono::milliseconds(params.subscribeTimeout));
                 spiProton->createNode();
                 EV_STARTED("servicelayer");
+            } else {
+                proton.getMetricManager().init(params.identity, proton.getThreadPool());
             }
             EV_STARTED("proton");
             while (!(SIG::INT.check() || SIG::TERM.check() || (spiProton && spiProton->getNode().attemptedStopped()))) {