www/envoy: connect most of the available extensions to the build.

3 files changed, 282 insertions, 12 deletions

diff --git a/www/envoy/Makefile b/www/envoy/Makefile
index 93b79025739e..6765c0d10dd7 100644
--- a/www/envoy/Makefile
+++ b/www/envoy/Makefile
@@ -25,11 +25,13 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libcircllhist.so:devel/libcircllhist \
+		libcurl.so:ftp/curl \
 		libevent.so:devel/libevent-devel \
 		libfmt.so:devel/libfmt \
 		libgpr.so:devel/grpc \
 		libicuuc.so:devel/icu \
 		libnghttp2.so:www/libnghttp2 \
+		libopentracing.so:devel/libopentracing \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2 \
 		libxxhash.so:devel/xxhash \
@@ -73,6 +75,8 @@ post-patch:
 		${WRKSRC}/source/common/network/address_impl.cc
 	@${REINPLACE_CMD} -e 's,O_SYMLINK,O_NOFOLLOW,' \
 		${WRKSRC}/source/common/filesystem/kqueue/watcher_impl.cc
+	@${REINPLACE_CMD} -e '/opentracing::v/s,v2,v3,' \
+		${WRKSRC}/source/extensions/tracers/common/ot/opentracing_driver_impl.cc
 	@${REINPLACE_CMD} -e '23s,^,#include "absl/status/status.h",' \
 		${WRKDIR}/cel-cpp-11f9d66/eval/public/ast_traverse.cc
 	@${REINPLACE_CMD} -e '/^#include "eval\/testutil\/test_message/d' \
diff --git a/www/envoy/files/makefile-genproto b/www/envoy/files/makefile-genproto
index 98ad2575a6dd..e20928c2a6ad 100644
--- a/www/envoy/files/makefile-genproto
+++ b/www/envoy/files/makefile-genproto
@@ -113,6 +113,7 @@ API_V3_PB_HEADERS=\
 	envoy/admin/v3/metrics.pb.h \
 	envoy/admin/v3/mutex_stats.pb.h \
 	envoy/admin/v3/server_info.pb.h \
+	envoy/admin/v3/tap.pb.h \
 	envoy/config/accesslog/v3/accesslog.pb.h \
 	envoy/config/bootstrap/v3/bootstrap.pb.h \
 	envoy/config/cluster/v3/circuit_breaker.pb.h \
@@ -140,6 +141,8 @@ API_V3_PB_HEADERS=\
 	envoy/config/endpoint/v3/endpoint.pb.h \
 	envoy/config/endpoint/v3/endpoint_components.pb.h \
 	envoy/config/endpoint/v3/load_report.pb.h \
+	envoy/config/grpc_credential/v3/aws_iam.pb.h \
+	envoy/config/grpc_credential/v3/file_based_metadata.pb.h \
 	envoy/config/listener/v3/api_listener.pb.h \
 	envoy/config/listener/v3/listener.pb.h \
 	envoy/config/listener/v3/listener_components.pb.h \
@@ -148,44 +151,105 @@ API_V3_PB_HEADERS=\
 	envoy/config/metrics/v3/metrics_service.pb.h \
 	envoy/config/metrics/v3/stats.pb.h \
 	envoy/config/overload/v3/overload.pb.h \
+	envoy/config/ratelimit/v3/rls.pb.h \
 	envoy/config/rbac/v3/rbac.pb.h \
 	envoy/config/route/v3/route.pb.h \
 	envoy/config/route/v3/route_components.pb.h \
 	envoy/config/route/v3/scoped_route.pb.h \
+	envoy/config/tap/v3/common.pb.h \
+	envoy/config/trace/v3/dynamic_ot.pb.h \
 	envoy/config/trace/v3/http_tracer.pb.h \
+	envoy/config/trace/v3/opentelemetry.pb.h \
 	envoy/data/accesslog/v3/accesslog.pb.h \
 	envoy/data/cluster/v3/outlier_detection_event.pb.h \
 	envoy/data/core/v3/health_check_event.pb.h \
 	envoy/data/dns/v3/dns_table.pb.h \
+	envoy/data/tap/v3/common.pb.h \
+	envoy/data/tap/v3/http.pb.h \
+	envoy/data/tap/v3/transport.pb.h \
+	envoy/data/tap/v3/wrapper.pb.h \
 	envoy/extensions/access_loggers/file/v3/file.pb.h \
