register with macro (envoyproxy#5716)

*Description*:
From discussion in envoyproxy#5602.

*Risk Level*: Low
*Testing*: CI
*Docs Changes*:
*Release Notes*:

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Fred Douglas <fredlas@google.com>

include/envoy/registry/registry.h

@@ -126,5 +126,13 @@ template <class T, class Base> class RegisterFactory {
   T instance_{};
 };
 
+/**
+ * Macro used for static registration.
+ */
+#define REGISTER_FACTORY(FACTORY, BASE)                                                            \
+  static Envoy::Registry::RegisterFactory</* NOLINT(fuchsia-statically-constructed-objects) */     \
+                                          FACTORY, BASE>                                           \
+      FACTORY##_registered
+
 } // namespace Registry
 } // namespace Envoy

source/extensions/access_loggers/file/config.cc

@@ -69,9 +69,7 @@ FileAccessLogFactory::convertJsonFormatToMap(ProtobufWkt::Struct json_format) {
 /**
  * Static registration for the file access log. @see RegisterFactory.
  */
-static Registry::RegisterFactory<FileAccessLogFactory,
-                                 Server::Configuration::AccessLogInstanceFactory>
-    register_;
+REGISTER_FACTORY(FileAccessLogFactory, Server::Configuration::AccessLogInstanceFactory);
 
 } // namespace File
 } // namespace AccessLoggers

source/extensions/access_loggers/http_grpc/config.cc

@@ -49,9 +49,7 @@ std::string HttpGrpcAccessLogFactory::name() const { return AccessLogNames::get(
 /**
  * Static registration for the HTTP gRPC access log. @see RegisterFactory.
  */
-static Registry::RegisterFactory<HttpGrpcAccessLogFactory,
-                                 Server::Configuration::AccessLogInstanceFactory>
-    register_;
+REGISTER_FACTORY(HttpGrpcAccessLogFactory, Server::Configuration::AccessLogInstanceFactory);
 
 } // namespace HttpGrpc
 } // namespace AccessLoggers

source/extensions/filters/http/buffer/config.cc

@@ -46,9 +46,7 @@ BufferFilterFactory::createRouteSpecificFilterConfigTyped(
 /**
  * Static registration for the buffer filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<BufferFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(BufferFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace BufferFilter
 } // namespace HttpFilters

source/extensions/filters/http/cors/config.cc

@@ -22,9 +22,7 @@ CorsFilterFactory::createFilter(const std::string& stats_prefix,
 /**
  * Static registration for the cors filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<CorsFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(CorsFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Cors
 } // namespace HttpFilters

source/extensions/filters/http/dynamo/config.cc

@@ -23,9 +23,7 @@ DynamoFilterConfig::createFilter(const std::string& stat_prefix,
 /**
  * Static registration for the http dynamodb filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<DynamoFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(DynamoFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Dynamo
 } // namespace HttpFilters

source/extensions/filters/http/ext_authz/config.cc

@@ -67,9 +67,7 @@ ExtAuthzFilterConfig::createRouteSpecificFilterConfigTyped(
 /**
  * Static registration for the external authorization filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<ExtAuthzFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(ExtAuthzFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace ExtAuthz
 } // namespace HttpFilters

source/extensions/filters/http/fault/config.cc

@@ -41,9 +41,7 @@ FaultFilterFactory::createRouteSpecificFilterConfigTyped(
 /**
  * Static registration for the fault filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<FaultFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(FaultFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Fault
 } // namespace HttpFilters

source/extensions/filters/http/grpc_http1_bridge/config.cc

@@ -20,9 +20,7 @@ GrpcHttp1BridgeFilterConfig::createFilter(const std::string&,
 /**
  * Static registration for the grpc HTTP1 bridge filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<GrpcHttp1BridgeFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(GrpcHttp1BridgeFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace GrpcHttp1Bridge
 } // namespace HttpFilters

source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc

@@ -22,8 +22,8 @@ Http::FilterFactoryCb Config::createFilterFactoryFromProtoTyped(
 /**
  * Static registration for the grpc http1 reverse bridge filter. @see RegisterFactory.
  */
-static Envoy::Registry::RegisterFactory<Config, Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(Config, Server::Configuration::NamedHttpFilterConfigFactory);
+
 } // namespace GrpcHttp1ReverseBridge
 } // namespace HttpFilters
 } // namespace Extensions

source/extensions/filters/http/grpc_json_transcoder/config.cc

