fix statsMatcher's regex which didn't match route's stat_prefix (#51640)

* fix statsMatcher's regex which didn't match route's stat_prefix Fix #51639 Signed-off-by: spacewander <[email protected]> * u Signed-off-by: spacewander <[email protected]> * apply Signed-off-by: spacewander <[email protected]> --------- Signed-off-by: spacewander <[email protected]>
istio · Jun 20, 2024 · 70f049e · 70f049e
1 parent 2e7743b
commit 70f049e
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 23 deletions.
diff --git a/pkg/bootstrap/config.go b/pkg/bootstrap/config.go
@@ -63,7 +63,7 @@ const (
  requiredEnvoyStatsMatcherInclusionSuffixes = rbacEnvoyStatsMatcherInclusionSuffix + ",downstream_cx_active" // Needed for draining.
 
  // required for metrics based on stat_prefix in virtual service.
- requiredEnvoyStatsMatcherInclusionRegexes = `vhost\.*\.route\.*`
+ requiredEnvoyStatsMatcherInclusionRegexes = `vhost\..*\.route\..*`
 
  // Prefixes of V2 metrics.
  // "reporter" prefix is for istio standard metrics.

diff --git a/pkg/bootstrap/config_test.go b/pkg/bootstrap/config_test.go
@@ -18,6 +18,7 @@ import (
  "encoding/json"
  "os"
  "reflect"
+ "regexp"
  "testing"
 
  . "github.com/onsi/gomega"
@@ -319,3 +320,10 @@ func TestGetStatOptions(t *testing.T) {
  })
  }
 }
+
+func TestRequiredEnvoyStatsMatcherInclusionRegexes(t *testing.T) {
+ ok, _ := regexp.MatchString(requiredEnvoyStatsMatcherInclusionRegexes, "vhost.default.local:18000.route.routev1.upstream_rq_200")
+ if !ok {
+ t.Fatalf("requiredEnvoyStatsMatcherInclusionRegexes doesn't match the route's stat_prefix")
+ }
+}
diff --git a/pkg/bootstrap/testdata/all_golden.json b/pkg/bootstrap/testdata/all_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/auth_golden.json b/pkg/bootstrap/testdata/auth_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/authsds_golden.json b/pkg/bootstrap/testdata/authsds_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/default_golden.json b/pkg/bootstrap/testdata/default_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/deferred_cluster_creation_golden.json b/pkg/bootstrap/testdata/deferred_cluster_creation_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/lrs_golden.json b/pkg/bootstrap/testdata/lrs_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/metrics_no_statsd_golden.json b/pkg/bootstrap/testdata/metrics_no_statsd_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/running_golden.json b/pkg/bootstrap/testdata/running_golden.json
@@ -138,7 +138,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/runningsds_golden.json b/pkg/bootstrap/testdata/runningsds_golden.json
@@ -138,7 +138,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/stats_compression_brotli_golden.json b/pkg/bootstrap/testdata/stats_compression_brotli_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/stats_compression_gzip_golden.json b/pkg/bootstrap/testdata/stats_compression_gzip_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/stats_compression_unknown_golden.json b/pkg/bootstrap/testdata/stats_compression_unknown_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/stats_compression_zstd_golden.json b/pkg/bootstrap/testdata/stats_compression_zstd_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/stats_inclusion_golden.json b/pkg/bootstrap/testdata/stats_inclusion_golden.json
@@ -227,7 +227,7 @@
  "safe_regex": {"regex":"http.[0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*_8080.downstream_rq_time"}
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_datadog_golden.json b/pkg/bootstrap/testdata/tracing_datadog_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_lightstep_golden.json b/pkg/bootstrap/testdata/tracing_lightstep_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_none_golden.json b/pkg/bootstrap/testdata/tracing_none_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json b/pkg/bootstrap/testdata/tracing_opencensusagent_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json b/pkg/bootstrap/testdata/tracing_tls_custom_sni_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_tls_golden.json b/pkg/bootstrap/testdata/tracing_tls_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/tracing_zipkin_golden.json b/pkg/bootstrap/testdata/tracing_zipkin_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/pkg/bootstrap/testdata/xdsproxy_golden.json b/pkg/bootstrap/testdata/xdsproxy_golden.json
@@ -133,7 +133,7 @@
  "suffix": "shadow_denied"
  },
  {
- "safe_regex": {"regex":"vhost\\.*\\.route\\.*"}
+ "safe_regex": {"regex":"vhost\\..*\\.route\\..*"}
  },
  {
  "prefix": "component"

diff --git a/releasenotes/notes/51640.yaml b/releasenotes/notes/51640.yaml
@@ -0,0 +1,6 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: telemetry
+releaseNotes:
+- |
+ **Fixed** statsMatcher's regex which didn't match route's stat_prefix