Skip to content

context: replace transport socket context with generic context #39201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wbpcode wants to merge 1 commit into from
Closed

context: replace transport socket context with generic context #39201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion contrib/client_ssl_auth/filters/network/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Network::FilterFactoryCb ClientSslAuthConfigFactory::createFilterFactoryFromProt

ClientSslAuthConfigSharedPtr filter_config(ClientSslAuthConfig::create(
proto_config, server_context.threadLocal(), server_context.clusterManager(),
server_context.mainThreadDispatcher(), context.scope(),
server_context.mainThreadDispatcher(), context.statsScope(),
server_context.api().randomGenerator()));
return [filter_config](Network::FilterManager& filter_manager) -> void {
filter_manager.addReadFilter(std::make_shared<ClientSslAuthFilter>(filter_config));
Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CryptoMb {
Ssl::PrivateKeyMethodProviderSharedPtr
CryptoMbPrivateKeyMethodFactory::createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& proto_config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) {
Server::Configuration::GenericFactoryContext& private_key_provider_context) {
ProtobufTypes::MessagePtr message =
std::make_unique<envoy::extensions::private_key_providers::cryptomb::v3alpha::
CryptoMbPrivateKeyMethodConfig>();
Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/source/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class CryptoMbPrivateKeyMethodFactory : public Ssl::PrivateKeyMethodProviderInst
// Ssl::PrivateKeyMethodProviderInstanceFactory
Ssl::PrivateKeyMethodProviderSharedPtr createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& message,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) override;
Server::Configuration::GenericFactoryContext& private_key_provider_context) override;
std::string name() const override { return "cryptomb"; };
};

Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/source/cryptomb_private_key_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ void CryptoMbPrivateKeyMethodProvider::unregisterPrivateKeyMethod(SSL* ssl) {
CryptoMbPrivateKeyMethodProvider::CryptoMbPrivateKeyMethodProvider(
const envoy::extensions::private_key_providers::cryptomb::v3alpha::
CryptoMbPrivateKeyMethodConfig& conf,
Server::Configuration::TransportSocketFactoryContext& factory_context, IppCryptoSharedPtr ipp)
Server::Configuration::GenericFactoryContext& factory_context, IppCryptoSharedPtr ipp)
: api_(factory_context.serverFactoryContext().api()),
tls_(ThreadLocal::TypedSlot<ThreadLocalData>::makeUnique(
factory_context.serverFactoryContext().threadLocal())),
Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/source/cryptomb_private_key_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class CryptoMbPrivateKeyMethodProvider : public virtual Ssl::PrivateKeyMethodPro
CryptoMbPrivateKeyMethodProvider(
const envoy::extensions::private_key_providers::cryptomb::v3alpha::
CryptoMbPrivateKeyMethodConfig& config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context,
Server::Configuration::GenericFactoryContext& private_key_provider_context,
IppCryptoSharedPtr ipp);

