xds: Use only the port number as the configured route name

This removes duplication of protocol from the stats_prefix
5 years ago · 881760f701
parent 89e6b16815
commit 881760f701
8 changed files with 13 additions and 13 deletions
--- a/agent/proxycfg/snapshot.go
+++ b/agent/proxycfg/snapshot.go
@ -222,7 +222,7 @@ type IngressListenerKey struct {
 }

 func (k *IngressListenerKey) RouteName() string {
-	return fmt.Sprintf("%s_%d", k.Protocol, k.Port)
+	return fmt.Sprintf("%d", k.Port)
 }

 // ConfigSnapshot captures all the resulting config needed for a proxy instance.
--- a/agent/xds/testdata/listeners/ingress-http-multiple-services.golden
+++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.golden
@ -26,9 +26,9 @@
                              "ads": {
                                  }
                            },
-                        "route_config_name": "http_443"
+                        "route_config_name": "443"
                      },
-                  "stat_prefix": "ingress_upstream_http_443_http",
+                  "stat_prefix": "ingress_upstream_443_http",
                  "tracing": {
                        "operation_name": "EGRESS",
                        "random_sampling": {
@ -65,9 +65,9 @@
                              "ads": {
                                  }
                            },
-                        "route_config_name": "http_8080"
+                        "route_config_name": "8080"
                      },
-                  "stat_prefix": "ingress_upstream_http_8080_http",
+                  "stat_prefix": "ingress_upstream_8080_http",
                  "tracing": {
                        "operation_name": "EGRESS",
                        "random_sampling": {
--- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.golden
+++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.golden
@ -26,9 +26,9 @@
                              "ads": {
                                  }
                            },
-                        "route_config_name": "http_9191"
+                        "route_config_name": "9191"
                      },
-                  "stat_prefix": "ingress_upstream_http_9191_http",
+                  "stat_prefix": "ingress_upstream_9191_http",
                  "tracing": {
                        "operation_name": "EGRESS",
                        "random_sampling": {
--- a/agent/xds/testdata/routes/ingress-http-multiple-services.golden
+++ b/agent/xds/testdata/routes/ingress-http-multiple-services.golden
@ -3,7 +3,7 @@
  "resources": [
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_443",
+      "name": "443",
      "virtualHosts": [
        {
          "name": "baz",
@ -42,7 +42,7 @@
    },
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_8080",
+      "name": "8080",
      "virtualHosts": [
        {
          "name": "foo",
--- a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.golden
+++ b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.golden
@ -3,7 +3,7 @@
  "resources": [
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_9191",
+      "name": "9191",
      "virtualHosts": [
        {
          "name": "db",
--- a/agent/xds/testdata/routes/ingress-with-chain-and-router.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-and-router.golden
@ -3,7 +3,7 @@
  "resources": [
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_9191",
+      "name": "9191",
      "virtualHosts": [
        {
          "name": "db",
--- a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.golden
@ -3,7 +3,7 @@
  "resources": [
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_9191",
+      "name": "9191",
      "virtualHosts": [
        {
          "name": "db",
--- a/agent/xds/testdata/routes/ingress-with-grpc-router.golden
+++ b/agent/xds/testdata/routes/ingress-with-grpc-router.golden
@ -3,7 +3,7 @@
  "resources": [
    {
      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
-      "name": "http_9191",
+      "name": "9191",
      "virtualHosts": [
        {
          "name": "db",