tests: Narrow test mock includes more generally#45037
Conversation
ec053f5 to
e4a06af
Compare
| ":test_local_address_selector", | ||
| "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", | ||
| "@envoy_api//envoy/config/core/v3:pkg_cc_proto", | ||
| "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", |
There was a problem hiding this comment.
apparently this reordering is correct - it seems because of the select addition it doesnt get buildified
| deps = [ | ||
| "//source/common/formatter:formatter_extension_lib", | ||
| "//source/common/formatter:http_speicific_formatter_extension_lib", | ||
| "//source/common/formatter:substitution_format_string_lib", |
There was a problem hiding this comment.
this one seems to be a bot flourish and is not actually the target mock libs - but seems correct
|
/gemini review |
There was a problem hiding this comment.
Code Review
This pull request performs a comprehensive update to test dependencies across the codebase, replacing generic mock targets like server_mocks and instance_mocks with more specific alternatives such as server_factory_context_mocks. The review feedback identifies a typo in a target name, a missing dependency library for a test, and highlights redundant mock dependencies that should be removed to further improve the cleanliness of the test configuration.
Signed-off-by: Ryan Northey <ryan@synca.io>
There was a problem hiding this comment.
Pull request overview
This PR reduces test build churn and CI resource usage by narrowing server-related mock header includes (e.g., avoiding test/mocks/server/instance.h / broad server_mocks) and updating Bazel deps to match the narrower includes. The intent is to reduce cache busting and improve test build stability/timeouts in CI.
Changes:
- Replace broad server mock includes with more specific mocks (primarily
test/mocks/server/server_factory_context.h, plus other targeted mocks). - Update Bazel
depsacross many test targets to remove unnecessary mock libraries and add newly required narrow ones. - Adjust a handful of tests to include concrete non-mock deps (e.g., singleton manager, buffer/stats isolated store) instead of pulling them via large mock targets.
Reviewed changes
Copilot reviewed 258 out of 258 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| test/tools/router_check/router.h | Switch to narrower server factory context mock include |
| test/server/hot_restarting_child_test.cc | Narrow server mocks; add api mocks include |
| test/server/configuration_impl_test.cc | Drop unused server instance mock include |
| test/server/config_validation/cluster_manager_test.cc | Use server factory context mock instead of instance mock |
| test/server/config_validation/BUILD | Replace instance mock dep with server factory context mock dep |
| test/server/BUILD | Remove instance mock dep; add api mocks dep for hot restart test |
| test/server/admin/BUILD | Replace instance mock dep with narrower deps used by the test |
| test/server/admin/admin_filter_test.cc | Replace instance mock include with specific mocks and concrete deps |
| test/integration/fake_upstream.h | Drop unused server instance mock include |
| test/extensions/upstreams/http/udp/upstream_request_test.cc | Drop unused server factory/instance mock includes |
| test/extensions/upstreams/http/udp/BUILD | Remove unnecessary server mock deps |
| test/extensions/upstreams/http/tcp/upstream_request_test.cc | Drop unused server factory context mock include |
| test/extensions/upstreams/http/tcp/BUILD | Remove unnecessary server factory context mock dep |
| test/extensions/tracers/xray/config_test.cc | Drop unused server instance mock include |
| test/extensions/tracers/xray/BUILD | Remove instance mock dep |
| test/extensions/tracers/opentelemetry/resource_detectors/static/config_test.cc | Use server factory context mock include |
| test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD | Swap tracer factory context mocks for server factory context mocks |
| test/extensions/tracers/opentelemetry/resource_detectors/resource_provider_test.cc | Use server factory context mock include |
| test/extensions/tracers/opentelemetry/resource_detectors/environment/config_test.cc | Use server factory context mock include |
| test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD | Swap tracer factory context mocks for server factory context mocks |
| test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector_test.cc | Remove unused tracer factory context include; add explicit gmock usings |
| test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config_test.cc | Use server factory context mock include |
| test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD | Swap tracer factory context mocks for server factory context mocks |
| test/extensions/tracers/opentelemetry/resource_detectors/BUILD | Swap tracer factory context mocks for server factory context mocks |
| test/extensions/stats_sinks/wasm/config_test.cc | Replace broad server mocks include with narrow server factory context + lifecycle notifier |
| test/extensions/stats_sinks/wasm/BUILD | Replace server mocks dep with specific mock deps |
| test/extensions/stats_sinks/open_telemetry/open_telemetry_impl_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/stats_sinks/open_telemetry/open_telemetry_benchmark.cc | Use server factory context mock include instead of instance mock |
| test/extensions/stats_sinks/open_telemetry/BUILD | Replace instance mock deps with server factory context mock deps |
| test/extensions/stats_sinks/hystrix/hystrix_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/stats_sinks/hystrix/BUILD | Replace instance mock deps with server factory context mock deps |
| test/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/router/cluster_specifiers/matcher/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/router/cluster_specifiers/matcher/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/router/cluster_specifiers/lua/lua_cluster_specifier_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/router/cluster_specifiers/lua/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/router/cluster_specifiers/lua/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/rate_limit_descriptors/expr/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/rate_limit_descriptors/expr/BUILD | Replace server mocks dep with server factory context mocks dep |
| test/extensions/path/rewrite/uri_template/library_test.cc | Remove unnecessary factory context/environment includes; use utility |
| test/extensions/path/rewrite/uri_template/config_test.cc | Remove unnecessary factory context/environment includes; use utility |
| test/extensions/path/rewrite/uri_template/BUILD | Replace factory context mocks dep with utility dep |
| test/extensions/path/match/uri_template/library_test.cc | Remove unnecessary factory context include; add utility include |
| test/extensions/path/match/uri_template/config_test.cc | Remove unnecessary factory context/environment includes; use utility |
| test/extensions/path/match/uri_template/BUILD | Replace factory context mocks dep with utility dep |
| test/extensions/matching/network/common/inputs_integration_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/network/common/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/runtime_fraction/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/runtime_fraction/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/metadata/dyn_meta_matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/metadata/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/ip/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/ip/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/dynamic_modules/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/dynamic_modules/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/consistent_hashing/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/consistent_hashing/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/matching/input_matchers/cel_matcher/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/matching/common_inputs/environment_variable/config_test.cc | Remove unnecessary factory context include; add utility include |
| test/extensions/matching/common_inputs/environment_variable/BUILD | Replace factory context mocks dep with utility dep |
| test/extensions/load_balancing_policies/wrr_locality/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/wrr_locality/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/subset/subset_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/subset/subset_benchmark.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/subset/BUILD | Replace factory context mocks deps with server factory context mocks deps |
| test/extensions/load_balancing_policies/round_robin/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/round_robin/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/ring_hash/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/ring_hash/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/random/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/random/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/maglev/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/maglev/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/least_request/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/least_request/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/dynamic_modules/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/dynamic_modules/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/cluster_provided/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/cluster_provided/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/load_balancing_policies/client_side_weighted_round_robin/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/load_balancing_policies/client_side_weighted_round_robin/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/http/stateful_session/header/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/http/stateful_session/header/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/http/stateful_session/envelope/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/http/stateful_session/envelope/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/http/stateful_session/cookie/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/http/stateful_session/cookie/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/http/header_validators/envoy_default/header_validator_factory_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/http/header_validators/envoy_default/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/health_checkers/thrift/config_test.cc | Drop unused server factory context include |
| test/extensions/health_checkers/thrift/BUILD | Remove unnecessary factory context mocks dep |
| test/extensions/health_checkers/redis/config_test.cc | Drop unused server factory context include |
| test/extensions/health_checkers/redis/BUILD | Remove unnecessary factory context mocks dep |
| test/extensions/filters/udp/udp_proxy/router_impl_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/udp/udp_proxy/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/udp/dns_filter/dns_filter_test.cc | Drop unused server instance mock include |
| test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc | Drop unused server instance mock include |
| test/extensions/filters/udp/dns_filter/BUILD | Remove instance mocks dep |
| test/extensions/filters/network/wasm/wasm_filter_test.cc | Drop unused broad server mocks include |
| test/extensions/filters/network/wasm/BUILD | Remove unnecessary server mocks dep |
| test/extensions/filters/network/rbac/filter_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/network/rbac/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/network/ratelimit/config_test.cc | Drop unused instance mock include |
| test/extensions/filters/network/ratelimit/BUILD | Remove instance mocks dep |
| test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc | Drop unused factory context mock include |
| test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc | Drop unused factory context mock include |
| test/extensions/filters/network/geoip/geoip_filter_test.cc | Drop unused factory context mock include |
| test/extensions/filters/network/geoip/BUILD | Remove factory context mocks dep |
| test/extensions/filters/network/generic_proxy/stats_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/network/generic_proxy/router/upstream_test.cc | Replace server factory context include with narrower needed mocks |
| test/extensions/filters/network/generic_proxy/router/BUILD | Replace factory context mocks dep with specific connection/TLC mock deps |
| test/extensions/filters/network/generic_proxy/route_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/network/generic_proxy/integration_test.cc | Drop unused factory context mock include |
| test/extensions/filters/network/generic_proxy/codecs/http1/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/network/generic_proxy/codecs/http1/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/network/generic_proxy/BUILD | Replace/remove factory context mocks deps with server factory context mocks deps |
| test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/network/dubbo_proxy/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/http/thrift_to_metadata/filter_test.cc | Drop unused broad server mocks include |
| test/extensions/filters/http/thrift_to_metadata/BUILD | Remove unnecessary server mocks dep |
| test/extensions/filters/http/sse_to_metadata/filter_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/http/sse_to_metadata/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/http/rbac/rbac_filter_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/http/rbac/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/http/ratelimit/config_test.cc | Drop unused instance mock include |
| test/extensions/filters/http/ratelimit/BUILD | Remove instance mocks dep |
| test/extensions/filters/http/proto_message_extraction/filter_config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/http/proto_message_extraction/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/http/local_ratelimit/filter_test.cc | Replace broad server mocks include with server factory context include |
| test/extensions/filters/http/local_ratelimit/BUILD | Replace server mocks dep with server factory context mocks dep |
| test/extensions/filters/http/json_to_metadata/filter_test.cc | Drop unused broad server mocks include |
| test/extensions/filters/http/json_to_metadata/BUILD | Remove unnecessary server mocks dep |
| test/extensions/filters/http/health_check/health_check_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/http/health_check/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/http/file_system_buffer/filter_test.cc | Drop unused broad server mocks include |
| test/extensions/filters/http/file_system_buffer/config_test.cc | Replace server mocks include with specific factory/server context includes |
| test/extensions/filters/http/file_system_buffer/BUILD | Replace server mocks dep with factory/server context mock deps |
| test/extensions/filters/http/custom_response/custom_response_filter_test.cc | Replace broad server mocks includes with server factory context include |
| test/extensions/filters/http/custom_response/BUILD | Replace factory/server mocks deps with server factory context mocks dep |
| test/extensions/filters/http/composite/filter_test.cc | Drop unused instance mock include |
| test/extensions/filters/http/composite/BUILD | Remove instance mocks dep |
| test/extensions/filters/common/set_filter_state/filter_config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/common/set_filter_state/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/filters/common/rbac/utility_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/common/rbac/engine_impl_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/filters/common/rbac/BUILD | Replace factory context mocks deps with server factory context mocks deps |
| test/extensions/dynamic_modules/bootstrap/factory_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/dynamic_modules/bootstrap/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/content_parsers/json/config_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/content_parsers/json/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/common/wasm/wasm_test.cc | Replace broad server mocks include with targeted server mock headers |
| test/extensions/common/wasm/wasm_speed_test.cc | Drop unused broad server mocks include |
| test/extensions/common/wasm/foreign_test.cc | Drop unused factory context include |
| test/extensions/common/wasm/BUILD | Replace server mocks dep with targeted server mock deps; remove in binary |
| test/extensions/common/tap/admin_test.cc | Replace broad server mocks include with server factory context include |
| test/extensions/common/matcher/ip_range_matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/common/matcher/domain_matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/common/matcher/BUILD | Replace factory context mocks deps with server factory context mocks deps |
| test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/common/dynamic_forward_proxy/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/extensions/common/async_files/BUILD | Replace server mocks deps with concrete deps + narrower mocks |
| test/extensions/common/async_files/async_file_manager_thread_pool_with_mocks_test.cc | Remove broad server mocks include; add singleton manager include |
| test/extensions/common/async_files/async_file_manager_thread_pool_test.cc | Remove broad server mocks include; add OS syscalls + singleton manager includes |
| test/extensions/common/async_files/async_file_manager_factory_test.cc | Remove broad server mocks include; add singleton manager include |
| test/extensions/common/async_files/async_file_handle_thread_pool_test.cc | Replace broad server mocks include with api/buffer mocks + utility |
| test/extensions/clusters/reverse_connection/reverse_connection_cluster_test.cc | Drop unused factory context include |
| test/extensions/clusters/reverse_connection/BUILD | Remove factory context mocks dep |
| test/extensions/clusters/redis/redis_cluster_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/redis/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/clusters/original_dst/original_dst_cluster_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/original_dst/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/clusters/mcp_multicluster/cluster_test.cc | Drop unused instance mock include |
| test/extensions/clusters/mcp_multicluster/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/logical_dns/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/clusters/eds/leds_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/eds/eds_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/eds/eds_speed_test.cc | Replace instance mock include with options + server factory context includes |
| test/extensions/clusters/eds/BUILD | Replace instance mocks deps with server factory context/option mock deps |
| test/extensions/clusters/dynamic_modules/cluster_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/dynamic_modules/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/clusters/aggregate/cluster_update_test.cc | Drop unused instance mock include |
| test/extensions/clusters/aggregate/cluster_test.cc | Use server factory context mock include instead of instance mock |
| test/extensions/clusters/aggregate/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/extensions/bootstrap/wasm/wasm_test.cc | Replace broad server mocks include with local info mocks include |
| test/extensions/bootstrap/wasm/wasm_speed_test.cc | Replace broad server mocks include with local info mocks include |
| test/extensions/bootstrap/wasm/BUILD | Replace server mocks dep with local info mocks dep |
| test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/upstream_reverse_connection_io_handle_test.cc | Drop unused factory context include |
| test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/config_validation_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/BUILD | Replace factory context mocks dep with instance/server factory context mocks dep |
| test/extensions/access_loggers/stats/stats_test.cc | Drop unused factory context include; keep server factory context |
| test/extensions/access_loggers/stats/stats_speed_test.cc | Use server factory context mock include instead of factory context mock |
| test/extensions/access_loggers/stats/BUILD | Replace factory context mocks deps with server factory context mocks deps |
| test/extensions/access_loggers/fluentd/substitution_formatter_test.cc | Drop unused factory context include; use stream info mocks |
| test/extensions/access_loggers/fluentd/BUILD | Replace factory context mocks dep with stream info mocks + formatter libs |
| test/extensions/access_loggers/dynamic_modules/config_test.cc | Replace factory context include with options + server factory context includes |
| test/extensions/access_loggers/dynamic_modules/BUILD | Add options mocks dep; replace factory context mocks dep |
| test/common/upstream/xdstp_od_cds_api_impl_test.cc | Replace broad server mocks include with server factory context include |
| test/common/upstream/upstream_impl_test.cc | Replace instance mock include with options + server factory context includes |
| test/common/upstream/od_cds_api_impl_test.cc | Replace broad server mocks include with server factory context include |
| test/common/upstream/health_checker_impl_test.cc | Drop unused factory context include |
| test/common/upstream/hds_test.cc | Use server factory context mock include instead of instance mock |
| test/common/upstream/deferred_cluster_initialization_test.cc | Drop unused instance mock include |
| test/common/upstream/cluster_factory_impl_test.cc | Replace instance mock include with options + server factory context includes |
| test/common/upstream/cds_api_impl_test.cc | Use server factory context mock include instead of instance mock |
| test/common/upstream/BUILD | Replace server/instance mocks deps with server factory context mock deps; reorder/add deps |
| test/common/tracing/tracer_manager_impl_test.cc | Use server factory context mock include instead of instance mock |
| test/common/tracing/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/common/tcp_proxy/tcp_proxy_test.cc | Drop unused instance mock include |
| test/common/tcp_proxy/tcp_proxy_test_base.h | Drop unused instance mock include |
| test/common/tcp_proxy/BUILD | Add explicit factory context mocks dep |
| test/common/ssl/matching/inputs_integration_test.cc | Use server factory context mock include instead of factory context mock |
| test/common/ssl/matching/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/common/signal/fatal_action_test.cc | Drop unused instance mock include |
| test/common/signal/BUILD | Remove instance mocks dep |
| test/common/router/vhds_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/scoped_rds_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/router_ratelimit_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/router_outlier_detection_test.cc | Drop unused factory context include |
| test/common/router/route_fuzz_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/config_impl_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/config_impl_speed_test.cc | Use server factory context mock include instead of instance mock |
| test/common/router/config_impl_headermap_benchmark_test.cc | Replace broad server mocks include with server factory context include |
| test/common/router/BUILD | Replace instance/server mocks deps with server factory context mocks deps; remove factory context mocks dep |
| test/common/rds/rds_test.cc | Use server factory context mock include instead of instance mock |
| test/common/rds/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/common/quic/active_quic_listener_test.cc | Drop unused instance mock include |
| test/common/network/udp_listener_impl_batch_writer_test.cc | Drop unused broad server mocks include |
| test/common/network/udp_fuzz.cc | Drop unused broad server mocks include |
| test/common/network/filter_manager_impl_test.cc | Drop unused factory context/instance includes |
| test/common/network/BUILD | Remove unnecessary server factory/instance mock deps |
| test/common/matcher/matcher_test.cc | Use server factory context mock include instead of factory context mock |
| test/common/matcher/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/common/matcher/actions/string_returning_action_test.cc | Use server factory context mock include instead of instance mock |
| test/common/matcher/actions/BUILD | Replace instance mocks dep with server factory context mocks dep |
| test/common/io/io_uring_worker_factory_impl_test.cc | Replace broad server mocks include with server factory context include |
| test/common/http/utility_test.cc | Use server factory context mock include instead of factory context mock |
| test/common/http/http1/codec_impl_test.cc | Replace factory context include with overload manager + server factory context includes |
| test/common/http/http1/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| test/common/http/hcm_router_fuzz_test.cc | Replace factory context include with overload manager include (compile issue noted) |
| test/common/http/conn_manager_utility_test.cc | Use server factory context mock include instead of factory context mock |
| test/common/http/BUILD | Replace factory context mocks dep with server factory context mocks dep (plus other updates) |
| test/common/config/config_provider_impl_test.cc | Use server factory context mock include instead of instance mock |
| test/common/config/BUILD | Replace instance mocks dep with server factory context mocks dep |
| mobile/test/common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc | Drop unused factory context include |
| contrib/stat_sinks/wasm_filter/test/config_test.cc | Drop unused broad server mocks include |
| contrib/stat_sinks/wasm_filter/test/BUILD | Remove unnecessary server mocks dep |
| contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc | Drop unused instance mock include |
| contrib/rocketmq_proxy/filters/network/test/BUILD | Remove instance mocks dep |
| contrib/peak_ewma/load_balancing_policies/test/config_test.cc | Use server factory context mock include instead of factory context mock |
| contrib/peak_ewma/load_balancing_policies/test/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| contrib/hyperscan/regex_engines/test/config_test.cc | Use server factory context mock include instead of factory context mock |
| contrib/hyperscan/regex_engines/test/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| contrib/hyperscan/matching/input_matchers/test/config_test.cc | Use server factory context mock include instead of factory context mock |
| contrib/hyperscan/matching/input_matchers/test/BUILD | Replace factory context mocks dep with server factory context mocks dep |
| contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc | Replace factory context include with connection mock include |
| contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD | Replace factory context mocks dep with connection mocks dep |
a better if more invasive fix would be to do some refactoring on the mock libs themselves, and that can be addressed in follow ups
for now this should have 2 benefits:
reduce cache busting on mock lib change - probably low impact on basis that these change infrequently
reduce bandwidth/setup/teardown/build runtimes for tests - this should have much bigger impact, and its hoped it will mittigate the fairly frequent test build timeouts (potential swapper/oom) that we get in ci