add downstream_cx_active stats only when ExitOnZeroActiveConnections …

…is used (istio#36081) * enable downstream_cx_active stats only when ExitOnZeroActiveConnections is enabled Signed-off-by: Rama Chavali <rama.rao@salesforce.com> * fix tests Signed-off-by: Rama Chavali <rama.rao@salesforce.com> * ignore worker stats Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
johnlanni · Nov 15, 2021 · 0a5a486 · 0a5a486
1 parent acbe753
commit 0a5a486
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 53 deletions.
diff --git a/pilot/pkg/model/context.go b/pilot/pkg/model/context.go
@@ -625,6 +625,9 @@ type NodeMetadata struct {
 	// Envoy prometheus port redirecting to admin port prometheus endpoint.
 	EnvoyPrometheusPort int `json:"ENVOY_PROMETHEUS_PORT,omitempty"`
 
+	// ExitOnZeroActiveConnections terminates Envoy if there are no active connections if set.
+	ExitOnZeroActiveConnections StringBool `json:"EXIT_ON_ZERO_ACTIVE_CONNECTIONS,omitempty"`
+
 	// Contains a copy of the raw metadata. This is needed to lookup arbitrary values.
 	// If a value is known ahead of time it should be added to the struct rather than reading from here,
 	Raw map[string]interface{} `json:"-"`

diff --git a/pkg/bootstrap/config.go b/pkg/bootstrap/config.go
@@ -230,12 +230,16 @@ func getStatsOptions(meta *model.BootstrapNodeMetadata) []option.Instance {
 		proxyConfigSuffixes = config.ProxyStatsMatcher.InclusionSuffixes
 		proxyConfigRegexps = config.ProxyStatsMatcher.InclusionRegexps
 	}
+	inclusionSuffixes := rbacEnvoyStatsMatcherInclusionSuffix
+	if meta.ExitOnZeroActiveConnections {
+		inclusionSuffixes = requiredEnvoyStatsMatcherInclusionSuffixes
+	}
 
 	return []option.Instance{
 		option.EnvoyStatsMatcherInclusionPrefix(parseOption(prefixAnno,
 			requiredEnvoyStatsMatcherInclusionPrefixes, proxyConfigPrefixes)),
 		option.EnvoyStatsMatcherInclusionSuffix(parseOption(suffixAnno,
-			requiredEnvoyStatsMatcherInclusionSuffixes, proxyConfigSuffixes)),
+			inclusionSuffixes, proxyConfigSuffixes)),
 		option.EnvoyStatsMatcherInclusionRegexp(parseOption(RegexAnno, "", proxyConfigRegexps)),
 		option.EnvoyExtraStatTags(extraStatTags),
 	}

diff --git a/pkg/bootstrap/instance_test.go b/pkg/bootstrap/instance_test.go
@@ -472,9 +472,9 @@ func checkStatsMatcher(t *testing.T, got, want *bootstrap.Bootstrap, stats stats
 		stats.prefixes = v2Prefixes + stats.prefixes + "," + requiredEnvoyStatsMatcherInclusionPrefixes + v2Suffix
 	}
 	if stats.suffixes == "" {
-		stats.suffixes = requiredEnvoyStatsMatcherInclusionSuffixes
+		stats.suffixes = rbacEnvoyStatsMatcherInclusionSuffix
 	} else {
-		stats.suffixes += "," + requiredEnvoyStatsMatcherInclusionSuffixes
+		stats.suffixes += "," + rbacEnvoyStatsMatcherInclusionSuffix
 	}
 
 	if err := gsm.Validate(); err != nil {

diff --git a/pkg/bootstrap/testdata/all_golden.json b/pkg/bootstrap/testdata/all_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/auth_golden.json b/pkg/bootstrap/testdata/auth_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/authsds_golden.json b/pkg/bootstrap/testdata/authsds_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/default_golden.json b/pkg/bootstrap/testdata/default_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/metrics_no_statsd_golden.json b/pkg/bootstrap/testdata/metrics_no_statsd_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/running_golden.json b/pkg/bootstrap/testdata/running_golden.json
@@ -248,9 +248,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/runningsds_golden.json b/pkg/bootstrap/testdata/runningsds_golden.json
@@ -248,9 +248,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/stats_inclusion_golden.json b/pkg/bootstrap/testdata/stats_inclusion_golden.json
@@ -333,9 +333,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "safe_regex": {"google_re2":{}, "regex":"http.[0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*_8080.downstream_rq_time"}
           },
           {

diff --git a/pkg/bootstrap/testdata/tracing_datadog_golden.json b/pkg/bootstrap/testdata/tracing_datadog_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_lightstep_golden.json b/pkg/bootstrap/testdata/tracing_lightstep_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json b/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_stackdriver_golden.json b/pkg/bootstrap/testdata/tracing_stackdriver_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json b/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_tls_golden.json b/pkg/bootstrap/testdata/tracing_tls_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/tracing_zipkin_golden.json b/pkg/bootstrap/testdata/tracing_zipkin_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/bootstrap/testdata/xdsproxy_golden.json b/pkg/bootstrap/testdata/xdsproxy_golden.json
@@ -243,9 +243,6 @@
           "suffix": "shadow_denied"
           },
           {
-          "suffix": "downstream_cx_active"
-          },
-          {
           "prefix": "component"
           }
         ]

diff --git a/pkg/envoy/agent.go b/pkg/envoy/agent.go
@@ -183,8 +183,9 @@ func (a *Agent) activeProxyConnections() int {
 			continue
 		}
 		// downstream_cx_active is accounted under "http." and "listener." for http listeners.
-		// Only consider listener stats.
-		if !strings.HasPrefix(parts[0], "listener.") {
+		// Only consider listener stats. Listener stats also will have per worker stats, we can
+		// ignore them.
+		if !strings.HasPrefix(parts[0], "listener.") || strings.Contains(parts[0], "worker_") {
 			continue
 		}
 		// If the stat is for a known Istio listener skip it.