Merge pull request #22177 from gnossen/no_overprovisioning_cherrypick

Cherrypick #22147: xds: send no-overprovisioning client capability and populate user_agent fields

BUILD

@@ -1098,7 +1098,6 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
-        "envoy_orca_upb",
         "gpr_base",
         "grpc_base",
         "grpc_client_authority_filter",
@@ -1108,6 +1107,7 @@ grpc_cc_library(
         "orphanable",
         "ref_counted",
         "ref_counted_ptr",
+        "udpa_orca_upb",
     ],
 )
 
@@ -2393,60 +2393,93 @@ grpc_cc_library(
     srcs = [
         "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cds.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/eds.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/lds.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/listener.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/rds.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/route.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/srds.upb.c",
         "src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c",
         "src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c",
         "src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.c",
         "src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c",
         "src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/string.upb.c",
     ],
     hdrs = [
         "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/eds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/lds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/listener.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/rds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/route.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/route/route.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/srds.upb.h",
         "src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.h",
         "src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h",
         "src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.h",
         "src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.h",
         "src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/string.upb.h",
     ],
     external_deps = [
         "upb_lib",
     ],
     language = "c++",
     deps = [
+        ":envoy_annotations_upb",
         ":envoy_core_upb",
         ":envoy_type_upb",
         ":google_api_upb",
         ":proto_gen_validate_upb",
+        ":udpa_annotations_upb",
+    ],
+)
+
+grpc_cc_library(
+    name = "envoy_annotations_upb",
+    srcs = [
+        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c",
+        "src/core/ext/upb-generated/envoy/annotations/resource.upb.c",
+    ],
+    hdrs = [
+        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h",
+        "src/core/ext/upb-generated/envoy/annotations/resource.upb.h",
+    ],
+    external_deps = [
+        "upb_lib",
+    ],
+    language = "c++",
+    deps = [
+        ":google_api_upb",
     ],
 )
 
@@ -2475,31 +2508,45 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
+        ":envoy_annotations_upb",
         ":envoy_type_upb",
         ":google_api_upb",
         ":proto_gen_validate_upb",
+        ":udpa_annotations_upb",
     ],
 )
 
 grpc_cc_library(
     name = "envoy_type_upb",
     srcs = [
         "src/core/ext/upb-generated/envoy/type/http.upb.c",
+        "src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c",
+        "src/core/ext/upb-generated/envoy/type/matcher/string.upb.c",
+        "src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c",
         "src/core/ext/upb-generated/envoy/type/percent.upb.c",
         "src/core/ext/upb-generated/envoy/type/range.upb.c",
+        "src/core/ext/upb-generated/envoy/type/semantic_version.upb.c",
+        "src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c",
     ],
     hdrs = [
         "src/core/ext/upb-generated/envoy/type/http.upb.h",
+        "src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h",
+        "src/core/ext/upb-generated/envoy/type/matcher/string.upb.h",
+        "src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.h",
         "src/core/ext/upb-generated/envoy/type/percent.upb.h",
         "src/core/ext/upb-generated/envoy/type/range.upb.h",
+        "src/core/ext/upb-generated/envoy/type/semantic_version.upb.h",
+        "src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.h",
     ],
     external_deps = [
         "upb_lib",
     ],
     language = "c++",
     deps = [
+        ":envoy_annotations_upb",
         ":google_api_upb",
         ":proto_gen_validate_upb",
+        ":udpa_annotations_upb",
     ],
 )
 
@@ -2522,14 +2569,14 @@ grpc_cc_library(
     ],
 )
 
-# Once upb code-gen issue is resolved, replace envoy_orca_upb with this.
+# Once upb code-gen issue is resolved, replace udpa_orca_upb with this.
 # grpc_upb_proto_library(
-#     name = "envoy_orca_upb",
+#     name = "udpa_orca_upb",
 #     deps = ["@envoy_api//udpa/data/orca/v1:orca_load_report"]
 # )
 
 grpc_cc_library(
-    name = "envoy_orca_upb",
+    name = "udpa_orca_upb",
     srcs = [
         "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
     ],
@@ -2545,6 +2592,25 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "udpa_annotations_upb",
+    srcs = [
+        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.c",
+        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c",
+    ],
+    hdrs = [
+        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.h",
+        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h",
+    ],
+    external_deps = [
+        "upb_lib",
+    ],
+    language = "c++",
+    deps = [
+        ":google_api_upb",
+    ],
+)
+
 # Once upb code-gen issue is resolved, replace grpc_health_upb with this.
 # grpc_upb_proto_library(
 #     name = "grpc_health_upb",

BUILD.gn