+	envoy/extensions/access_loggers/filters/cel/v3/cel.pb.h \
 	envoy/extensions/access_loggers/grpc/v3/als.pb.h \
 	envoy/extensions/access_loggers/open_telemetry/v3/logs_service.pb.h \
 	envoy/extensions/access_loggers/stream/v3/stream.pb.h \
 	envoy/extensions/access_loggers/wasm/v3/wasm.pb.h \
+	envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.h \
+	envoy/extensions/clusters/aggregate/v3/cluster.pb.h \
+	envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h \
+	envoy/extensions/clusters/redis/v3/redis_cluster.pb.h \
+	envoy/extensions/common/async_files/v3/async_file_manager.pb.h \
 	envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h \
 	envoy/extensions/common/ratelimit/v3/ratelimit.pb.h \
+	envoy/extensions/common/tap/v3/common.pb.h \
 	envoy/extensions/compression/brotli/compressor/v3/brotli.pb.h \
 	envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.h \
 	envoy/extensions/compression/gzip/compressor/v3/gzip.pb.h \
 	envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.h \
 	envoy/extensions/compression/zstd/compressor/v3/zstd.pb.h \
 	envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.h \
+	envoy/extensions/config/validators/minimum_clusters/v3/minimum_clusters.pb.h \
 	envoy/extensions/early_data/v3/default_early_data_policy.pb.h \
 	envoy/extensions/filters/common/dependency/v3/dependency.pb.h \
+	envoy/extensions/filters/common/fault/v3/fault.pb.h \
+	envoy/extensions/filters/http/custom_response/v3/custom_response.pb.h \
+	envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h \
+	envoy/extensions/filters/http/fault/v3/fault.pb.h \
 	envoy/extensions/filters/http/router/v3/router.pb.h \
 	envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.h \
+	envoy/extensions/filters/listener/http_inspector/v3/http_inspector.pb.h \
+	envoy/extensions/filters/listener/local_ratelimit/v3/local_ratelimit.pb.h \
+	envoy/extensions/filters/listener/original_dst/v3/original_dst.pb.h \
+	envoy/extensions/filters/listener/original_src/v3/original_src.pb.h \
 	envoy/extensions/filters/listener/proxy_protocol/v3/proxy_protocol.pb.h \
+	envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.h \
+	envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.h \
+	envoy/extensions/filters/network/direct_response/v3/config.pb.h \
+	envoy/extensions/filters/network/echo/v3/echo.pb.h \
+	envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.h \
 	envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h \
+	envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h \
+	envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.h \
+	envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h \
+	envoy/extensions/filters/network/rbac/v3/rbac.pb.h \
+	envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h \
+	envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.h \
+	envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.pb.h \
+	envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h \
+	envoy/extensions/filters/network/thrift_proxy/v3/route.pb.h \
+	envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h \
+	envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.h \
 	envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.h \
+	envoy/extensions/filters/udp/udp_proxy/v3/route.pb.h \
+	envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h \
+	envoy/extensions/formatter/metadata/v3/metadata.pb.h \
+	envoy/extensions/formatter/req_without_query/v3/req_without_query.pb.h \
+	envoy/extensions/health_checkers/redis/v3/redis.pb.h \
+	envoy/extensions/health_checkers/thrift/v3/thrift.pb.h \
+	envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.h \
+	envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.h \
+	envoy/extensions/http/early_header_mutation/header_mutation/v3/header_mutation.pb.h \
+	envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.h \
 	envoy/extensions/http/header_validators/envoy_default/v3/header_validator.pb.h \
+	envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h \
 	envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h \
+	envoy/extensions/http/stateful_session/cookie/v3/cookie.pb.h \
+	envoy/extensions/http/stateful_session/header/v3/header.pb.h \
+	envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.h \
+	envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.h \
+	envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.h \
+	envoy/extensions/key_value/file_based/v3/config.pb.h \
 	envoy/extensions/load_balancing_policies/common/v3/common.pb.h \
 	envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.h \
 	envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.h \
 	envoy/extensions/load_balancing_policies/random/v3/random.pb.h \
 	envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.h \
 	envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.h \
+	envoy/extensions/matching/common_inputs/environment_variable/v3/input.pb.h \
 	envoy/extensions/matching/common_inputs/network/v3/network_inputs.pb.h \