// Ssl::PrivateKeyMethodProvider
Expand Down
8 changes: 4 additions & 4 deletions contrib/cryptomb/private_key_providers/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ parsePrivateKeyProviderFromV3Yaml(const std::string& yaml_string) {
class CryptoMbConfigTest : public Event::TestUsingSimulatedTime, public testing::Test {
public:
CryptoMbConfigTest() : api_(Api::createApiForTest(store_, time_system_)) {
ON_CALL(factory_context_.server_context_, api()).WillByDefault(ReturnRef(*api_));
ON_CALL(factory_context_.server_context_, threadLocal()).WillByDefault(ReturnRef(tls_));
ON_CALL(factory_context_.server_context_, sslContextManager())
ON_CALL(factory_context_.server_factory_context_, api()).WillByDefault(ReturnRef(*api_));
ON_CALL(factory_context_.server_factory_context_, threadLocal()).WillByDefault(ReturnRef(tls_));
ON_CALL(factory_context_.server_factory_context_, sslContextManager())
.WillByDefault(ReturnRef(context_manager_));
ON_CALL(context_manager_, privateKeyMethodManager())
.WillByDefault(ReturnRef(private_key_method_manager_));
Expand All @@ -56,7 +56,7 @@ class CryptoMbConfigTest : public Event::TestUsingSimulatedTime, public testing:
}

Event::SimulatedTimeSystem time_system_;
NiceMock<Server::Configuration::MockTransportSocketFactoryContext> factory_context_;
NiceMock<Server::Configuration::MockGenericFactoryContext> factory_context_;
Stats::IsolatedStoreImpl store_;
Api::ApiPtr api_;
NiceMock<ThreadLocal::MockInstance> tls_;
Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/test/fake_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ FakeCryptoMbPrivateKeyMethodFactory::FakeCryptoMbPrivateKeyMethodFactory(
Ssl::PrivateKeyMethodProviderSharedPtr
FakeCryptoMbPrivateKeyMethodFactory::createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& proto_config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) {
Server::Configuration::GenericFactoryContext& private_key_provider_context) {
ProtobufTypes::MessagePtr message =
std::make_unique<envoy::extensions::private_key_providers::cryptomb::v3alpha::
CryptoMbPrivateKeyMethodConfig>();
Expand Down
2 changes: 1 addition & 1 deletion contrib/cryptomb/private_key_providers/test/fake_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class FakeCryptoMbPrivateKeyMethodFactory : public Ssl::PrivateKeyMethodProvider
// Ssl::PrivateKeyMethodProviderInstanceFactory
Ssl::PrivateKeyMethodProviderSharedPtr createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& message,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) override;
Server::Configuration::GenericFactoryContext& private_key_provider_context) override;
std::string name() const override { return "cryptomb"; };

private:
Expand Down
2 changes: 1 addition & 1 deletion contrib/dynamo/filters/http/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Dynamo {
Http::FilterFactoryCb DynamoFilterConfig::createFilterFactoryFromProtoTyped(
const envoy::extensions::filters::http::dynamo::v3::Dynamo&, const std::string& stats_prefix,
Server::Configuration::FactoryContext& context) {
auto stats = std::make_shared<DynamoStats>(context.scope(), stats_prefix);
auto stats = std::make_shared<DynamoStats>(context.statsScope(), stats_prefix);
return [&context, stats](Http::FilterChainFactoryCallbacks& callbacks) -> void {
callbacks.addStreamFilter(
std::make_shared<Dynamo::DynamoFilter>(context.serverFactoryContext().runtime(), stats,
Expand Down
9 changes: 5 additions & 4 deletions contrib/golang/filters/http/source/golang_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,8 +1524,9 @@ FilterConfig::FilterConfig(
: plugin_name_(proto_config.plugin_name()), so_id_(proto_config.library_id()),
so_path_(proto_config.library_path()), plugin_config_(proto_config.plugin_config()),
concurrency_(context.serverFactoryContext().options().concurrency()),
stats_(GolangFilterStats::generateStats(stats_prefix, context.scope())), dso_lib_(dso_lib),
metric_store_(std::make_shared<MetricStore>(context.scope().createScope(""))),
stats_(GolangFilterStats::generateStats(stats_prefix, context.statsScope())),
dso_lib_(dso_lib),
metric_store_(std::make_shared<MetricStore>(context.statsScope().createScope(""))),
secret_reader_(std::make_shared<SecretReader>(proto_config, context)) {};

void FilterConfig::newGoPluginConfig() {
Expand Down Expand Up @@ -1785,7 +1786,7 @@ namespace {
Secret::GenericSecretConfigProviderSharedPtr
secretsProvider(const envoy::extensions::transport_sockets::tls::v3::SdsSecretConfig& config,
Secret::SecretManager& secret_manager,
Server::Configuration::TransportSocketFactoryContext& transport_socket_factory,
Server::Configuration::GenericFactoryContext& transport_socket_factory,
Init::Manager& init_manager) {
if (config.has_sds_config()) {
return secret_manager.findOrCreateGenericSecretProvider(config.sds_config(), config.name(),
Expand All @@ -1802,7 +1803,7 @@ SecretReader::SecretReader(
if (proto_config.generic_secrets_size() > 0) {
auto& secret_manager =
context.serverFactoryContext().clusterManager().clusterManagerFactory().secretManager();
auto& transport_socket_factory = context.getTransportSocketFactoryContext();
auto& transport_socket_factory = context.getGenericFactoryContext();
auto& init_manager = context.initManager();
auto& tls = context.serverFactoryContext().threadLocal();
auto& api = context.serverFactoryContext().api();
Expand Down
2 changes: 1 addition & 1 deletion contrib/kafka/filters/network/source/broker/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Network::FilterFactoryCb KafkaConfigFactory::createFilterFactoryFromProtoTyped(
std::make_shared<BrokerFilterConfig>(proto_config);
return [&context, filter_config](Network::FilterManager& filter_manager) -> void {
Network::FilterSharedPtr filter = std::make_shared<KafkaBrokerFilter>(
context.scope(), context.serverFactoryContext().timeSource(), filter_config);
context.statsScope(), context.serverFactoryContext().timeSource(), filter_config);
filter_manager.addFilter(filter);
};
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/language/filters/http/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Http::FilterFactoryCb LanguageFilterFactory::createFilterFactoryFromProtoTyped(

auto config = std::make_shared<LanguageFilterConfigImpl>(
std::make_shared<icu::Locale>(default_locale), locale_matcher,
proto_config.clear_route_cache(), stats_prefix, context.scope());
proto_config.clear_route_cache(), stats_prefix, context.statsScope());

return [config](Http::FilterChainFactoryCallbacks& callbacks) -> void {
auto filter = std::make_shared<LanguageFilter>(config);
Expand Down
2 changes: 1 addition & 1 deletion contrib/mysql_proxy/filters/network/source/mysql_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ NetworkFilters::MySQLProxy::MySQLConfigFactory::createFilterFactoryFromProtoType
const std::string stat_prefix = fmt::format("mysql.{}", proto_config.stat_prefix());

MySQLFilterConfigSharedPtr filter_config(
std::make_shared<MySQLFilterConfig>(stat_prefix, context.scope()));
std::make_shared<MySQLFilterConfig>(stat_prefix, context.statsScope()));
return [filter_config](Network::FilterManager& filter_manager) -> void {
filter_manager.addFilter(std::make_shared<MySQLFilter>(filter_config));
};
Expand Down
2 changes: 1 addition & 1 deletion contrib/postgres_proxy/filters/network/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ NetworkFilters::PostgresProxy::PostgresConfigFactory::createFilterFactoryFromPro
config_options.upstream_ssl_ = proto_config.upstream_ssl();

PostgresFilterConfigSharedPtr filter_config(
std::make_shared<PostgresFilterConfig>(config_options, context.scope()));
std::make_shared<PostgresFilterConfig>(config_options, context.statsScope()));
return [filter_config](Network::FilterManager& filter_manager) -> void {
filter_manager.addFilter(std::make_shared<PostgresFilter>(filter_config));
};
Expand Down
10 changes: 6 additions & 4 deletions contrib/postgres_proxy/filters/network/test/postgres_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,9 @@ class UpstreamSSLBaseIntegrationTest : public PostgresBaseIntegrationTest {

TestUtility::loadFromYaml(TestEnvironment::substitute(yaml_plain), downstream_tls_context);

NiceMock<Server::Configuration::MockTransportSocketFactoryContext> mock_factory_ctx;
ON_CALL(mock_factory_ctx.server_context_, api()).WillByDefault(testing::ReturnRef(*api_));
NiceMock<Server::Configuration::MockGenericFactoryContext> mock_factory_ctx;
ON_CALL(mock_factory_ctx.server_factory_context_, api())
.WillByDefault(testing::ReturnRef(*api_));
auto cfg = *Extensions::TransportSockets::Tls::ServerContextConfigImpl::create(
downstream_tls_context, mock_factory_ctx, false);
static auto* client_stats_store = new Stats::TestIsolatedStoreImpl();
Expand Down Expand Up @@ -534,8 +535,9 @@ class UpstreamAndDownstreamSSLIntegrationTest : public UpstreamSSLBaseIntegratio

envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext upstream_tls_context;

NiceMock<Server::Configuration::MockTransportSocketFactoryContext> mock_factory_ctx;
ON_CALL(mock_factory_ctx.server_context_, api()).WillByDefault(testing::ReturnRef(*api_));
NiceMock<Server::Configuration::MockGenericFactoryContext> mock_factory_ctx;
ON_CALL(mock_factory_ctx.server_factory_context_, api())
.WillByDefault(testing::ReturnRef(*api_));
auto cfg = *Extensions::TransportSockets::Tls::ClientContextConfigImpl::create(
upstream_tls_context, mock_factory_ctx);
static auto* client_stats_store = new Stats::TestIsolatedStoreImpl();
Expand Down
2 changes: 1 addition & 1 deletion contrib/qat/private_key_providers/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Qat {
Ssl::PrivateKeyMethodProviderSharedPtr
QatPrivateKeyMethodFactory::createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& proto_config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) {
Server::Configuration::GenericFactoryContext& private_key_provider_context) {
ProtobufTypes::MessagePtr message = std::make_unique<
envoy::extensions::private_key_providers::qat::v3alpha::QatPrivateKeyMethodConfig>();

Expand Down
2 changes: 1 addition & 1 deletion contrib/qat/private_key_providers/source/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class QatPrivateKeyMethodFactory : public Ssl::PrivateKeyMethodProviderInstanceF
// Ssl::PrivateKeyMethodProviderInstanceFactory
Ssl::PrivateKeyMethodProviderSharedPtr createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& message,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) override;
Server::Configuration::GenericFactoryContext& private_key_provider_context) override;

public:
std::string name() const override { return "qat"; };
Expand Down
3 changes: 1 addition & 2 deletions contrib/qat/private_key_providers/source/qat_private_key_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,7 @@ void QatPrivateKeyMethodProvider::unregisterPrivateKeyMethod(SSL* ssl) {

QatPrivateKeyMethodProvider::QatPrivateKeyMethodProvider(
const envoy::extensions::private_key_providers::qat::v3alpha::QatPrivateKeyMethodConfig& conf,
Server::Configuration::TransportSocketFactoryContext& factory_context,
LibQatCryptoSharedPtr libqat)
Server::Configuration::GenericFactoryContext& factory_context, LibQatCryptoSharedPtr libqat)
: api_(factory_context.serverFactoryContext().api()), libqat_(libqat) {

manager_ = factory_context.serverFactoryContext().singletonManager().getTyped<QatManager>(
Expand Down
2 changes: 1 addition & 1 deletion contrib/qat/private_key_providers/source/qat_private_key_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class QatPrivateKeyMethodProvider : public virtual Ssl::PrivateKeyMethodProvider
QatPrivateKeyMethodProvider(
const envoy::extensions::private_key_providers::qat::v3alpha::QatPrivateKeyMethodConfig&
config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context,
Server::Configuration::GenericFactoryContext& private_key_provider_context,
LibQatCryptoSharedPtr libqat);
// Ssl::PrivateKeyMethodProvider
void registerPrivateKeyMethod(SSL* ssl, Ssl::PrivateKeyConnectionCallbacks& cb,
Expand Down
9 changes: 5 additions & 4 deletions contrib/qat/private_key_providers/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@ class QatConfigTest : public Event::TestUsingSimulatedTime, public testing::Test
QatConfigTest()
: api_(Api::createApiForTest(store_, time_system_)),
libqat_(std::make_shared<FakeLibQatCryptoImpl>()), fsm_(libqat_) {
ON_CALL(factory_context_.server_context_, api()).WillByDefault(ReturnRef(*api_));
ON_CALL(factory_context_.server_context_, sslContextManager())
ON_CALL(factory_context_.server_factory_context_, api()).WillByDefault(ReturnRef(*api_));
ON_CALL(factory_context_.server_factory_context_, sslContextManager())
.WillByDefault(ReturnRef(context_manager_));
ON_CALL(context_manager_, privateKeyMethodManager())
.WillByDefault(ReturnRef(private_key_method_manager_));
ON_CALL(factory_context_.server_context_, singletonManager()).WillByDefault(ReturnRef(fsm_));
ON_CALL(factory_context_.server_factory_context_, singletonManager())
.WillByDefault(ReturnRef(fsm_));
}

Ssl::PrivateKeyMethodProviderSharedPtr createWithConfig(std::string yaml) {
Expand All @@ -69,7 +70,7 @@ class QatConfigTest : public Event::TestUsingSimulatedTime, public testing::Test
}

Event::SimulatedTimeSystem time_system_;
NiceMock<Server::Configuration::MockTransportSocketFactoryContext> factory_context_;
NiceMock<Server::Configuration::MockGenericFactoryContext> factory_context_;
Stats::IsolatedStoreImpl store_;
Api::ApiPtr api_;
NiceMock<Ssl::MockContextManager> context_manager_;
Expand Down
2 changes: 1 addition & 1 deletion contrib/qat/private_key_providers/test/fake_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ CpaStatus FakeLibQatCryptoImpl::cpaCyStopInstance(CpaInstanceHandle instance_han
Ssl::PrivateKeyMethodProviderSharedPtr
FakeQatPrivateKeyMethodFactory::createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& proto_config,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) {
Server::Configuration::GenericFactoryContext& private_key_provider_context) {
ProtobufTypes::MessagePtr message = std::make_unique<
envoy::extensions::private_key_providers::qat::v3alpha::QatPrivateKeyMethodConfig>();

Expand Down
2 changes: 1 addition & 1 deletion contrib/qat/private_key_providers/test/fake_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class FakeQatPrivateKeyMethodFactory : public Ssl::PrivateKeyMethodProviderInsta
// Ssl::PrivateKeyMethodProviderInstanceFactory
Ssl::PrivateKeyMethodProviderSharedPtr createPrivateKeyMethodProviderInstance(
const envoy::extensions::transport_sockets::tls::v3::PrivateKeyProvider& message,
Server::Configuration::TransportSocketFactoryContext& private_key_provider_context) override;
Server::Configuration::GenericFactoryContext& private_key_provider_context) override;
std::string name() const override { return "qat"; };
};

Expand Down
7 changes: 4 additions & 3 deletions contrib/qat/private_key_providers/test/ops_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ class QatProviderTest : public testing::Test {
dispatcher_(api_->allocateDispatcher("test_thread")),
libqat_(std::make_shared<FakeLibQatCryptoImpl>()), fsm_(libqat_) {
handle_.setLibqat(libqat_);
ON_CALL(factory_context_.server_context_, api()).WillByDefault(testing::ReturnRef(*api_));
ON_CALL(factory_context_.server_context_, singletonManager())
ON_CALL(factory_context_.server_factory_context_, api())
.WillByDefault(testing::ReturnRef(*api_));
ON_CALL(factory_context_.server_factory_context_, singletonManager())
.WillByDefault(testing::ReturnRef(fsm_));
}

Expand All @@ -71,7 +72,7 @@ class QatProviderTest : public testing::Test {
Event::DispatcherPtr dispatcher_;
QatHandle handle_;
std::shared_ptr<FakeLibQatCryptoImpl> libqat_;
NiceMock<Server::Configuration::MockTransportSocketFactoryContext> factory_context_;
NiceMock<Server::Configuration::MockGenericFactoryContext> factory_context_;
FakeSingletonManager fsm_;

// Result of an operation.
Expand Down
2 changes: 1 addition & 1 deletion contrib/rocketmq_proxy/filters/network/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ REGISTER_FACTORY(RocketmqProxyFilterConfigFactory,
ConfigImpl::ConfigImpl(const RocketmqProxyConfig& config,
Server::Configuration::FactoryContext& context)
: context_(context), stats_prefix_(fmt::format("rocketmq.{}.", config.stat_prefix())),
stats_(RocketmqFilterStats::generateStats(stats_prefix_, context_.scope())),
stats_(RocketmqFilterStats::generateStats(stats_prefix_, context_.statsScope())),
route_matcher_(
new Router::RouteMatcher(config.route_config(), context.serverFactoryContext())),
develop_mode_(config.develop_mode()),
Expand Down
4 changes: 2 additions & 2 deletions contrib/sip_proxy/filters/network/source/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Network::FilterFactoryCb SipProxyFilterConfigFactory::createFilterFactoryFromPro
auto transaction_infos = std::make_shared<Router::TransactionInfos>();
for (auto& cluster : unique_clusters) {
Stats::ScopeSharedPtr stats_scope =
context.scope().createScope(fmt::format("cluster.{}.sip_cluster", cluster));
context.statsScope().createScope(fmt::format("cluster.{}.sip_cluster", cluster));
auto transaction_info_ptr = std::make_shared<Router::TransactionInfo>(
cluster, context.serverFactoryContext().threadLocal(),
static_cast<std::chrono::milliseconds>(
Expand Down Expand Up @@ -80,7 +80,7 @@ ConfigImpl::ConfigImpl(
const envoy::extensions::filters::network::sip_proxy::v3alpha::SipProxy& config,
Server::Configuration::FactoryContext& context)
: context_(context), stats_prefix_(fmt::format("sip.{}.", config.stat_prefix())),
stats_(SipFilterStats::generateStats(stats_prefix_, context_.scope())),
stats_(SipFilterStats::generateStats(stats_prefix_, context_.statsScope())),
route_matcher_(new Router::RouteMatcher(config.route_config())),
settings_(std::make_shared<SipSettings>(
static_cast<std::chrono::milliseconds>(
Expand Down
2 changes: 1 addition & 1 deletion contrib/sip_proxy/filters/network/source/router/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RouterFilterConfigImpl : public RouterFilterConfig {
RouterFilterConfigImpl(
const envoy::extensions::filters::network::sip_proxy::router::v3alpha::Router& config,
const std::string& stat_prefix, Server::Configuration::FactoryContext& context)
: stats_(generateStats(stat_prefix, context.scope())) {
: stats_(generateStats(stat_prefix, context.statsScope())) {
UNREFERENCED_PARAMETER(config);
}

Expand Down
Loading
Loading