Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/server/admin/admin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void AdminImpl::startHttpListener(const std::list<AccessLog::InstanceSharedPtr>&
const std::string& address_out_path,
Network::Address::InstanceConstSharedPtr address,
const Network::Socket::OptionsSharedPtr& socket_options,
Stats::ScopePtr&& listener_scope) {
Stats::ScopeSharedPtr&& listener_scope) {
for (const auto& access_log : access_logs) {
access_logs_.emplace_back(access_log);
}
Expand Down
6 changes: 3 additions & 3 deletions source/server/admin/admin.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class AdminImpl : public Admin,
const std::string& address_out_path,
Network::Address::InstanceConstSharedPtr address,
const Network::Socket::OptionsSharedPtr& socket_options,
Stats::ScopePtr&& listener_scope) override;
Stats::ScopeSharedPtr&& listener_scope) override;
uint32_t concurrency() const override { return server_.options().concurrency(); }

// Network::FilterChainManager
Expand Down Expand Up @@ -370,7 +370,7 @@ class AdminImpl : public Admin,

class AdminListener : public Network::ListenerConfig {
public:
AdminListener(AdminImpl& parent, Stats::ScopePtr&& listener_scope)
AdminListener(AdminImpl& parent, Stats::ScopeSharedPtr&& listener_scope)
: parent_(parent), name_("admin"), scope_(std::move(listener_scope)),
stats_(Http::ConnectionManagerImpl::generateListenerStats("http.admin.", *scope_)),
init_manager_(nullptr), ignore_global_conn_limit_(parent.ignore_global_conn_limit_) {}
Expand Down Expand Up @@ -409,7 +409,7 @@ class AdminImpl : public Admin,

AdminImpl& parent_;
const std::string name_;
Stats::ScopePtr scope_;
Stats::ScopeSharedPtr scope_;
Http::ConnectionManagerListenerStats stats_;
Network::NopConnectionBalancerImpl connection_balancer_;
BasicResourceLimitImpl open_connections_;
Expand Down
4 changes: 2 additions & 2 deletions source/server/api_listener_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ class ApiListenerImplBase : public ApiListener,
ListenerManagerImpl& parent_;
const std::string name_;
Network::Address::InstanceConstSharedPtr address_;
Stats::ScopePtr global_scope_;
Stats::ScopePtr listener_scope_;
Stats::ScopeSharedPtr global_scope_;
Stats::ScopeSharedPtr listener_scope_;
FactoryContextImpl factory_context_;
SyntheticReadCallbacks read_callbacks_;
};
Expand Down
2 changes: 1 addition & 1 deletion source/server/config_validation/admin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void ValidationAdmin::startHttpListener(const std::list<AccessLog::InstanceShare
const std::string&,
Network::Address::InstanceConstSharedPtr,
const Network::Socket::OptionsSharedPtr&,
Stats::ScopePtr&&) {}
Stats::ScopeSharedPtr&&) {}

Http::Code ValidationAdmin::request(absl::string_view, absl::string_view, Http::ResponseHeaderMap&,
std::string&) {
Expand Down
2 changes: 1 addition & 1 deletion source/server/config_validation/admin.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ValidationAdmin : public Admin {
const std::string& address_out_path,
Network::Address::InstanceConstSharedPtr address,
const Network::Socket::OptionsSharedPtr&,
Stats::ScopePtr&& listener_scope) override;
Stats::ScopeSharedPtr&& listener_scope) override;
Http::Code request(absl::string_view path_and_query, absl::string_view method,
Http::ResponseHeaderMap& response_headers, std::string& body) override;
void addListenerToHandler(Network::ConnectionHandler* handler) override;
Expand Down
4 changes: 2 additions & 2 deletions source/server/filter_chain_manager_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ class PerFilterChainFactoryContextImpl : public Configuration::FilterChainFactor
private:
Configuration::FactoryContext& parent_context_;
// The scope that has empty prefix.
Stats::ScopePtr scope_;
Stats::ScopeSharedPtr scope_;
// filter_chain_scope_ has the same prefix as listener owners scope.
Stats::ScopePtr filter_chain_scope_;
Stats::ScopeSharedPtr filter_chain_scope_;
Init::Manager& init_manager_;
std::atomic<bool> is_draining_{false};
};
Expand Down
2 changes: 1 addition & 1 deletion source/server/lds_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class LdsApiImpl : public LdsApi,
Config::SubscriptionPtr subscription_;
std::string system_version_info_;
ListenerManager& listener_manager_;
Stats::ScopePtr scope_;
Stats::ScopeSharedPtr scope_;
Upstream::ClusterManager& cm_;
Init::TargetImpl init_target_;
};
Expand Down
4 changes: 2 additions & 2 deletions source/server/listener_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ class ListenerFactoryContextBaseImpl final : public Configuration::FactoryContex
const Envoy::Config::TypedMetadataImpl<Envoy::Network::ListenerTypedMetadataFactory>
typed_metadata_;
envoy::config::core::v3::TrafficDirection direction_;
Stats::ScopePtr global_scope_;
Stats::ScopePtr listener_scope_; // Stats with listener named scope.
Stats::ScopeSharedPtr global_scope_;
Stats::ScopeSharedPtr listener_scope_; // Stats with listener named scope.
ProtobufMessage::ValidationVisitor& validation_visitor_;
const Server::DrainManagerPtr drain_manager_;
bool is_quic_;
Expand Down
2 changes: 1 addition & 1 deletion source/server/listener_manager_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class ListenerManagerImpl : public ListenerManager, Logger::Loggable<Logger::Id:
std::vector<WorkerPtr> workers_;
bool workers_started_{};
absl::optional<StopListenersType> stop_listeners_type_;
Stats::ScopePtr scope_;
Stats::ScopeSharedPtr scope_;
ListenerManagerStats stats_;
ConfigTracker::EntryOwnerPtr config_tracker_entry_;
LdsApiPtr lds_api_;
Expand Down
2 changes: 1 addition & 1 deletion source/server/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class ServerFactoryContextImpl : public Configuration::ServerFactoryContext,

private:
Instance& server_;
Stats::ScopePtr server_scope_;
Stats::ScopeSharedPtr server_scope_;
};

/**
Expand Down