+	envoy/extensions/matching/common_inputs/ssl/v3/ssl_inputs.pb.h \
+	envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.pb.h \
+	envoy/extensions/matching/input_matchers/ip/v3/ip.pb.h \
 	envoy/extensions/network/dns_resolver/apple/v3/apple_dns_resolver.pb.h \
 	envoy/extensions/network/dns_resolver/cares/v3/cares_dns_resolver.pb.h \
 	envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.h \
@@ -195,18 +259,40 @@ API_V3_PB_HEADERS=\
 	envoy/extensions/quic/connection_id_generator/v3/envoy_deterministic_connection_id_generator.pb.h \
 	envoy/extensions/quic/crypto_stream/v3/crypto_stream.pb.h \
 	envoy/extensions/quic/proof_source/v3/proof_source.pb.h \
+	envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.h \
+	envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.h \
 	envoy/extensions/regex_engines/v3/google_re2.pb.h \
 	envoy/extensions/request_id/uuid/v3/uuid.pb.h \
+	envoy/extensions/resource_monitors/downstream_connections/v3/downstream_connections.pb.h \
+	envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h \
+	envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h \
+	envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.h \
+	envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.h \
+	envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.h \
+	envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.pb.h \
+	envoy/extensions/transport_sockets/internal_upstream/v3/internal_upstream.pb.h \
+	envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.h \
 	envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.h \
 	envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.h \
+	envoy/extensions/transport_sockets/starttls/v3/starttls.pb.h \
+	envoy/extensions/transport_sockets/tap/v3/tap.pb.h \
+	envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.h \
 	envoy/extensions/transport_sockets/tls/v3/cert.pb.h \
 	envoy/extensions/transport_sockets/tls/v3/common.pb.h \
 	envoy/extensions/transport_sockets/tls/v3/secret.pb.h \
 	envoy/extensions/transport_sockets/tls/v3/tls.pb.h \
 	envoy/extensions/udp_packet_writer/v3/udp_default_writer_factory.pb.h \
+	envoy/extensions/udp_packet_writer/v3/udp_gso_batch_writer_factory.pb.h \
+	envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.h \
+	envoy/extensions/upstreams/http/http/v3/http_connection_pool.pb.h \
+	envoy/extensions/upstreams/http/tcp/v3/tcp_connection_pool.pb.h \
 	envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h \
+	envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h \
 	envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.h \
+	envoy/extensions/watchdog/profile_action/v3/profile_action.pb.h \
 	envoy/service/accesslog/v3/als.pb.h \
+	envoy/service/auth/v3/attribute_context.pb.h \
+	envoy/service/auth/v3/external_auth.pb.h \
 	envoy/service/cluster/v3/cds.pb.h \
 	envoy/service/discovery/v3/ads.pb.h \
 	envoy/service/discovery/v3/discovery.pb.h \
@@ -222,6 +308,7 @@ API_V3_PB_HEADERS=\
 	envoy/service/route/v3/srds.pb.h \
 	envoy/service/runtime/v3/rtds.pb.h \
 	envoy/service/secret/v3/sds.pb.h \
+	envoy/type/http/v3/cookie.pb.h \
 	envoy/type/http/v3/path_transformation.pb.h \
 	envoy/type/matcher/v3/filter_state.pb.h \
 	envoy/type/matcher/v3/http_inputs.pb.h \
@@ -235,6 +322,7 @@ API_V3_PB_HEADERS=\
 	envoy/type/tracing/v3/custom_tag.pb.h \
 	envoy/type/v3/hash_policy.pb.h \
 	envoy/type/v3/http.pb.h \
+	envoy/type/v3/http_status.pb.h \
 	envoy/type/v3/percent.pb.h \
 	envoy/type/v3/range.pb.h \
 	envoy/type/v3/ratelimit_unit.pb.h \
@@ -251,9 +339,11 @@ MISC_PB_HEADERS=\
 	io/prometheus/client/metrics.pb.h \
 	opencensus/proto/trace/v1/trace_config.pb.h \
 	opentelemetry/proto/collector/logs/v1/logs_service.pb.h \
+	opentelemetry/proto/collector/trace/v1/trace_service.pb.h \
 	opentelemetry/proto/common/v1/common.pb.h \
 	opentelemetry/proto/logs/v1/logs.pb.h \
 	opentelemetry/proto/resource/v1/resource.pb.h \
+	opentelemetry/proto/trace/v1/trace.pb.h \
 	quiche/quic/core/proto/cached_network_parameters.pb.h \
 	quiche/quic/core/proto/crypto_server_config.pb.h \
 	quiche/quic/core/proto/source_address_token.pb.h \
