From 8986baccf91606cf26cfadd785323cdde2f1eee9 Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Thu, 15 Feb 2024 11:44:19 -0800 Subject: [PATCH 1/3] fix circular dependency between matchers and stats, grpc Signed-off-by: Greg Greenway --- source/common/access_log/access_log_impl.cc | 1 + source/common/common/BUILD | 1 + source/common/config/BUILD | 18 ++++++++---- source/common/config/stats_utility.cc | 17 +++++++++++ source/common/config/stats_utility.h | 28 +++++++++++++++++++ source/common/config/utility.cc | 9 ------ source/common/config/utility.h | 17 ----------- source/common/listener_manager/BUILD | 2 ++ source/common/listener_manager/lds_api.cc | 1 + source/common/router/config_impl.cc | 1 + source/common/router/vhds.cc | 1 + source/common/secret/sds_api.cc | 1 + source/common/tcp_proxy/BUILD | 1 + source/extensions/clusters/eds/eds.cc | 1 + .../common/dynamic_forward_proxy/BUILD | 1 + .../extensions/filters/http/basic_auth/BUILD | 1 + .../filters/network/dubbo_proxy/router/BUILD | 2 ++ .../filters/header_to_metadata/BUILD | 3 ++ .../filters/payload_to_metadata/BUILD | 2 ++ .../network/dns_resolver/getaddrinfo/BUILD | 1 + .../extensions/stat_sinks/common/statsd/BUILD | 2 ++ source/extensions/tracers/datadog/BUILD | 2 ++ .../tls/cert_validator/BUILD | 1 + source/server/BUILD | 2 ++ source/server/config_validation/server.cc | 3 +- source/server/server.cc | 4 ++- test/common/config/BUILD | 1 + test/common/config/utility_test.cc | 5 ++-- 28 files changed, 94 insertions(+), 35 deletions(-) create mode 100644 source/common/config/stats_utility.cc create mode 100644 source/common/config/stats_utility.h diff --git a/source/common/access_log/access_log_impl.cc b/source/common/access_log/access_log_impl.cc index fd72e00b1a743..c13213d9cbbe5 100644 --- a/source/common/access_log/access_log_impl.cc +++ b/source/common/access_log/access_log_impl.cc @@ -15,6 +15,7 @@ #include "source/common/common/utility.h" #include "source/common/config/metadata.h" #include "source/common/config/utility.h" +#include "source/common/grpc/common.h" #include "source/common/http/header_map_impl.h" #include "source/common/http/header_utility.h" #include "source/common/http/headers.h" diff --git a/source/common/common/BUILD b/source/common/common/BUILD index aa0edac5aa61b..6d630ec2a0281 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -319,6 +319,7 @@ envoy_cc_library( "//envoy/common:matchers_interface", "//source/common/common:regex_lib", "//source/common/config:metadata_lib", + "//source/common/config:utility_lib", "//source/common/http:path_utility_lib", "//source/common/protobuf", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/common/config/BUILD b/source/common/config/BUILD index dffb0c2b7f3fc..f7ac9663dde0e 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -226,15 +226,10 @@ envoy_cc_library( "//source/common/common:backoff_lib", "//source/common/common:hash_lib", "//source/common/common:hex_lib", - "//source/common/grpc:common_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_features_lib", "//source/common/singleton:const_singleton", - "//source/common/stats:histogram_lib", - "//source/common/stats:stats_lib", - "//source/common/stats:stats_matcher_lib", - "//source/common/stats:tag_producer_lib", "//source/common/version:api_version_lib", "@com_github_cncf_xds//udpa/type/v1:pkg_cc_proto", "@com_github_cncf_xds//xds/type/v3:pkg_cc_proto", @@ -245,6 +240,19 @@ envoy_cc_library( ], ) +envoy_cc_library( + name = "stats_utility_lib", + srcs = ["stats_utility.cc"], + hdrs = ["stats_utility.h"], + deps = [ + "//source/common/stats:histogram_lib", + "//source/common/stats:stats_lib", + "//source/common/stats:stats_matcher_lib", + "//source/common/stats:tag_producer_lib", + "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", + ], +) + envoy_cc_library( name = "subscription_base_interface", hdrs = ["subscription_base.h"], diff --git a/source/common/config/stats_utility.cc b/source/common/config/stats_utility.cc new file mode 100644 index 0000000000000..eed7f4c98b40c --- /dev/null +++ b/source/common/config/stats_utility.cc @@ -0,0 +1,17 @@ +#include "source/common/config/stats_utility.h" + +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/stats_matcher_impl.h" +#include "source/common/stats/tag_producer_impl.h" + +namespace Envoy { +namespace Config { + +Stats::TagProducerPtr +StatsUtility::createTagProducer(const envoy::config::bootstrap::v3::Bootstrap& bootstrap, + const Stats::TagVector& cli_tags) { + return std::make_unique(bootstrap.stats_config(), cli_tags); +} + +} // namespace Config +} // namespace Envoy diff --git a/source/common/config/stats_utility.h b/source/common/config/stats_utility.h new file mode 100644 index 0000000000000..409bd1ddc0c82 --- /dev/null +++ b/source/common/config/stats_utility.h @@ -0,0 +1,28 @@ +#pragma once + +#include "envoy/config/bootstrap/v3/bootstrap.pb.h" +#include "envoy/stats/histogram.h" +#include "envoy/stats/scope.h" +#include "envoy/stats/stats_macros.h" +#include "envoy/stats/stats_matcher.h" +#include "envoy/stats/tag_producer.h" + +namespace Envoy { +namespace Config { + +class StatsUtility { +public: + /** + * Create TagProducer instance. Check all tag names for conflicts to avoid + * unexpected tag name overwriting. + * @param bootstrap bootstrap proto. + * @param cli_tags tags that are provided by the cli + * @throws EnvoyException when the conflict of tag names is found. + */ + static Stats::TagProducerPtr + createTagProducer(const envoy::config::bootstrap::v3::Bootstrap& bootstrap, + const Stats::TagVector& cli_tags); +}; + +} // namespace Config +} // namespace Envoy diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc index eff142670f253..566678358e9bf 100644 --- a/source/common/config/utility.cc +++ b/source/common/config/utility.cc @@ -11,9 +11,6 @@ #include "source/common/common/assert.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/histogram_impl.h" -#include "source/common/stats/stats_matcher_impl.h" -#include "source/common/stats/tag_producer_impl.h" namespace Envoy { namespace Config { @@ -198,12 +195,6 @@ Utility::parseRateLimitSettings(const envoy::config::core::v3::ApiConfigSource& return rate_limit_settings; } -Stats::TagProducerPtr -Utility::createTagProducer(const envoy::config::bootstrap::v3::Bootstrap& bootstrap, - const Stats::TagVector& cli_tags) { - return std::make_unique(bootstrap.stats_config(), cli_tags); -} - absl::StatusOr Utility::factoryForGrpcApiConfigSource( Grpc::AsyncClientManager& async_client_manager, const envoy::config::core::v3::ApiConfigSource& api_config_source, Stats::Scope& scope, diff --git a/source/common/config/utility.h b/source/common/config/utility.h index 5dfa959b1f5ed..924ca78013750 100644 --- a/source/common/config/utility.h +++ b/source/common/config/utility.h @@ -12,11 +12,6 @@ #include "envoy/local_info/local_info.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "envoy/stats/histogram.h" -#include "envoy/stats/scope.h" -#include "envoy/stats/stats_macros.h" -#include "envoy/stats/stats_matcher.h" -#include "envoy/stats/tag_producer.h" #include "envoy/upstream/cluster_manager.h" #include "source/common/common/assert.h" @@ -24,7 +19,6 @@ #include "source/common/common/hash.h" #include "source/common/common/hex.h" #include "source/common/common/utility.h" -#include "source/common/grpc/common.h" #include "source/common/protobuf/protobuf.h" #include "source/common/protobuf/utility.h" #include "source/common/runtime/runtime_features.h" @@ -391,17 +385,6 @@ class Utility { */ static std::string truncateGrpcStatusMessage(absl::string_view error_message); - /** - * Create TagProducer instance. Check all tag names for conflicts to avoid - * unexpected tag name overwriting. - * @param bootstrap bootstrap proto. - * @param cli_tags tags that are provided by the cli - * @throws EnvoyException when the conflict of tag names is found. - */ - static Stats::TagProducerPtr - createTagProducer(const envoy::config::bootstrap::v3::Bootstrap& bootstrap, - const Stats::TagVector& cli_tags); - /** * Obtain gRPC async client factory from a envoy::config::core::v3::ApiConfigSource. * @param async_client_manager gRPC async client manager. diff --git a/source/common/listener_manager/BUILD b/source/common/listener_manager/BUILD index 1b8e494270337..e567cb0ac8564 100644 --- a/source/common/listener_manager/BUILD +++ b/source/common/listener_manager/BUILD @@ -137,8 +137,10 @@ envoy_cc_library( "//source/common/config:api_version_lib", "//source/common/config:subscription_base_interface", "//source/common/config:utility_lib", + "//source/common/grpc:common_lib", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", + "@com_google_absl//absl/container:node_hash_set", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", diff --git a/source/common/listener_manager/lds_api.cc b/source/common/listener_manager/lds_api.cc index ee669d306e5d8..052872846da63 100644 --- a/source/common/listener_manager/lds_api.cc +++ b/source/common/listener_manager/lds_api.cc @@ -12,6 +12,7 @@ #include "source/common/common/cleanup.h" #include "source/common/config/api_version.h" #include "source/common/config/utility.h" +#include "source/common/grpc/common.h" #include "source/common/protobuf/utility.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc index ecf2c3639d901..19f1d7367f3f8 100644 --- a/source/common/router/config_impl.cc +++ b/source/common/router/config_impl.cc @@ -32,6 +32,7 @@ #include "source/common/config/metadata.h" #include "source/common/config/utility.h" #include "source/common/config/well_known_names.h" +#include "source/common/grpc/common.h" #include "source/common/http/header_utility.h" #include "source/common/http/headers.h" #include "source/common/http/matching/data_impl.h" diff --git a/source/common/router/vhds.cc b/source/common/router/vhds.cc index a805597b08704..823ee0b0f86d7 100644 --- a/source/common/router/vhds.cc +++ b/source/common/router/vhds.cc @@ -13,6 +13,7 @@ #include "source/common/common/fmt.h" #include "source/common/config/api_version.h" #include "source/common/config/utility.h" +#include "source/common/grpc/common.h" #include "source/common/protobuf/utility.h" #include "source/common/router/config_impl.h" diff --git a/source/common/secret/sds_api.cc b/source/common/secret/sds_api.cc index 5492fb92de287..344da3ff5833e 100644 --- a/source/common/secret/sds_api.cc +++ b/source/common/secret/sds_api.cc @@ -6,6 +6,7 @@ #include "source/common/common/assert.h" #include "source/common/config/api_version.h" +#include "source/common/grpc/common.h" #include "source/common/protobuf/utility.h" namespace Envoy { diff --git a/source/common/tcp_proxy/BUILD b/source/common/tcp_proxy/BUILD index 07d5c5995d295..1337bb620a420 100644 --- a/source/common/tcp_proxy/BUILD +++ b/source/common/tcp_proxy/BUILD @@ -62,6 +62,7 @@ envoy_cc_library( "//source/common/common:enum_to_int", "//source/common/common:macros", "//source/common/common:minimal_logger_lib", + "//source/common/config:well_known_names", "//source/common/formatter:substitution_format_string_lib", "//source/common/http:codec_client_lib", "//source/common/network:application_protocol_lib", diff --git a/source/extensions/clusters/eds/eds.cc b/source/extensions/clusters/eds/eds.cc index 76d0b258514fd..1b60873be93f5 100644 --- a/source/extensions/clusters/eds/eds.cc +++ b/source/extensions/clusters/eds/eds.cc @@ -9,6 +9,7 @@ #include "source/common/common/utility.h" #include "source/common/config/api_version.h" #include "source/common/config/decoded_resource_impl.h" +#include "source/common/grpc/common.h" namespace Envoy { namespace Upstream { diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD index bb3535dab9ec5..f8b68b72daad7 100644 --- a/source/extensions/common/dynamic_forward_proxy/BUILD +++ b/source/extensions/common/dynamic_forward_proxy/BUILD @@ -18,6 +18,7 @@ envoy_cc_library( "//envoy/singleton:manager_interface", "//envoy/thread_local:thread_local_interface", "//envoy/upstream:resource_manager_interface", + "//source/common/http:header_utility_lib", "@envoy_api//envoy/extensions/common/dynamic_forward_proxy/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/basic_auth/BUILD b/source/extensions/filters/http/basic_auth/BUILD index f610d4fee905d..7f47e02260483 100644 --- a/source/extensions/filters/http/basic_auth/BUILD +++ b/source/extensions/filters/http/basic_auth/BUILD @@ -19,6 +19,7 @@ envoy_cc_library( "//source/common/common:base64_lib", "//source/common/config:utility_lib", "//source/common/http:header_map_lib", + "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", ], diff --git a/source/extensions/filters/network/dubbo_proxy/router/BUILD b/source/extensions/filters/network/dubbo_proxy/router/BUILD index f75fc1d75d628..0901f4a09516b 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/router/BUILD @@ -26,6 +26,7 @@ envoy_cc_library( "//envoy/router:router_interface", "//source/common/common:logger_lib", "//source/common/common:matchers_lib", + "//source/common/config:well_known_names", "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib", "//source/common/router:metadatamatchcriteria_lib", @@ -63,6 +64,7 @@ envoy_cc_library( "//envoy/upstream:load_balancer_interface", "//envoy/upstream:thread_local_cluster_interface", "//source/common/common:logger_lib", + "//source/common/config:well_known_names", "//source/common/http:header_utility_lib", "//source/common/router:metadatamatchcriteria_lib", "//source/common/upstream:load_balancer_lib", diff --git a/source/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD b/source/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD index 810944a4ac04d..76be28f0b1fdc 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD +++ b/source/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD @@ -27,6 +27,9 @@ envoy_cc_library( hdrs = ["header_to_metadata_filter.h"], deps = [ "//envoy/server:filter_config_interface", + "//source/common/common:base64_lib", + "//source/common/common:matchers_lib", + "//source/common/network:utility_lib", "//source/extensions/filters/network/thrift_proxy/filters:pass_through_filter_lib", "@envoy_api//envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD b/source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD index cc6eeb8630a0a..8597af0e12e79 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD +++ b/source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD @@ -27,6 +27,8 @@ envoy_cc_library( hdrs = ["payload_to_metadata_filter.h"], deps = [ "//envoy/server:filter_config_interface", + "//source/common/common:matchers_lib", + "//source/common/network:utility_lib", "//source/extensions/filters/network/thrift_proxy:auto_protocol_lib", "//source/extensions/filters/network/thrift_proxy:auto_transport_lib", "//source/extensions/filters/network/thrift_proxy:decoder_lib", diff --git a/source/extensions/network/dns_resolver/getaddrinfo/BUILD b/source/extensions/network/dns_resolver/getaddrinfo/BUILD index e2b26df7941cf..05b119daa59cd 100644 --- a/source/extensions/network/dns_resolver/getaddrinfo/BUILD +++ b/source/extensions/network/dns_resolver/getaddrinfo/BUILD @@ -15,6 +15,7 @@ envoy_cc_extension( deps = [ "//envoy/network:dns_resolver_interface", "//envoy/registry", + "//source/common/api:os_sys_calls_lib", "@envoy_api//envoy/extensions/network/dns_resolver/getaddrinfo/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/common/statsd/BUILD b/source/extensions/stat_sinks/common/statsd/BUILD index 2d74e42869e9e..54fe8b9ac5881 100644 --- a/source/extensions/stat_sinks/common/statsd/BUILD +++ b/source/extensions/stat_sinks/common/statsd/BUILD @@ -30,5 +30,7 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/config:utility_lib", "//source/common/network:address_lib", + "//source/common/network:default_socket_interface_lib", + "//source/common/network:utility_lib", ], ) diff --git a/source/extensions/tracers/datadog/BUILD b/source/extensions/tracers/datadog/BUILD index da0862389706e..cd7327a67d093 100644 --- a/source/extensions/tracers/datadog/BUILD +++ b/source/extensions/tracers/datadog/BUILD @@ -43,6 +43,8 @@ envoy_cc_library( deps = [ "//source/common/config:utility_lib", "//source/common/http:async_client_utility_lib", + "//source/common/http:message_lib", + "//source/common/http:utility_lib", "//source/common/tracing:common_values_lib", "//source/common/tracing:null_span_lib", "//source/common/tracing:trace_context_lib", diff --git a/source/extensions/transport_sockets/tls/cert_validator/BUILD b/source/extensions/transport_sockets/tls/cert_validator/BUILD index c79416930672a..d57f3d41e3737 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/BUILD @@ -37,6 +37,7 @@ envoy_cc_library( "//source/common/common:base64_lib", "//source/common/common:hex_lib", "//source/common/common:minimal_logger_lib", + "//source/common/common:matchers_lib", "//source/common/common:utility_lib", "//source/common/config:utility_lib", "//source/common/stats:symbol_table_lib", diff --git a/source/server/BUILD b/source/server/BUILD index f0d63ba47174d..7ee402750e1fe 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -313,6 +313,7 @@ envoy_cc_library( "//source/common/event:scaled_range_timer_manager_lib", "//source/common/stats:symbol_table_lib", "//source/server:resource_monitor_config_lib", + "@com_google_absl//absl/container:node_hash_set", "@envoy_api//envoy/config/overload/v3:pkg_cc_proto", ], ) @@ -440,6 +441,7 @@ envoy_cc_library( "//source/common/common:mutex_tracer_lib", "//source/common/common:perf_tracing_lib", "//source/common/common:utility_lib", + "//source/common/config:stats_utility_lib", "//source/common/config:utility_lib", "//source/common/config:xds_resource_lib", "//source/common/grpc:async_client_manager_lib", diff --git a/source/server/config_validation/server.cc b/source/server/config_validation/server.cc index 47cc069270bd2..da2dcc3802178 100644 --- a/source/server/config_validation/server.cc +++ b/source/server/config_validation/server.cc @@ -5,6 +5,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "source/common/common/utility.h" +#include "source/common/config/stats_utility.h" #include "source/common/config/utility.h" #include "source/common/config/well_known_names.h" #include "source/common/event/real_time_system.h" @@ -100,7 +101,7 @@ void ValidationInstance::initialize(const Options& options, Regex::EnginePtr regex_engine = createRegexEngine( bootstrap_, messageValidationContext().staticValidationVisitor(), serverFactoryContext()); - Config::Utility::createTagProducer(bootstrap_, options_.statsTags()); + Config::StatsUtility::createTagProducer(bootstrap_, options_.statsTags()); if (!bootstrap_.node().user_agent_build_version().has_version()) { *bootstrap_.mutable_node()->mutable_user_agent_build_version() = VersionInfo::buildVersion(); } diff --git a/source/server/server.cc b/source/server/server.cc index ce41536f6563c..14e9266592a3a 100644 --- a/source/server/server.cc +++ b/source/server/server.cc @@ -29,6 +29,7 @@ #include "source/common/common/enum_to_int.h" #include "source/common/common/mutex_tracer_impl.h" #include "source/common/common/utility.h" +#include "source/common/config/stats_utility.h" #include "source/common/config/utility.h" #include "source/common/config/well_known_names.h" #include "source/common/config/xds_resource.h" @@ -500,7 +501,8 @@ void InstanceBase::initializeOrThrow(Network::Address::InstanceConstSharedPtr lo // Needs to happen as early as possible in the instantiation to preempt the objects that require // stats. - stats_store_.setTagProducer(Config::Utility::createTagProducer(bootstrap_, options_.statsTags())); + stats_store_.setTagProducer( + Config::StatsUtility::createTagProducer(bootstrap_, options_.statsTags())); stats_store_.setStatsMatcher(std::make_unique( bootstrap_.stats_config(), stats_store_.symbolTable())); stats_store_.setHistogramSettings( diff --git a/test/common/config/BUILD b/test/common/config/BUILD index 08fb0d1208eb0..2aef53b1499b0 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -126,6 +126,7 @@ envoy_cc_test( external_deps = ["abseil_optional"], deps = [ "//source/common/config:api_version_lib", + "//source/common/config:stats_utility_lib", "//source/common/config:utility_lib", "//source/common/config:well_known_names", "//source/common/stats:stats_lib", diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc index b4f13d5195c81..a860fdc074a7e 100644 --- a/test/common/config/utility_test.cc +++ b/test/common/config/utility_test.cc @@ -8,6 +8,7 @@ #include "source/common/common/fmt.h" #include "source/common/config/api_version.h" +#include "source/common/config/stats_utility.h" #include "source/common/config/utility.h" #include "source/common/config/well_known_names.h" #include "source/common/protobuf/protobuf.h" @@ -57,7 +58,7 @@ TEST(UtilityTest, ConfigSourceInitFetchTimeout) { TEST(UtilityTest, createTagProducer) { envoy::config::bootstrap::v3::Bootstrap bootstrap; - auto producer = Utility::createTagProducer(bootstrap, {}); + auto producer = StatsUtility::createTagProducer(bootstrap, {}); ASSERT_TRUE(producer != nullptr); Stats::TagVector tags; auto extracted_name = producer->produceTags("http.config_test.rq_total", tags); @@ -67,7 +68,7 @@ TEST(UtilityTest, createTagProducer) { TEST(UtilityTest, createTagProducerWithDefaultTgs) { envoy::config::bootstrap::v3::Bootstrap bootstrap; - auto producer = Utility::createTagProducer(bootstrap, {{"foo", "bar"}}); + auto producer = StatsUtility::createTagProducer(bootstrap, {{"foo", "bar"}}); ASSERT_TRUE(producer != nullptr); Stats::TagVector tags; auto extracted_name = producer->produceTags("http.config_test.rq_total", tags); From 018eefd79e8d74b82218e7d926d018fd0647c77b Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Mon, 26 Feb 2024 13:10:48 -0800 Subject: [PATCH 2/3] fix format Signed-off-by: Greg Greenway --- source/common/config/BUILD | 2 +- source/extensions/transport_sockets/tls/cert_validator/BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/common/config/BUILD b/source/common/config/BUILD index f7ac9663dde0e..2965f617062a7 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -250,7 +250,7 @@ envoy_cc_library( "//source/common/stats:stats_matcher_lib", "//source/common/stats:tag_producer_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", - ], + ], ) envoy_cc_library( diff --git a/source/extensions/transport_sockets/tls/cert_validator/BUILD b/source/extensions/transport_sockets/tls/cert_validator/BUILD index d57f3d41e3737..5abc18bc2595b 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/BUILD @@ -36,8 +36,8 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:base64_lib", "//source/common/common:hex_lib", - "//source/common/common:minimal_logger_lib", "//source/common/common:matchers_lib", + "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", "//source/common/config:utility_lib", "//source/common/stats:symbol_table_lib", From c65a77d86b18cb78846c013355770837bc84b6ff Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Mon, 26 Feb 2024 14:48:33 -0800 Subject: [PATCH 3/3] fix contrib build Signed-off-by: Greg Greenway --- contrib/generic_proxy/filters/network/source/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/generic_proxy/filters/network/source/BUILD b/contrib/generic_proxy/filters/network/source/BUILD index 4df7bc7b6f284..67129461e1a5b 100644 --- a/contrib/generic_proxy/filters/network/source/BUILD +++ b/contrib/generic_proxy/filters/network/source/BUILD @@ -74,6 +74,7 @@ envoy_cc_library( "//source/common/common:matchers_lib", "//source/common/config:metadata_lib", "//source/common/config:utility_lib", + "//source/common/http:header_utility_lib", "//source/common/matcher:matcher_lib", "@envoy_api//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg_cc_proto", "@envoy_api//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg_cc_proto",