@@ -35,9 +35,8 @@ Http::FilterFactoryCb GrpcJsonTranscoderFilterConfig::createFilterFactory(
 /**
  * Static registration for the grpc transcoding filter. @see RegisterNamedHttpFilterConfigFactory.
  */
-static Registry::RegisterFactory<GrpcJsonTranscoderFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(GrpcJsonTranscoderFilterConfig,
+                 Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace GrpcJsonTranscoder
 } // namespace HttpFilters

source/extensions/filters/http/grpc_web/config.cc

@@ -19,9 +19,7 @@ Http::FilterFactoryCb GrpcWebFilterConfig::createFilter(const std::string&,
 /**
  * Static registration for the gRPC-Web filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<GrpcWebFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(GrpcWebFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace GrpcWeb
 } // namespace HttpFilters

source/extensions/filters/http/gzip/config.cc

@@ -23,9 +23,7 @@ Http::FilterFactoryCb GzipFilterFactory::createFilterFactoryFromProtoTyped(
 /**
  * Static registration for the gzip filter. @see NamedHttpFilterConfigFactory.
  */
-static Registry::RegisterFactory<GzipFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(GzipFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Gzip
 } // namespace HttpFilters

source/extensions/filters/http/header_to_metadata/config.cc

@@ -28,9 +28,7 @@ Http::FilterFactoryCb HeaderToMetadataConfig::createFilterFactoryFromProtoTyped(
 /**
  * Static registration for the header-to-metadata filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<HeaderToMetadataConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(HeaderToMetadataConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace HeaderToMetadataFilter
 } // namespace HttpFilters

source/extensions/filters/http/health_check/config.cc

@@ -67,9 +67,7 @@ HealthCheckFilterConfig::createFilterFactory(const Json::Object& json_config,
 /**
  * Static registration for the health check filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<HealthCheckFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(HealthCheckFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace HealthCheck
 } // namespace HttpFilters

source/extensions/filters/http/ip_tagging/config.cc

@@ -27,9 +27,7 @@ Http::FilterFactoryCb IpTaggingFilterFactory::createFilterFactoryFromProtoTyped(
 /**
  * Static registration for the ip tagging filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<IpTaggingFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(IpTaggingFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace IpTagging
 } // namespace HttpFilters

source/extensions/filters/http/jwt_authn/filter_factory.cc

@@ -53,8 +53,7 @@ FilterFactory::createFilterFactoryFromProtoTyped(const JwtAuthentication& proto_
 /**
  * Static registration for this jwt_authn filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<FilterFactory, Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(FilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace JwtAuthn
 } // namespace HttpFilters

source/extensions/filters/http/lua/config.cc

@@ -34,9 +34,7 @@ LuaFilterConfig::createFilterFactory(const Json::Object& json_config,
 /**
  * Static registration for the Lua filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<LuaFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(LuaFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Lua
 } // namespace HttpFilters

source/extensions/filters/http/ratelimit/config.cc

@@ -55,9 +55,7 @@ RateLimitFilterConfig::createFilterFactory(const Json::Object& json_config,
 /**
  * Static registration for the rate limit filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<RateLimitFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(RateLimitFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace RateLimitFilter
 } // namespace HttpFilters

source/extensions/filters/http/rbac/config.cc

@@ -31,9 +31,8 @@ RoleBasedAccessControlFilterConfigFactory::createRouteSpecificFilterConfigTyped(
 /**
  * Static registration for the RBAC filter. @see RegisterFactory
  */
-static Registry::RegisterFactory<RoleBasedAccessControlFilterConfigFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(RoleBasedAccessControlFilterConfigFactory,
+                 Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace RBACFilter
 } // namespace HttpFilters

source/extensions/filters/http/router/config.cc

@@ -37,9 +37,7 @@ RouterFilterConfig::createFilterFactory(const Json::Object& json_config,
 /**
  * Static registration for the router filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<RouterFilterConfig,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(RouterFilterConfig, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace RouterFilter
 } // namespace HttpFilters

source/extensions/filters/http/squash/config.cc

@@ -41,9 +41,7 @@ Http::FilterFactoryCb SquashFilterConfigFactory::createFilterFactoryFromProtoTyp
 /**
  * Static registration for the squash filter. @see RegisterFactory.
  */
-static Envoy::Registry::RegisterFactory<SquashFilterConfigFactory,
-                                        Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(SquashFilterConfigFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace Squash
 } // namespace HttpFilters

source/extensions/filters/http/tap/config.cc

@@ -35,9 +35,7 @@ Http::FilterFactoryCb TapFilterFactory::createFilterFactoryFromProtoTyped(
 /**
  * Static registration for the tap filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<TapFilterFactory,
-                                 Server::Configuration::NamedHttpFilterConfigFactory>
-    register_;
+REGISTER_FACTORY(TapFilterFactory, Server::Configuration::NamedHttpFilterConfigFactory);
 
 } // namespace TapFilter
 } // namespace HttpFilters

source/extensions/filters/listener/original_dst/config.cc

@@ -35,9 +35,7 @@ class OriginalDstConfigFactory : public Server::Configuration::NamedListenerFilt
 /**
  * Static registration for the original dst filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<OriginalDstConfigFactory,
-                                 Server::Configuration::NamedListenerFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory);
 
 } // namespace OriginalDst
 } // namespace ListenerFilters

source/extensions/filters/listener/original_src/original_src_config_factory.cc

@@ -29,9 +29,7 @@ ProtobufTypes::MessagePtr OriginalSrcConfigFactory::createEmptyConfigProto() {
 /**
  * Static registration for the original_src filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<OriginalSrcConfigFactory,
-                                 Server::Configuration::NamedListenerFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory);
 
 } // namespace OriginalSrc
 } // namespace ListenerFilters

source/extensions/filters/listener/proxy_protocol/config.cc

@@ -34,9 +34,8 @@ class ProxyProtocolConfigFactory : public Server::Configuration::NamedListenerFi
 /**
  * Static registration for the proxy protocol filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<ProxyProtocolConfigFactory,
-                                 Server::Configuration::NamedListenerFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(ProxyProtocolConfigFactory,
+                 Server::Configuration::NamedListenerFilterConfigFactory);
 
 } // namespace ProxyProtocol
 } // namespace ListenerFilters

source/extensions/filters/listener/tls_inspector/config.cc

@@ -36,9 +36,8 @@ class TlsInspectorConfigFactory : public Server::Configuration::NamedListenerFil
 /**
  * Static registration for the TLS inspector filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<TlsInspectorConfigFactory,
-                                 Server::Configuration::NamedListenerFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(TlsInspectorConfigFactory,
+                 Server::Configuration::NamedListenerFilterConfigFactory);
 
 } // namespace TlsInspector
 } // namespace ListenerFilters

source/extensions/filters/network/client_ssl_auth/config.cc

@@ -37,9 +37,8 @@ Network::FilterFactoryCb ClientSslAuthConfigFactory::createFilterFactoryFromProt
 /**
  * Static registration for the client SSL auth filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<ClientSslAuthConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(ClientSslAuthConfigFactory,
+                 Server::Configuration::NamedNetworkFilterConfigFactory);
 
 } // namespace ClientSslAuth
 } // namespace NetworkFilters

source/extensions/filters/network/dubbo_proxy/config.cc

@@ -26,9 +26,8 @@ Network::FilterFactoryCb DubboProxyFilterConfigFactory::createFilterFactoryFromP
 /**
  * Static registration for the dubbo filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<DubboProxyFilterConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(DubboProxyFilterConfigFactory,
+                 Server::Configuration::NamedNetworkFilterConfigFactory);
 
 } // namespace DubboProxy
 } // namespace NetworkFilters

source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc

@@ -123,7 +123,7 @@ class DubboProtocolConfigFactory : public ProtocolFactoryBase<DubboProtocolImpl>
 /**
  * Static registration for the Dubbo protocol. @see RegisterFactory.
  */
-static Registry::RegisterFactory<DubboProtocolConfigFactory, NamedProtocolConfigFactory> register_;
+REGISTER_FACTORY(DubboProtocolConfigFactory, NamedProtocolConfigFactory);
 
 } // namespace DubboProxy
 } // namespace NetworkFilters

source/extensions/filters/network/dubbo_proxy/hessian_deserializer_impl.cc

@@ -93,8 +93,7 @@ class HessianDeserializerConfigFactory : public DeserializerFactoryBase<HessianD
 /**
  * Static registration for the Hessian protocol. @see RegisterFactory.
  */
-static Registry::RegisterFactory<HessianDeserializerConfigFactory, NamedDeserializerConfigFactory>
-    register_;
+REGISTER_FACTORY(HessianDeserializerConfigFactory, NamedDeserializerConfigFactory);
 
 } // namespace DubboProxy
 } // namespace NetworkFilters

source/extensions/filters/network/echo/config.cc

@@ -40,9 +40,7 @@ class EchoConfigFactory : public Server::Configuration::NamedNetworkFilterConfig
 /**
  * Static registration for the echo filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<EchoConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(EchoConfigFactory, Server::Configuration::NamedNetworkFilterConfigFactory);
 
 } // namespace Echo
 } // namespace NetworkFilters

source/extensions/filters/network/ext_authz/config.cc

@@ -40,9 +40,7 @@ Network::FilterFactoryCb ExtAuthzConfigFactory::createFilterFactoryFromProtoType
 /**
  * Static registration for the external authorization filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<ExtAuthzConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(ExtAuthzConfigFactory, Server::Configuration::NamedNetworkFilterConfigFactory);
 
 } // namespace ExtAuthz
 } // namespace NetworkFilters

source/extensions/filters/network/http_connection_manager/config.cc

@@ -114,9 +114,8 @@ Network::FilterFactoryCb HttpConnectionManagerFilterConfigFactory::createFilterF
 /**
  * Static registration for the HTTP connection manager filter.
  */
-static Registry::RegisterFactory<HttpConnectionManagerFilterConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(HttpConnectionManagerFilterConfigFactory,
+                 Server::Configuration::NamedNetworkFilterConfigFactory);
 
 InternalAddressConfig::InternalAddressConfig(
     const envoy::config::filter::network::http_connection_manager::v2::HttpConnectionManager::

source/extensions/filters/network/mongo_proxy/config.cc

@@ -55,9 +55,8 @@ MongoProxyFilterConfigFactory::createFilterFactory(const Json::Object& json_conf
 /**
  * Static registration for the mongo filter. @see RegisterFactory.
  */
-static Registry::RegisterFactory<MongoProxyFilterConfigFactory,
-                                 Server::Configuration::NamedNetworkFilterConfigFactory>
-    registered_;
+REGISTER_FACTORY(MongoProxyFilterConfigFactory,
+                 Server::Configuration::NamedNetworkFilterConfigFactory);
 
 } // namespace MongoProxy
 } // namespace NetworkFilters