@@ -273,6 +363,7 @@ MISC_PB_HEADERS=\
 	xds/core/v3/extension.pb.h \
 	xds/core/v3/resource_locator.pb.h \
 	xds/core/v3/resource_name.pb.h \
+	xds/type/matcher/v3/ip.pb.h \
 	xds/type/matcher/v3/matcher.pb.h \
 	xds/type/matcher/v3/regex.pb.h \
 	xds/type/matcher/v3/string.pb.h \
diff --git a/www/envoy/files/makefile-main b/www/envoy/files/makefile-main
index e4e92420c3b0..1821e2ec7602 100644
--- a/www/envoy/files/makefile-main
+++ b/www/envoy/files/makefile-main
@@ -31,6 +31,7 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/admin/v3/metrics.pb.o \
 		envoy/admin/v3/mutex_stats.pb.o \
 		envoy/admin/v3/server_info.pb.o \
+		envoy/admin/v3/tap.pb.o \
 		envoy/annotations/deprecation.pb.o \
 		envoy/annotations/resource.pb.o \
 		envoy/api/v2/auth/cert.pb.o \
@@ -80,6 +81,7 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/config/cluster/v3/outlier_detection.pb.o \
 		envoy/config/common/key_value/v3/config.pb.o \
 		envoy/config/common/matcher/v3/matcher.pb.o \
+		envoy/config/common/mutation_rules/v3/mutation_rules.pb.o \
 		envoy/config/core/v3/address.pb.o \
 		envoy/config/core/v3/backoff.pb.o \
 		envoy/config/core/v3/base.pb.o \
@@ -105,6 +107,8 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.o \
 		envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.o \
 		envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.o \
+		envoy/config/grpc_credential/v3/aws_iam.pb.o \
+		envoy/config/grpc_credential/v3/file_based_metadata.pb.o \
 		envoy/config/listener/v2/api_listener.pb.o \
 		envoy/config/listener/v3/api_listener.pb.o \
 		envoy/config/listener/v3/listener.pb.o \
@@ -117,10 +121,12 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/config/metrics/v3/stats.pb.o \
 		envoy/config/overload/v2alpha/overload.pb.o \
 		envoy/config/overload/v3/overload.pb.o \
+		envoy/config/ratelimit/v3/rls.pb.o \
 		envoy/config/rbac/v3/rbac.pb.o \
 		envoy/config/route/v3/route.pb.o \
 		envoy/config/route/v3/route_components.pb.o \
 		envoy/config/route/v3/scoped_route.pb.o \
+		envoy/config/tap/v3/common.pb.o \
 		envoy/config/trace/v2/datadog.pb.o \
 		envoy/config/trace/v2/dynamic_ot.pb.o \
 		envoy/config/trace/v2/http_tracer.pb.o \
@@ -129,50 +135,139 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/config/trace/v2/service.pb.o \
 		envoy/config/trace/v2/trace.pb.o \
 		envoy/config/trace/v2/zipkin.pb.o \
+		envoy/config/trace/v3/dynamic_ot.pb.o \
 		envoy/config/trace/v3/http_tracer.pb.o \
+		envoy/config/trace/v3/opentelemetry.pb.o \
 		envoy/data/accesslog/v2/accesslog.pb.o \
 		envoy/data/accesslog/v3/accesslog.pb.o \
 		envoy/data/cluster/v2alpha/outlier_detection_event.pb.o \
 		envoy/data/cluster/v3/outlier_detection_event.pb.o \
 		envoy/data/core/v2alpha/health_check_event.pb.o \
 		envoy/data/core/v3/health_check_event.pb.o \
+		envoy/data/dns/v3/dns_table.pb.o \
+		envoy/data/tap/v3/common.pb.o \
+		envoy/data/tap/v3/http.pb.o \
+		envoy/data/tap/v3/transport.pb.o \
+		envoy/data/tap/v3/wrapper.pb.o \
 		envoy/extensions/access_loggers/file/v3/file.pb.o \
+		envoy/extensions/access_loggers/filters/cel/v3/cel.pb.o \
 		envoy/extensions/access_loggers/grpc/v3/als.pb.o \
 		envoy/extensions/access_loggers/open_telemetry/v3/logs_service.pb.o \
 		envoy/extensions/access_loggers/stream/v3/stream.pb.o \
