diff --git a/cilium/host_map.cc b/cilium/host_map.cc index bf8985880..79af22144 100644 --- a/cilium/host_map.cc +++ b/cilium/host_map.cc @@ -205,10 +205,11 @@ PolicyHostMap::PolicyHostMap(Server::Configuration::CommonFactoryContext& contex bool subscribe) : ManagedGrpcSubscription( NetworkPolicyHostsTypeUrl, []() { return std::make_shared(); }, - config_source, context, context.serverScope().createScope("cilium.hostmap."), subscribe), + config_source, context, context.serverScope().createScope("cilium.nphds."), subscribe), tls_(context.threadLocal().allocateSlot()), name_(absl::StrCat("cilium.hostmap.", fmt::format("{}", instance_id_ + 1), ".")), - stats_({CILIUM_POLICY_HOSTS_STATS(POOL_COUNTER(scope()))}) { + host_stats_scope_(context.serverScope().createScope("cilium.hostmap.")), + stats_({CILIUM_POLICY_HOSTS_STATS(POOL_COUNTER(*host_stats_scope_))}) { instance_id_++; ENVOY_LOG(debug, "PolicyHostMap({}) created.", name_); diff --git a/cilium/host_map.h b/cilium/host_map.h index ba1cdfaf4..f9fdf8648 100644 --- a/cilium/host_map.h +++ b/cilium/host_map.h @@ -19,6 +19,7 @@ #include "envoy/protobuf/message_validator.h" #include "envoy/server/factory_context.h" #include "envoy/singleton/instance.h" +#include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" #include "envoy/thread_local/thread_local.h" #include "envoy/thread_local/thread_local_object.h" @@ -222,6 +223,7 @@ class PolicyHostMap : public Singleton::Instance, public ManagedGrpcSubscription std::string name_; uint64_t accepted_stream_generation_{0}; static uint64_t instance_id_; + Stats::ScopeSharedPtr host_stats_scope_; PolicyHostsStats stats_; };