summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2019-09-02 09:46:48 +0200
committerGitHub <noreply@github.com>2019-09-02 09:46:48 +0200
commitae2ca223379fad2eaa3f4619821050a7a96d36d4 (patch)
tree681333bf5e1e89fb0fb197cba1e29cb9f709ecc2 /searchcore
parentf136af60da5409130ede78a028f5f3883881b53b (diff)
parent76b389f2477812e9f37145f5e59cce70cc83df19 (diff)
Merge pull request #10468 from vespa-engine/havardpe/proto-rpc-metrics
add search protocol metrics
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 5db499601f3..58313f17235 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -321,6 +321,7 @@ Proton::init(const BootstrapConfig::SP & configSnapshot)
RPCHooks::Params rpcParams(*this, protonConfig.rpcport, _configUri.getConfigId());
rpcParams.slobrok_config = _configUri.createWithNewId(protonConfig.slobrokconfigid);
_rpcHooks = std::make_unique<RPCHooks>(rpcParams);
+ _metricsEngine->addExternalMetrics(_rpcHooks->proto_rpc_adapter_metrics());
waitForInitDone();
diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
index 21b433acf7b..78e3c5d3f3c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
+++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
@@ -99,6 +99,7 @@ public:
RPCHooksBase(const RPCHooksBase &) = delete;
RPCHooksBase & operator = (const RPCHooksBase &) = delete;
RPCHooksBase(Params &params);
+ auto &proto_rpc_adapter_metrics() { return _proto_rpc_adapter->metrics(); }
void set_online();
virtual ~RPCHooksBase();
void close();