+		envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.o \
+		envoy/extensions/clusters/aggregate/v3/cluster.pb.o \
+		envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.o \
+		envoy/extensions/clusters/redis/v3/redis_cluster.pb.o \
+		envoy/extensions/common/async_files/v3/async_file_manager.pb.o \
+		envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.o \
 		envoy/extensions/common/ratelimit/v3/ratelimit.pb.o \
+		envoy/extensions/common/tap/v3/common.pb.o \
 		envoy/extensions/compression/brotli/compressor/v3/brotli.pb.o \
 		envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.o \
 		envoy/extensions/compression/gzip/compressor/v3/gzip.pb.o \
 		envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.o \
 		envoy/extensions/compression/zstd/compressor/v3/zstd.pb.o \
 		envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.o \
+		envoy/extensions/config/validators/minimum_clusters/v3/minimum_clusters.pb.o \
 		envoy/extensions/early_data/v3/default_early_data_policy.pb.o \
 		envoy/extensions/filters/common/dependency/v3/dependency.pb.o \
+		envoy/extensions/filters/common/fault/v3/fault.pb.o \
 		envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.o \
+		envoy/extensions/filters/listener/http_inspector/v3/http_inspector.pb.o \
+		envoy/extensions/filters/listener/local_ratelimit/v3/local_ratelimit.pb.o \
+		envoy/extensions/filters/listener/original_dst/v3/original_dst.pb.o \
+		envoy/extensions/filters/listener/original_src/v3/original_src.pb.o \
 		envoy/extensions/filters/listener/proxy_protocol/v3/proxy_protocol.pb.o \
+		envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.o \
+		envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.o \
+		envoy/extensions/filters/network/direct_response/v3/config.pb.o \
+		envoy/extensions/filters/network/echo/v3/echo.pb.o \
+		envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.o \
 		envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.o \
+		envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.o \
+		envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.o \
+		envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.o \
+		envoy/extensions/filters/network/rbac/v3/rbac.pb.o \
+		envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.o \
+		envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.o \
+		envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.pb.o \
+		envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.o \
+		envoy/extensions/filters/network/thrift_proxy/v3/route.pb.o \
+		envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.o \
+		envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.o \
+		envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.o \
+		envoy/extensions/filters/udp/udp_proxy/v3/route.pb.o \
+		envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.o \
+		envoy/extensions/formatter/metadata/v3/metadata.pb.o \
+		envoy/extensions/formatter/req_without_query/v3/req_without_query.pb.o \
+		envoy/extensions/health_checkers/redis/v3/redis.pb.o \
+		envoy/extensions/health_checkers/thrift/v3/thrift.pb.o \
+		envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.o \
+		envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.o \
+		envoy/extensions/http/early_header_mutation/header_mutation/v3/header_mutation.pb.o \
+		envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.o \
+		envoy/extensions/http/header_validators/envoy_default/v3/header_validator.pb.o \
+		envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.o \
 		envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.o \
+		envoy/extensions/http/stateful_session/cookie/v3/cookie.pb.o \
+		envoy/extensions/http/stateful_session/header/v3/header.pb.o \
+		envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.o \
+		envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.o \
+		envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.o \
+		envoy/extensions/key_value/file_based/v3/config.pb.o \
 		envoy/extensions/load_balancing_policies/common/v3/common.pb.o \
+		envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.o \
 		envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.o \
+		envoy/extensions/load_balancing_policies/random/v3/random.pb.o \
 		envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.o \
+		envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.o \
+		envoy/extensions/matching/common_inputs/environment_variable/v3/input.pb.o \
+		envoy/extensions/matching/common_inputs/network/v3/network_inputs.pb.o \
+		envoy/extensions/matching/common_inputs/ssl/v3/ssl_inputs.pb.o \
+		envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.pb.o \
+		envoy/extensions/matching/input_matchers/ip/v3/ip.pb.o \
 		envoy/extensions/network/dns_resolver/apple/v3/apple_dns_resolver.pb.o \
 		envoy/extensions/network/dns_resolver/cares/v3/cares_dns_resolver.pb.o \
 		envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.o \
 		envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.o \
+		envoy/extensions/path/match/uri_template/v3/uri_template_match.pb.o \
+		envoy/extensions/path/rewrite/uri_template/v3/uri_template_rewrite.pb.o \
 		envoy/extensions/quic/connection_id_generator/v3/envoy_deterministic_connection_id_generator.pb.o \
 		envoy/extensions/quic/crypto_stream/v3/crypto_stream.pb.o \
 		envoy/extensions/quic/proof_source/v3/proof_source.pb.o \
