stats: add tag extraction rule for embedded gRPC client streams_closed stats

source/common/config/well_known_names.cc

@@ -239,6 +239,12 @@ TagNameValues::TagNameValues() {
   // grpc.(<stat_prefix>).**
   addTokenized(GOOGLE_GRPC_CLIENT_PREFIX, "grpc.$.**");
 
+  // [*.]grpc.(<stat_prefix>.)streams_closed_<gRPC_status_code>
+  // Handles gRPC client stats where the stat_prefix is embedded inside a longer
+  // stat name (e.g. listener_manager.lds.grpc.(<lds_cluster>.)streams_closed_1,
+  // sds.client_cert.grpc.(<sds_cluster>.)streams_closed_12).
+  addRe2(GOOGLE_GRPC_CLIENT_PREFIX, R"(\.grpc\.((.+)\.streams_closed_\d+)$)", ".grpc.");
+
   // listener.[<address>.]ssl.certificate.(<cert_name>).<metric_name> or
   // cluster.[<cluster_name>.]ssl.certificate.(<cert_name>).<metric_name>
   addRe2(TLS_CERTIFICATE,

test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc

@@ -24,10 +24,6 @@ class AccessLogIntegrationTest : public Grpc::GrpcClientIntegrationParamTest,
                                  public HttpIntegrationTest {
 public:
   AccessLogIntegrationTest() : HttpIntegrationTest(Http::CodecType::HTTP1, ipVersion()) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat 'grpc.accesslog.streams_closed_11' and stat_prefix
-    // 'accesslog'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   void createUpstreams() override {

test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc

@@ -49,10 +49,6 @@ class TcpGrpcAccessLogIntegrationTest : public Grpc::GrpcClientIntegrationParamT
 public:
   TcpGrpcAccessLogIntegrationTest()
       : BaseIntegrationTest(ipVersion(), ConfigHelper::tcpProxyConfig()) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat 'grpc.accesslog.streams_closed_14' and stat_prefix
-    // 'accesslog'.
-    skip_tag_extraction_rule_check_ = true;
 
     enableHalfClose(true);
   }

test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc

@@ -27,8 +27,6 @@ class RatelimitIntegrationTest : public Grpc::GrpcClientIntegrationParamTest,
                                  public HttpIntegrationTest {
 public:
   RatelimitIntegrationTest() : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, ipVersion()) {
-    // TODO(ggreenway): add tag extraction rules.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   void createUpstreams() override {

test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc

@@ -22,10 +22,6 @@ class MetricsServiceIntegrationTest : public Grpc::GrpcClientIntegrationParamTes
                                       public HttpIntegrationTest {
 public:
   MetricsServiceIntegrationTest() : HttpIntegrationTest(Http::CodecType::HTTP1, ipVersion()) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat 'grpc.metrics_service.streams_closed_14' and
-    // stat_prefix 'metrics_service'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   void createUpstreams() override {

test/integration/extension_discovery_integration_test.cc

@@ -59,10 +59,6 @@ class ExtensionDiscoveryIntegrationTest : public Grpc::GrpcClientIntegrationPara
                                           public HttpIntegrationTest {
 public:
   ExtensionDiscoveryIntegrationTest() : HttpIntegrationTest(Http::CodecType::HTTP1, ipVersion()) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'listener_manager.lds.grpc.lds_cluster.streams_closed_10' and stat_prefix 'lds_cluster'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   void addDynamicFilter(const std::string& name, bool apply_without_warming,

test/integration/listener_extension_discovery_integration_test.cc

@@ -27,11 +27,6 @@ class ListenerExtensionDiscoveryIntegrationTestBase : public Grpc::GrpcClientInt
                                                 const std::string& listener_filter_name)
       : HttpIntegrationTest(downstream_type, ipVersion(), config),
         filter_name_(listener_filter_name), port_name_("http") {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'extension_config_discovery.tcp_listener_filter.foo.grpc.ecds_cluster.streams_closed_7' and
-    // stat_prefix 'ecds_cluster'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   void addDynamicFilterWithType(const std::string& filter_name,

test/integration/listener_lds_integration_test.cc

@@ -38,10 +38,6 @@ class ListenerIntegrationTestBase : public HttpIntegrationTest {
 
   ListenerIntegrationTestBase(Network::Address::IpVersion version, const std::string& config)
       : HttpIntegrationTest(Http::CodecType::HTTP1, version, config) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'listener_manager.lds.grpc.lds_cluster.streams_closed_1' and stat_prefix 'lds_cluster'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   ~ListenerIntegrationTestBase() override { resetConnections(); }
@@ -1193,10 +1189,6 @@ class ListenerFilterIntegrationTest : public BaseIntegrationTest,
           stat_prefix: tcp_stats
           cluster: cluster_0
 )EOF") {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'listener_manager.lds.grpc.lds_cluster.streams_closed_1' and stat_prefix 'lds_cluster'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   ~ListenerFilterIntegrationTest() override {

test/integration/scoped_rds.h

@@ -31,11 +31,6 @@ class ScopedRdsIntegrationTest : public HttpIntegrationTest,
   };
 
   ScopedRdsIntegrationTest() : HttpIntegrationTest(Http::CodecType::HTTP1, ipVersion()) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'http.scoped_rds.foo-scoped-routes.grpc.srds_cluster.streams_closed_16' and stat_prefix
-    // 'srds_cluster'.
-    skip_tag_extraction_rule_check_ = true;
 
     config_helper_.addRuntimeOverride("envoy.reloadable_features.unified_mux",
                                       (sotwOrDelta() == Grpc::SotwOrDelta::UnifiedSotw ||

test/integration/sds_dynamic_integration_test.cc

@@ -91,22 +91,12 @@ class SdsDynamicIntegrationBaseTest : public Grpc::BaseGrpcClientIntegrationPara
   SdsDynamicIntegrationBaseTest()
       : HttpIntegrationTest(Http::CodecType::HTTP1, GetParam().ip_version),
         test_quic_(GetParam().test_quic) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'sds.client_cert.grpc.sds_cluster.lyft.com.streams_closed_12' and stat_prefix
-    // 'sds_cluster.lyft.com'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   SdsDynamicIntegrationBaseTest(Http::CodecType downstream_protocol,
                                 Network::Address::IpVersion version, const std::string& config)
       : HttpIntegrationTest(downstream_protocol, version, config),
         test_quic_(GetParam().test_quic) {
-    // TODO(ggreenway): add tag extraction rules.
-    // Missing stat tag-extraction rule for stat
-    // 'sds.client_cert.grpc.sds_cluster.lyft.com.streams_closed_12' and stat_prefix
-    // 'sds_cluster.lyft.com'.
-    skip_tag_extraction_rule_check_ = true;
   }
 
   Network::Address::IpVersion ipVersion() const override { return GetParam().ip_version; }