NET-6319 - L7 routes have statePrefix of upstream. and should have a …

…full path (#19473)
hashicorp · Nov 3, 2023 · d94d316 · d94d316
1 parent 2bc0bc3
commit d94d316
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden b/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden
@@ -17,7 +17,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.",
+                "statPrefix":  "upstream.http.api-1.default.default.dc1",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},

diff --git a/...ta/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...ta/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.",
+                "statPrefix":  "upstream.http.api-app.default.default.dc1",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
@@ -140,7 +140,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.",
+                "statPrefix":  "upstream.http.api-app2.default.default.dc1",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},

diff --git a/...tdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...tdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.",
+                "statPrefix":  "upstream.http.api-app.default.default.dc1",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},

diff --git a/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.",
+                "statPrefix":  "upstream.http.api-app.default.default.dc1",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},

diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
@@ -248,7 +248,7 @@ func (b *Builder) buildDestination(
 			panic(fmt.Sprintf("it should not be possible to have a tcp protocol here: %v", effectiveProtocol))
 		}
 
-		rb := lb.addL7Router(routeName, "", effectiveProtocol)
+		rb := lb.addL7Router(routeName, statPrefix, effectiveProtocol)
 		if destination.Explicit == nil {
 			rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
 		}
@@ -372,7 +372,7 @@ func (b *ListenerBuilder) addL4RouterForDirect(clusterName, statPrefix string) *
 	router := &pbproxystate.Router{}
 
 	if statPrefix == "" {
-		statPrefix = "upstream."
+		statPrefix = fmt.Sprintf("upstream.%s", clusterName)
 	}
 
 	router.Destination = &pbproxystate.Router_L4{

diff --git a/...rnal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden b/...rnal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden
@@ -234,7 +234,7 @@
               "route": {
                 "name": "default/local/default/api-1:http:1.1.1.1:1234"
               },
-              "statPrefix": "upstream."
+              "statPrefix": "upstream.http.api-1.default.default.dc1"
             }
           }
         ]

diff --git a/...der/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...der/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -257,7 +257,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream."
+              "statPrefix": "upstream.http.api-app.default.default.dc1"
             },
             "match": {
               "destinationPort": 8080,
@@ -274,7 +274,7 @@
               "route": {
                 "name": "default/local/default/api-app2:http"
               },
-              "statPrefix": "upstream."
+              "statPrefix": "upstream.http.api-app2.default.default.dc1"
             },
             "match": {
               "destinationPort": 8080,

diff --git a/...uilder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...uilder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -152,7 +152,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream."
+              "statPrefix": "upstream.http.api-app.default.default.dc1"
             },
             "match": {
               "destinationPort": 8080,

diff --git a/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -152,7 +152,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream."
+              "statPrefix": "upstream.http.api-app.default.default.dc1"
             },
             "match": {
               "destinationPort": 8080,

diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden
@@ -285,7 +285,7 @@
             "route": {
               "name": "default/local/default/api-1:http:1.1.1.1:1234"
             },
-            "statPrefix": "upstream."
+            "statPrefix": "upstream.http.api-1.default.default.dc1"
           }
         }
       ]

diff --git a/...xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -330,7 +330,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream."
+            "statPrefix": "upstream.http.api-app.default.default.dc1"
           },
           "match": {
             "destinationPort": 8080,
@@ -347,7 +347,7 @@
             "route": {
               "name": "default/local/default/api-app2:http"
             },
-            "statPrefix": "upstream."
+            "statPrefix": "upstream.http.api-app2.default.default.dc1"
           },
           "match": {
             "destinationPort": 8080,

diff --git a/...rs/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...rs/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -192,7 +192,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream."
+            "statPrefix": "upstream.http.api-app.default.default.dc1"
           },
           "match": {
             "destinationPort": 8080,

diff --git a/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -192,7 +192,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream."
+            "statPrefix": "upstream.http.api-app.default.default.dc1"
           },
           "match": {
             "destinationPort": 8080,