+		envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.o \
+		envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.o \
 		envoy/extensions/regex_engines/v3/google_re2.pb.o \
 		envoy/extensions/request_id/uuid/v3/uuid.pb.o \
+		envoy/extensions/resource_monitors/downstream_connections/v3/downstream_connections.pb.o \
+		envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.o \
+		envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.o \
+		envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.o \
+		envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.o \
+		envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.o \
+		envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.pb.o \
+		envoy/extensions/transport_sockets/internal_upstream/v3/internal_upstream.pb.o \
+		envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.o \
 		envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.o \
 		envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.o \
+		envoy/extensions/transport_sockets/starttls/v3/starttls.pb.o \
+		envoy/extensions/transport_sockets/tap/v3/tap.pb.o \
+		envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.o \
 		envoy/extensions/transport_sockets/tls/v3/common.pb.o \
 		envoy/extensions/transport_sockets/tls/v3/secret.pb.o \
 		envoy/extensions/transport_sockets/tls/v3/tls.pb.o \
+		envoy/extensions/udp_packet_writer/v3/udp_default_writer_factory.pb.o \
+		envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.o \
+		envoy/extensions/upstreams/http/http/v3/http_connection_pool.pb.o \
+		envoy/extensions/upstreams/http/tcp/v3/tcp_connection_pool.pb.o \
 		envoy/extensions/upstreams/http/v3/http_protocol_options.pb.o \
+		envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.o \
+		envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.o \
+		envoy/extensions/watchdog/profile_action/v3/profile_action.pb.o \
 		envoy/service/accesslog/v2/als.pb.o \
 		envoy/service/accesslog/v3/als.pb.o \
+		envoy/service/auth/v3/attribute_context.pb.o \
+		envoy/service/auth/v3/external_auth.pb.o \
 		envoy/service/cluster/v3/cds.pb.o \
 		envoy/service/discovery/v2/ads.pb.o \
 		envoy/service/discovery/v2/hds.pb.o \
@@ -196,6 +291,7 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/service/secret/v3/sds.pb.o \
 		envoy/type/hash_policy.pb.o \
 		envoy/type/http.pb.o \
+		envoy/type/http/v3/cookie.pb.o \
 		envoy/type/http/v3/path_transformation.pb.o \
 		envoy/type/matcher/metadata.pb.o \
 		envoy/type/matcher/number.pb.o \
@@ -219,6 +315,7 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		envoy/type/tracing/v3/custom_tag.pb.o \
 		envoy/type/v3/hash_policy.pb.o \
 		envoy/type/v3/http.pb.o \
+		envoy/type/v3/http_status.pb.o \
 		envoy/type/v3/percent.pb.o \
 		envoy/type/v3/range.pb.o \
 		envoy/type/v3/ratelimit_unit.pb.o \
@@ -233,9 +330,12 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		io/prometheus/client/metrics.pb.o \
 		opencensus/proto/trace/v1/trace_config.pb.o \
 		opentelemetry/proto/collector/logs/v1/logs_service.pb.o \
+		opentelemetry/proto/collector/trace/v1/trace_service.pb.o \
 		opentelemetry/proto/common/v1/common.pb.o \
 		opentelemetry/proto/logs/v1/logs.pb.o \
 		opentelemetry/proto/resource/v1/resource.pb.o \
+		opentelemetry/proto/trace/v1/trace.pb.o \
+		src/proto/grpc/health/v1/health.pb.o \
 		udpa/annotations/migrate.pb.o \
 		udpa/annotations/security.pb.o \
 		udpa/annotations/sensitive.pb.o \
@@ -245,11 +345,13 @@ api_OBJS=	envoy/admin/v2alpha/certs.pb.o \
 		validate/validate.pb.o \
 		xds/annotations/v3/status.pb.o \
 		xds/core/v3/authority.pb.o \
+		xds/core/v3/cidr.pb.o \
 		xds/core/v3/collection_entry.pb.o \
 		xds/core/v3/context_params.pb.o \
 		xds/core/v3/extension.pb.o \
 		xds/core/v3/resource_locator.pb.o \
 		xds/core/v3/resource_name.pb.o \
+		xds/type/matcher/v3/ip.pb.o \
 		xds/type/matcher/v3/matcher.pb.o \
 		xds/type/matcher/v3/regex.pb.o \
 		xds/type/matcher/v3/string.pb.o \