@@ -395,10 +395,16 @@ config("grpc_config") {
         "src/core/ext/transport/inproc/inproc_plugin.cc",
         "src/core/ext/transport/inproc/inproc_transport.cc",
         "src/core/ext/transport/inproc/inproc_transport.h",
+        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c",
+        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h",
+        "src/core/ext/upb-generated/envoy/annotations/resource.upb.c",
+        "src/core/ext/upb-generated/envoy/annotations/resource.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cds.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c",
@@ -423,20 +429,34 @@ config("grpc_config") {
         "src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/eds.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/eds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/lds.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/lds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/listener.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/listener.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/rds.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/rds.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/route.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/route.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/route/route.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h",
+        "src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c",
+        "src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.h",
         "src/core/ext/upb-generated/envoy/api/v2/srds.upb.c",
         "src/core/ext/upb-generated/envoy/api/v2/srds.upb.h",
         "src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c",
@@ -455,10 +475,16 @@ config("grpc_config") {
         "src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h",
         "src/core/ext/upb-generated/envoy/type/matcher/string.upb.c",
         "src/core/ext/upb-generated/envoy/type/matcher/string.upb.h",
+        "src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c",
+        "src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.h",
         "src/core/ext/upb-generated/envoy/type/percent.upb.c",
         "src/core/ext/upb-generated/envoy/type/percent.upb.h",
         "src/core/ext/upb-generated/envoy/type/range.upb.c",
         "src/core/ext/upb-generated/envoy/type/range.upb.h",
+        "src/core/ext/upb-generated/envoy/type/semantic_version.upb.c",
+        "src/core/ext/upb-generated/envoy/type/semantic_version.upb.h",
+        "src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c",
+        "src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.h",
         "src/core/ext/upb-generated/gogoproto/gogo.upb.c",
         "src/core/ext/upb-generated/gogoproto/gogo.upb.h",
         "src/core/ext/upb-generated/google/api/annotations.upb.c",
@@ -491,6 +517,10 @@ config("grpc_config") {
         "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h",
         "src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c",
         "src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h",
+        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.c",
+        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.h",
+        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c",
+        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h",
         "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
         "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
         "src/core/ext/upb-generated/validate/validate.upb.c",

CMakeLists.txt

@@ -1834,18 +1834,26 @@ add_library(grpc
   src/core/ext/filters/client_channel/xds/xds_client_stats.cc
   src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c
   src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c
   src/core/ext/upb-generated/envoy/api/v2/eds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c
   src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c
   src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c
   src/core/ext/upb-generated/envoy/api/v2/lds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/listener.upb.c
   src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c
   src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c
   src/core/ext/upb-generated/envoy/api/v2/rds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/route.upb.c
   src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c
   src/core/ext/upb-generated/envoy/api/v2/srds.upb.c
   src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c
   src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c
@@ -1862,8 +1870,15 @@ add_library(grpc
   src/core/ext/upb-generated/envoy/type/http.upb.c
   src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c
   src/core/ext/upb-generated/envoy/type/matcher/string.upb.c
+  src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c
   src/core/ext/upb-generated/envoy/type/percent.upb.c
   src/core/ext/upb-generated/envoy/type/range.upb.c
+  src/core/ext/upb-generated/envoy/type/semantic_version.upb.c
+  src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c
+  src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
+  src/core/ext/upb-generated/envoy/annotations/resource.upb.c
+  src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
+  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
   src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
   src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
   src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
@@ -3342,18 +3357,26 @@ add_library(grpc_unsecure
   src/core/ext/filters/client_channel/xds/xds_client_stats.cc
   src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c
   src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c
   src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c
   src/core/ext/upb-generated/envoy/api/v2/eds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c
   src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c
   src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c
   src/core/ext/upb-generated/envoy/api/v2/lds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/listener.upb.c
   src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c
   src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c
   src/core/ext/upb-generated/envoy/api/v2/rds.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/route.upb.c
   src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c
+  src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c
   src/core/ext/upb-generated/envoy/api/v2/srds.upb.c
   src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c
   src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c
@@ -3370,8 +3393,15 @@ add_library(grpc_unsecure
   src/core/ext/upb-generated/envoy/type/http.upb.c
   src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c
   src/core/ext/upb-generated/envoy/type/matcher/string.upb.c
+  src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c
   src/core/ext/upb-generated/envoy/type/percent.upb.c
   src/core/ext/upb-generated/envoy/type/range.upb.c
+  src/core/ext/upb-generated/envoy/type/semantic_version.upb.c
+  src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c
+  src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
+  src/core/ext/upb-generated/envoy/annotations/resource.upb.c
+  src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
+  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
   src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
   src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
   src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc