diff --git a/source/common/filter/config_discovery_impl.h b/source/common/filter/config_discovery_impl.h index 6b36bf9d37f3a..c9a5432f2bf35 100644 --- a/source/common/filter/config_discovery_impl.h +++ b/source/common/filter/config_discovery_impl.h @@ -249,7 +249,7 @@ class FilterConfigSubscription Init::SharedTargetImpl init_target_; bool started_{false}; - Stats::ScopePtr scope_; + Stats::ScopeSharedPtr scope_; ExtensionConfigDiscoveryStats stats_; // FilterConfigProviderManagerImplBase maintains active subscriptions in a map. diff --git a/source/common/rds/rds_route_config_subscription.h b/source/common/rds/rds_route_config_subscription.h index d1753d105a783..98d5e9418f984 100644 --- a/source/common/rds/rds_route_config_subscription.h +++ b/source/common/rds/rds_route_config_subscription.h @@ -80,7 +80,7 @@ class RdsRouteConfigSubscription : Envoy::Config::SubscriptionCallbacks, protected: const std::string route_config_name_; // This scope must outlive the subscription_ below as the subscription has derived stats. - Stats::ScopePtr scope_; + Stats::ScopeSharedPtr scope_; Envoy::Config::SubscriptionPtr subscription_; Server::Configuration::ServerFactoryContext& factory_context_; diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h index c226277d261ab..227a483a1dddc 100644 --- a/source/common/router/config_impl.h +++ b/source/common/router/config_impl.h @@ -238,7 +238,7 @@ class VirtualHostImpl : public VirtualHost, Logger::Loggable struct VirtualClusterBase : public VirtualCluster { public: VirtualClusterBase(const absl::optional& name, Stats::StatName stat_name, - Stats::ScopePtr&& scope, const VirtualClusterStatNames& stat_names) + Stats::ScopeSharedPtr&& scope, const VirtualClusterStatNames& stat_names) : name_(name), stat_name_(stat_name), scope_(std::move(scope)), stats_(generateStats(*scope_, stat_names)) {} @@ -252,7 +252,7 @@ class VirtualHostImpl : public VirtualHost, Logger::Loggable private: const absl::optional name_; const Stats::StatName stat_name_; - Stats::ScopePtr scope_; + Stats::ScopeSharedPtr scope_; mutable VirtualClusterStats stats_; }; @@ -271,7 +271,7 @@ class VirtualHostImpl : public VirtualHost, Logger::Loggable static const std::shared_ptr SSL_REDIRECT_ROUTE; const Stats::StatNameManagedStorage stat_name_storage_; - Stats::ScopePtr vcluster_scope_; + Stats::ScopeSharedPtr vcluster_scope_; std::vector routes_; std::vector virtual_clusters_; SslRequirements ssl_requirements_; @@ -1191,7 +1191,7 @@ class RouteMatcher { const WildcardVirtualHosts& wildcard_virtual_hosts, SubstringFunction substring_function) const; - Stats::ScopePtr vhost_scope_; + Stats::ScopeSharedPtr vhost_scope_; absl::node_hash_map virtual_hosts_; // std::greater as a minor optimization to iterate from more to less specific // diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h index decd0d88a9282..44c5990e76522 100644 --- a/source/common/router/scoped_rds.h +++ b/source/common/router/scoped_rds.h @@ -227,7 +227,7 @@ class ScopedRdsConfigSubscription Server::Configuration::ServerFactoryContext& factory_context_; const std::string name_; // Stats must outlive subscription. - Stats::ScopePtr scope_; + Stats::ScopeSharedPtr scope_; ScopedRdsStats stats_; Envoy::Config::SubscriptionPtr subscription_; const envoy::extensions::filters::network::http_connection_manager::v3::ScopedRoutes:: diff --git a/source/common/router/vhds.h b/source/common/router/vhds.h index 41071ae4ee287..919afea87fbe4 100644 --- a/source/common/router/vhds.h +++ b/source/common/router/vhds.h @@ -67,7 +67,7 @@ class VhdsSubscription : Envoy::Config::SubscriptionBase store = std::make_unique(symbol_table); Stats::StatNamePool pool(symbol_table); - Stats::ScopePtr scope = store->createScope(provider.ConsumeRandomLengthString(max_len)); + Stats::ScopeSharedPtr scope = store->createScope(provider.ConsumeRandomLengthString(max_len)); Stats::ElementVec ele_vec; Stats::StatNameVec sn_vec; Stats::StatNameTagVector tags;