@@ -312,7 +414,7 @@ common_SRCS=	$(wildcard common/access_log/*.cc) \
 		$(wildcard common/ssl/*.cc) \
 		$(wildcard common/stats/*.cc) \
 		$(wildcard common/stream_info/*.cc) \
-		$(wildcard common/tcp/*.cc) \
+		$(wildcard common/tcp*/*.cc) \
 			   common/thread_local/thread_local_impl.cc \
 		$(wildcard common/tracing/*.cc) \
 		$(wildcard common/upstream/*.cc) \
@@ -323,25 +425,98 @@ exe_SRCS=	$(wildcard exe/*.cc) \
 
 extensions_SRCS=\
 		$(wildcard extensions/access_loggers/[^w]*/*.cc) \
+		$(wildcard extensions/access_loggers/filters/cel/*.cc) \
+		$(wildcard extensions/bootstrap/internal_listener/*.cc) \
+		$(wildcard extensions/clusters/*/*.cc) \
+		$(wildcard extensions/common/async_files/*.cc) \
+		$(wildcard extensions/common/aws/*.cc) \
+		$(wildcard extensions/common/dynamic_forward_proxy/*.cc) \
+		$(wildcard extensions/common/matcher/*.cc) \
+		extensions/common/proxy_protocol/proxy_protocol_header.cc \
+		$(wildcard extensions/common/redis/*.cc) \
+		$(wildcard extensions/common/tap/*.cc) \
 		$(wildcard extensions/compression/*/*/*.cc) \
+		$(wildcard extensions/config/validators/minimum_clusters/*.cc) \
+		$(wildcard extensions/config_subscription/*/*.cc) \
 		extensions/early_data/default_early_data_policy.cc \
 		$(wildcard extensions/filters/common/expr/*.cc) \
-		extensions/filters/common/rbac/matchers.cc \
+		extensions/filters/common/ext_authz/check_request_utils.cc \
+		extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc \
+		extensions/filters/common/fault/fault_config.cc \
+		$(wildcard extensions/filters/common/*ratelimit/*.cc) \
+		extensions/filters/common/mutation_rules/mutation_rules.cc \
+		$(wildcard extensions/filters/common/original_src/*.cc) \
+		$(wildcard extensions/filters/common/rbac/*.cc) \
+		$(wildcard extensions/filters/listener/*/*.cc) \
+		$(wildcard extensions/filters/network/common/redis/*.cc) \
+		$(wildcard extensions/filters/network/connection_limit/*.cc) \
+		$(wildcard extensions/filters/network/direct_response/*.cc) \
+		$(wildcard extensions/filters/network/echo/*.cc) \
+		$(wildcard extensions/filters/network/ext_authz/*.cc) \
 		extensions/filters/network/http_connection_manager/config.cc \
-		$(wildcard extensions/listener_managers/listener_manager/*.cc) \
+		$(wildcard extensions/filters/network/*ratelimit/*.cc) \
+		$(wildcard extensions/filters/network/mongo_proxy/*.cc) \
+		$(wildcard extensions/filters/network/rbac/*.cc) \
+		$(wildcard extensions/filters/network/redis_proxy/*.cc) \
+		$(wildcard extensions/filters/network/sni_*/*.cc) \
+		$(wildcard extensions/filters/network/tcp_proxy/*.cc) \
+		extensions/filters/network/thrift_proxy/app_exception_impl.cc \
+		extensions/filters/network/thrift_proxy/decoder.cc \
+		$(wildcard extensions/filters/network/zookeeper_proxy/*.cc) \
+		$(wildcard extensions/filters/udp/*/*.cc) \
+		extensions/filters/udp/udp_proxy/router/router_impl.cc \
+		$(wildcard extensions/formatter/*/*.cc) \
+		$(wildcard extensions/grpc_credentials/*/*.cc) \
+		$(wildcard extensions/health_checkers/*/*.cc) \
+		$(wildcard extensions/http/custom_response/*/*.cc) \
+		$(wildcard extensions/http/early_header_mutation/header_mutation/*.cc) \
+		$(wildcard extensions/http/header_formatters/preserve_case/*.cc) \
+		$(wildcard extensions/http/header_validators/envoy_default/*.cc) \
+		$(wildcard extensions/http/original_ip_detection/*/*.cc) \
+		$(wildcard extensions/http/stateful_session/*/*.cc) \
+		$(wildcard extensions/internal_redirect/*/*.cc) \
+		$(wildcard extensions/io_socket/user_space/*.cc) \
+		extensions/key_value/file_based/config.cc \
+		$(wildcard extensions/listener_managers/*/*.cc) \
+		$(wildcard extensions/load_balancing_policies/*/config.cc) \
+		$(wildcard extensions/matching/*/*/*.cc) \
 		$(wildcard extensions/network/dns_resolver/[^a]*/*.cc) \
