Fix circular dependency between matchers and stats, grpc

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",

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"

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",

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"],

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<Stats::TagProducerImpl>(bootstrap.stats_config(), cli_tags);
+}
+
+} // namespace Config
+} // namespace Envoy

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

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 {
@@ -204,12 +201,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<Stats::TagProducerImpl>(bootstrap.stats_config(), cli_tags);
-}
-
 absl::StatusOr<Grpc::AsyncClientFactoryPtr> Utility::factoryForGrpcApiConfigSource(
     Grpc::AsyncClientManager& async_client_manager,
     const envoy::config::core::v3::ApiConfigSource& api_config_source, Stats::Scope& scope,

source/common/config/utility.h

@@ -12,19 +12,13 @@
 #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"
 #include "source/common/common/backoff_strategy.h"
 #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"
@@ -392,17 +386,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.

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",

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"

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"

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"
 

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 {

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",

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 {

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",
     ],
 )

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",
     ],

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",

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",
     ],

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",

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",
     ],
 )

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",
     ],
 )

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",

source/extensions/transport_sockets/tls/cert_validator/BUILD

@@ -36,6 +36,7 @@ envoy_cc_library(
         "//source/common/common:assert_lib",
         "//source/common/common:base64_lib",
         "//source/common/common:hex_lib",
+        "//source/common/common:matchers_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
         "//source/common/config:utility_lib",

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",

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();
   }

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<Stats::StatsMatcherImpl>(
       bootstrap_.stats_config(), stats_store_.symbolTable()));
   stats_store_.setHistogramSettings(

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",

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);