service_config_channel_arg_filter

pull/35879/head
Mark D. Roth 1 year ago
parent b7f56ba6b9
commit 8a99fc7659
  1. 36
      BUILD
  2. 4
      CMakeLists.txt
  3. 4
      Makefile
  4. 2
      Package.swift
  5. 4
      build_autogenerated.yaml
  6. 2
      config.m4
  7. 2
      config.w32
  8. 2
      gRPC-Core.podspec
  9. 2
      grpc.gemspec
  10. 4
      grpc.gyp
  11. 2
      package.xml
  12. 0
      src/core/service_config/service_config_channel_arg_filter.cc
  13. 2
      src/python/grpcio/grpc_core_dependencies.py
  14. 2
      tools/doxygen/Doxyfile.c++.internal
  15. 2
      tools/doxygen/Doxyfile.core.internal

36
BUILD

@ -568,6 +568,7 @@ grpc_cc_library(
"grpc_trace",
"http_connect_handshaker",
"iomgr_timer",
"service_config_channel_arg_filter",
"//src/core:channel_args",
"//src/core:channel_init",
"//src/core:channel_stack_type",
@ -648,6 +649,7 @@ grpc_cc_library(
"iomgr_timer",
"promise",
"ref_counted_ptr",
"service_config_channel_arg_filter",
"sockaddr_utils",
"tsi_base",
"uri_parser",
@ -3126,6 +3128,39 @@ grpc_cc_library(
],
)
grpc_cc_library(
name = "service_config_channel_arg_filter",
srcs = [
"//src/core:service_config/service_config_channel_arg_filter.cc",
],
external_deps = [
"absl/status",
"absl/status:statusor",
"absl/types:optional",
],
language = "c++",
deps = [
"channel_arg_names",
"config",
"gpr_platform",
"gpr_public_hdrs",
"grpc_base",
"grpc_service_config_impl",
"legacy_context",
"ref_counted_ptr",
"//src/core:arena",
"//src/core:arena_promise",
"//src/core:channel_args",
"//src/core:channel_fwd",
"//src/core:channel_stack_type",
"//src/core:context",
"//src/core:grpc_message_size_filter",
"//src/core:grpc_service_config",
"//src/core:metadata_batch",
"//src/core:service_config_parser",
],
)
grpc_cc_library(
name = "grpc_client_channel",
srcs = [
@ -3144,7 +3179,6 @@ grpc_cc_library(
"//src/core:client_channel/retry_filter_legacy_call_data.cc",
"//src/core:client_channel/retry_service_config.cc",
"//src/core:client_channel/retry_throttle.cc",
"//src/core:client_channel/service_config_channel_arg_filter.cc",
"//src/core:client_channel/subchannel.cc",
"//src/core:client_channel/subchannel_pool_interface.cc",
"//src/core:client_channel/subchannel_stream_client.cc",

4
CMakeLists.txt generated

@ -1792,7 +1792,6 @@ add_library(grpc
src/core/client_channel/retry_filter_legacy_call_data.cc
src/core/client_channel/retry_service_config.cc
src/core/client_channel/retry_throttle.cc
src/core/client_channel/service_config_channel_arg_filter.cc
src/core/client_channel/subchannel.cc
src/core/client_channel/subchannel_pool_interface.cc
src/core/client_channel/subchannel_stream_client.cc
@ -2545,6 +2544,7 @@ add_library(grpc
src/core/resolver/xds/xds_dependency_manager.cc
src/core/resolver/xds/xds_resolver.cc
src/core/resolver/xds/xds_resolver_trace.cc
src/core/service_config/service_config_channel_arg_filter.cc
src/core/service_config/service_config_impl.cc
src/core/service_config/service_config_parser.cc
src/core/tsi/alts/crypt/aes_gcm.cc
@ -2890,7 +2890,6 @@ add_library(grpc_unsecure
src/core/client_channel/retry_filter_legacy_call_data.cc
src/core/client_channel/retry_service_config.cc
src/core/client_channel/retry_throttle.cc
src/core/client_channel/service_config_channel_arg_filter.cc
src/core/client_channel/subchannel.cc
src/core/client_channel/subchannel_pool_interface.cc
src/core/client_channel/subchannel_stream_client.cc
@ -3263,6 +3262,7 @@ add_library(grpc_unsecure
src/core/resolver/resolver.cc
src/core/resolver/resolver_registry.cc
src/core/resolver/sockaddr/sockaddr_resolver.cc
src/core/service_config/service_config_channel_arg_filter.cc
src/core/service_config/service_config_impl.cc
src/core/service_config/service_config_parser.cc
src/core/tsi/alts/handshaker/transport_security_common_api.cc

4
Makefile generated

@ -975,7 +975,6 @@ LIBGRPC_SRC = \
src/core/client_channel/retry_filter_legacy_call_data.cc \
src/core/client_channel/retry_service_config.cc \
src/core/client_channel/retry_throttle.cc \
src/core/client_channel/service_config_channel_arg_filter.cc \
src/core/client_channel/subchannel.cc \
src/core/client_channel/subchannel_pool_interface.cc \
src/core/client_channel/subchannel_stream_client.cc \
@ -1728,6 +1727,7 @@ LIBGRPC_SRC = \
src/core/resolver/xds/xds_dependency_manager.cc \
src/core/resolver/xds/xds_resolver.cc \
src/core/resolver/xds/xds_resolver_trace.cc \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_parser.cc \
src/core/tsi/alts/crypt/aes_gcm.cc \
@ -1907,7 +1907,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/client_channel/retry_filter_legacy_call_data.cc \
src/core/client_channel/retry_service_config.cc \
src/core/client_channel/retry_throttle.cc \
src/core/client_channel/service_config_channel_arg_filter.cc \
src/core/client_channel/subchannel.cc \
src/core/client_channel/subchannel_pool_interface.cc \
src/core/client_channel/subchannel_stream_client.cc \
@ -2280,6 +2279,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/resolver/resolver.cc \
src/core/resolver/resolver_registry.cc \
src/core/resolver/sockaddr/sockaddr_resolver.cc \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_parser.cc \
src/core/tsi/alts/handshaker/transport_security_common_api.cc \

2
Package.swift generated

@ -147,7 +147,6 @@ let package = Package(
"src/core/client_channel/retry_service_config.h",
"src/core/client_channel/retry_throttle.cc",
"src/core/client_channel/retry_throttle.h",
"src/core/client_channel/service_config_channel_arg_filter.cc",
"src/core/client_channel/subchannel.cc",
"src/core/client_channel/subchannel.h",
"src/core/client_channel/subchannel_interface_internal.h",
@ -1941,6 +1940,7 @@ let package = Package(
"src/core/resolver/xds/xds_resolver_trace.h",
"src/core/service_config/service_config.h",
"src/core/service_config/service_config_call_data.h",
"src/core/service_config/service_config_channel_arg_filter.cc",
"src/core/service_config/service_config_impl.cc",
"src/core/service_config/service_config_impl.h",
"src/core/service_config/service_config_parser.cc",

@ -1249,7 +1249,6 @@ libs:
- src/core/client_channel/retry_filter_legacy_call_data.cc
- src/core/client_channel/retry_service_config.cc
- src/core/client_channel/retry_throttle.cc
- src/core/client_channel/service_config_channel_arg_filter.cc
- src/core/client_channel/subchannel.cc
- src/core/client_channel/subchannel_pool_interface.cc
- src/core/client_channel/subchannel_stream_client.cc
@ -2002,6 +2001,7 @@ libs:
- src/core/resolver/xds/xds_dependency_manager.cc
- src/core/resolver/xds/xds_resolver.cc
- src/core/resolver/xds/xds_resolver_trace.cc
- src/core/service_config/service_config_channel_arg_filter.cc
- src/core/service_config/service_config_impl.cc
- src/core/service_config/service_config_parser.cc
- src/core/tsi/alts/crypt/aes_gcm.cc
@ -2699,7 +2699,6 @@ libs:
- src/core/client_channel/retry_filter_legacy_call_data.cc
- src/core/client_channel/retry_service_config.cc
- src/core/client_channel/retry_throttle.cc
- src/core/client_channel/service_config_channel_arg_filter.cc
- src/core/client_channel/subchannel.cc
- src/core/client_channel/subchannel_pool_interface.cc
- src/core/client_channel/subchannel_stream_client.cc
@ -3072,6 +3071,7 @@ libs:
- src/core/resolver/resolver.cc
- src/core/resolver/resolver_registry.cc
- src/core/resolver/sockaddr/sockaddr_resolver.cc
- src/core/service_config/service_config_channel_arg_filter.cc
- src/core/service_config/service_config_impl.cc
- src/core/service_config/service_config_parser.cc
- src/core/tsi/alts/handshaker/transport_security_common_api.cc

2
config.m4 generated

@ -57,7 +57,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/client_channel/retry_filter_legacy_call_data.cc \
src/core/client_channel/retry_service_config.cc \
src/core/client_channel/retry_throttle.cc \
src/core/client_channel/service_config_channel_arg_filter.cc \
src/core/client_channel/subchannel.cc \
src/core/client_channel/subchannel_pool_interface.cc \
src/core/client_channel/subchannel_stream_client.cc \
@ -856,6 +855,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/resolver/xds/xds_dependency_manager.cc \
src/core/resolver/xds/xds_resolver.cc \
src/core/resolver/xds/xds_resolver_trace.cc \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_parser.cc \
src/core/tsi/alts/crypt/aes_gcm.cc \

2
config.w32 generated

@ -22,7 +22,6 @@ if (PHP_GRPC != "no") {
"src\\core\\client_channel\\retry_filter_legacy_call_data.cc " +
"src\\core\\client_channel\\retry_service_config.cc " +
"src\\core\\client_channel\\retry_throttle.cc " +
"src\\core\\client_channel\\service_config_channel_arg_filter.cc " +
"src\\core\\client_channel\\subchannel.cc " +
"src\\core\\client_channel\\subchannel_pool_interface.cc " +
"src\\core\\client_channel\\subchannel_stream_client.cc " +
@ -821,6 +820,7 @@ if (PHP_GRPC != "no") {
"src\\core\\resolver\\xds\\xds_dependency_manager.cc " +
"src\\core\\resolver\\xds\\xds_resolver.cc " +
"src\\core\\resolver\\xds\\xds_resolver_trace.cc " +
"src\\core\\service_config\\service_config_channel_arg_filter.cc " +
"src\\core\\service_config\\service_config_impl.cc " +
"src\\core\\service_config\\service_config_parser.cc " +
"src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " +

2
gRPC-Core.podspec generated

@ -260,7 +260,6 @@ Pod::Spec.new do |s|
'src/core/client_channel/retry_service_config.h',
'src/core/client_channel/retry_throttle.cc',
'src/core/client_channel/retry_throttle.h',
'src/core/client_channel/service_config_channel_arg_filter.cc',
'src/core/client_channel/subchannel.cc',
'src/core/client_channel/subchannel.h',
'src/core/client_channel/subchannel_interface_internal.h',
@ -2050,6 +2049,7 @@ Pod::Spec.new do |s|
'src/core/resolver/xds/xds_resolver_trace.h',
'src/core/service_config/service_config.h',
'src/core/service_config/service_config_call_data.h',
'src/core/service_config/service_config_channel_arg_filter.cc',
'src/core/service_config/service_config_impl.cc',
'src/core/service_config/service_config_impl.h',
'src/core/service_config/service_config_parser.cc',

2
grpc.gemspec generated

@ -153,7 +153,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/client_channel/retry_service_config.h )
s.files += %w( src/core/client_channel/retry_throttle.cc )
s.files += %w( src/core/client_channel/retry_throttle.h )
s.files += %w( src/core/client_channel/service_config_channel_arg_filter.cc )
s.files += %w( src/core/client_channel/subchannel.cc )
s.files += %w( src/core/client_channel/subchannel.h )
s.files += %w( src/core/client_channel/subchannel_interface_internal.h )
@ -1943,6 +1942,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/resolver/xds/xds_resolver_trace.h )
s.files += %w( src/core/service_config/service_config.h )
s.files += %w( src/core/service_config/service_config_call_data.h )
s.files += %w( src/core/service_config/service_config_channel_arg_filter.cc )
s.files += %w( src/core/service_config/service_config_impl.cc )
s.files += %w( src/core/service_config/service_config_impl.h )
s.files += %w( src/core/service_config/service_config_parser.cc )

4
grpc.gyp generated

@ -289,7 +289,6 @@
'src/core/client_channel/retry_filter_legacy_call_data.cc',
'src/core/client_channel/retry_service_config.cc',
'src/core/client_channel/retry_throttle.cc',
'src/core/client_channel/service_config_channel_arg_filter.cc',
'src/core/client_channel/subchannel.cc',
'src/core/client_channel/subchannel_pool_interface.cc',
'src/core/client_channel/subchannel_stream_client.cc',
@ -1042,6 +1041,7 @@
'src/core/resolver/xds/xds_dependency_manager.cc',
'src/core/resolver/xds/xds_resolver.cc',
'src/core/resolver/xds/xds_resolver_trace.cc',
'src/core/service_config/service_config_channel_arg_filter.cc',
'src/core/service_config/service_config_impl.cc',
'src/core/service_config/service_config_parser.cc',
'src/core/tsi/alts/crypt/aes_gcm.cc',
@ -1161,7 +1161,6 @@
'src/core/client_channel/retry_filter_legacy_call_data.cc',
'src/core/client_channel/retry_service_config.cc',
'src/core/client_channel/retry_throttle.cc',
'src/core/client_channel/service_config_channel_arg_filter.cc',
'src/core/client_channel/subchannel.cc',
'src/core/client_channel/subchannel_pool_interface.cc',
'src/core/client_channel/subchannel_stream_client.cc',
@ -1534,6 +1533,7 @@
'src/core/resolver/resolver.cc',
'src/core/resolver/resolver_registry.cc',
'src/core/resolver/sockaddr/sockaddr_resolver.cc',
'src/core/service_config/service_config_channel_arg_filter.cc',
'src/core/service_config/service_config_impl.cc',
'src/core/service_config/service_config_parser.cc',
'src/core/tsi/alts/handshaker/transport_security_common_api.cc',

2
package.xml generated

@ -135,7 +135,6 @@
<file baseinstalldir="/" name="src/core/client_channel/retry_service_config.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_throttle.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_throttle.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/service_config_channel_arg_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel_interface_internal.h" role="src" />
@ -1925,6 +1924,7 @@
<file baseinstalldir="/" name="src/core/resolver/xds/xds_resolver_trace.h" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config.h" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config_call_data.h" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config_channel_arg_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config_impl.cc" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config_impl.h" role="src" />
<file baseinstalldir="/" name="src/core/service_config/service_config_parser.cc" role="src" />

@ -31,7 +31,6 @@ CORE_SOURCE_FILES = [
'src/core/client_channel/retry_filter_legacy_call_data.cc',
'src/core/client_channel/retry_service_config.cc',
'src/core/client_channel/retry_throttle.cc',
'src/core/client_channel/service_config_channel_arg_filter.cc',
'src/core/client_channel/subchannel.cc',
'src/core/client_channel/subchannel_pool_interface.cc',
'src/core/client_channel/subchannel_stream_client.cc',
@ -830,6 +829,7 @@ CORE_SOURCE_FILES = [
'src/core/resolver/xds/xds_dependency_manager.cc',
'src/core/resolver/xds/xds_resolver.cc',
'src/core/resolver/xds/xds_resolver_trace.cc',
'src/core/service_config/service_config_channel_arg_filter.cc',
'src/core/service_config/service_config_impl.cc',
'src/core/service_config/service_config_parser.cc',
'src/core/tsi/alts/crypt/aes_gcm.cc',

@ -1113,7 +1113,6 @@ src/core/client_channel/retry_service_config.cc \
src/core/client_channel/retry_service_config.h \
src/core/client_channel/retry_throttle.cc \
src/core/client_channel/retry_throttle.h \
src/core/client_channel/service_config_channel_arg_filter.cc \
src/core/client_channel/subchannel.cc \
src/core/client_channel/subchannel.h \
src/core/client_channel/subchannel_interface_internal.h \
@ -2942,6 +2941,7 @@ src/core/resolver/xds/xds_resolver_trace.cc \
src/core/resolver/xds/xds_resolver_trace.h \
src/core/service_config/service_config.h \
src/core/service_config/service_config_call_data.h \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_impl.h \
src/core/service_config/service_config_parser.cc \

@ -917,7 +917,6 @@ src/core/client_channel/retry_service_config.cc \
src/core/client_channel/retry_service_config.h \
src/core/client_channel/retry_throttle.cc \
src/core/client_channel/retry_throttle.h \
src/core/client_channel/service_config_channel_arg_filter.cc \
src/core/client_channel/subchannel.cc \
src/core/client_channel/subchannel.h \
src/core/client_channel/subchannel_interface_internal.h \
@ -2723,6 +2722,7 @@ src/core/resolver/xds/xds_resolver_trace.cc \
src/core/resolver/xds/xds_resolver_trace.h \
src/core/service_config/service_config.h \
src/core/service_config/service_config_call_data.h \
src/core/service_config/service_config_channel_arg_filter.cc \
src/core/service_config/service_config_impl.cc \
src/core/service_config/service_config_impl.h \
src/core/service_config/service_config_parser.cc \

Loading…
Cancel
Save