-		extensions/quic/crypto_stream/envoy_quic_crypto_client_stream.cc \
+		$(wildcard extensions/path/*/uri_template/*.cc) \
+		$(wildcard extensions/path/uri_template_lib/*.cc) \
+		$(wildcard extensions/quic/connection_id_generator/*.cc) \
+		$(wildcard extensions/quic/crypto_stream/*.cc) \
+		extensions/quic/proof_source/envoy_quic_proof_source_factory_impl.cc \
+		extensions/quic/server_preferred_address/fixed_server_preferred_address_config.cc \
+		extensions/rate_limit_descriptors/expr/config.cc \
 		extensions/request_id/uuid/config.cc \
+		$(wildcard extensions/resource_monitors/*/*.cc) \
+		$(wildcard extensions/retry/host/omit_host_metadata/*.cc) \
+		$(wildcard extensions/retry/priority/*/*.cc) \
+		$(wildcard extensions/stat_sinks/common/statsd/*.cc) \
+		$(wildcard extensions/stat_sinks/hystrix/*.cc) \
 		$(wildcard extensions/stat_sinks/metrics_service/*.cc) \
+		$(wildcard extensions/stat_sinks/*statsd/*.cc) \
+		extensions/tracers/common/ot/opentracing_driver_impl.cc \
+		$(wildcard extensions/tracers/dynamic_ot/*.cc) \
+		$(wildcard extensions/tracers/opentelemetry/*.cc) \
+		extensions/transport_sockets/common/passthrough.cc \
+		$(wildcard extensions/transport_sockets/http_11_proxy/*.cc) \
+		$(wildcard extensions/transport_sockets/internal_upstream/*.cc) \
+		$(wildcard extensions/transport_sockets/proxy_protocol/*.cc) \
+		extensions/transport_sockets/raw_buffer/config.cc \
+		$(wildcard extensions/transport_sockets/starttls/*.cc) \
+		$(wildcard extensions/transport_sockets/tap/*.cc) \
+		$(wildcard extensions/transport_sockets/tcp_stats/*.cc) \
 		$(wildcard extensions/transport_sockets/tls/*.cc) \
 		extensions/transport_sockets/tls/cert_validator/factory.cc \
 		$(wildcard extensions/transport_sockets/tls/ocsp/*.cc) \
 		extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc \
-		extensions/upstreams/http/config.cc
+		$(wildcard extensions/udp_packet_writer/*/*.cc) \
+		$(wildcard extensions/upstreams/*/*/*.cc) \
+		$(wildcard extensions/upstreams/*/config.cc) \
+		$(wildcard extensions/watchdog/profile_action/*.cc)
 
-define skiptests
-	$(filter-out %_fuzzer.cc %_test.cc,$(wildcard $(1)))
-endef
+skiptests = $(filter-out %_fuzzer.cc %_test.cc,$(wildcard $(1)))
 
 quiche_SRCS=	$(call skiptests,quiche/balsa/*.cc) \
 		$(call skiptests,quiche/common/*.cc) \
@@ -557,10 +732,10 @@ ABSEIL_LIBS=\
 	throw_delegate time time_zone
 
 LIBS=	$(addprefix -labsl_,$(ABSEIL_LIBS)) \
-	-lbrotlidec -lbrotlienc \
-	-lcares -lcircllhist -lcrypto -levent -levent_pthreads -lfmt \
-	-lgpr -lgrpc -lgrpc++ -licuuc -lnghttp2 -lprotobuf -lpthread \
-	-lre2 -lssl -lupb -lxxhash -lyaml-cpp -lz -lzstd
+	-lbrotlidec -lbrotlienc -lcares -lcircllhist -lcrypto -lcurl \
+	-levent -levent_pthreads -lfmt -lgpr -lgrpc -lgrpc++ -licuuc \
+	-lnghttp2 -lopentracing -lprotobuf -lpthread -lre2 -lssl \
+	-lupb -lxxhash -lyaml-cpp -lz -lzstd
 
 VPATH=	../..