Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into client_channel_remove_num_external_watchers

Browse Source
pull/35840/head
Mark D. Roth 10 months ago
parent c0de44e1ea 239399212a
commit 334670c13c
129 changed files with 1517 additions and 1440 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      BUILD
  2. 84
      CMakeLists.txt
  3. 84
      Makefile
  4. 84
      Package.swift
  5. 8
      bazel/grpc_deps.bzl
  6. 168
      build_autogenerated.yaml
  7. 44
      config.m4
  8. 44
      config.w32
  9. 88
      gRPC-C++.podspec
  10. 132
      gRPC-Core.podspec
  11. 84
      grpc.gemspec
  12. 84
      grpc.gyp
  13. 25
      include/grpcpp/ext/csm_observability.h
  14. 84
      package.xml
  15. 7
      src/boringssl/boringssl_prefix_symbols.h
  16. 0
      src/core/client_channel/.clang-format
  17. 0
      src/core/client_channel/README.md
  18. 2
      src/core/client_channel/backend_metric.cc
  19. 6
      src/core/client_channel/backend_metric.h
  20. 2
      src/core/client_channel/backup_poller.cc
  21. 6
      src/core/client_channel/backup_poller.h
  22. 2
      src/core/client_channel/channel_connectivity.cc
  23. 2
      src/core/client_channel/client_channel_channelz.cc
  24. 6
      src/core/client_channel/client_channel_channelz.h
  25. 2
      src/core/client_channel/client_channel_factory.cc
  26. 8
      src/core/client_channel/client_channel_factory.h
  27. 26
      src/core/client_channel/client_channel_filter.cc
  28. 16
      src/core/client_channel/client_channel_filter.h
  29. 6
      src/core/client_channel/client_channel_internal.h
  30. 6
      src/core/client_channel/client_channel_plugin.cc
  31. 2
      src/core/client_channel/client_channel_service_config.cc
  32. 6
      src/core/client_channel/client_channel_service_config.h
  33. 2
      src/core/client_channel/config_selector.cc
  34. 8
      src/core/client_channel/config_selector.h
  35. 6
      src/core/client_channel/connector.h
  36. 2
      src/core/client_channel/dynamic_filters.cc
  37. 6
      src/core/client_channel/dynamic_filters.h
  38. 4
      src/core/client_channel/global_subchannel_pool.cc
  39. 8
      src/core/client_channel/global_subchannel_pool.h
  40. 2
      src/core/client_channel/http_proxy_mapper.cc
  41. 6
      src/core/client_channel/http_proxy_mapper.h
  42. 4
      src/core/client_channel/local_subchannel_pool.cc
  43. 8
      src/core/client_channel/local_subchannel_pool.h
  44. 10
      src/core/client_channel/retry_filter.cc
  45. 12
      src/core/client_channel/retry_filter.h
  46. 8
      src/core/client_channel/retry_filter_legacy_call_data.cc
  47. 14
      src/core/client_channel/retry_filter_legacy_call_data.h
  48. 2
      src/core/client_channel/retry_service_config.cc
  49. 6
      src/core/client_channel/retry_service_config.h
  50. 2
      src/core/client_channel/retry_throttle.cc
  51. 6
      src/core/client_channel/retry_throttle.h
  52. 0
      src/core/client_channel/service_config_channel_arg_filter.cc
  53. 4
      src/core/client_channel/subchannel.cc
  54. 12
      src/core/client_channel/subchannel.h
  55. 8
      src/core/client_channel/subchannel_interface_internal.h
  56. 2
      src/core/client_channel/subchannel_pool_interface.cc
  57. 6
      src/core/client_channel/subchannel_pool_interface.h
  58. 2
      src/core/client_channel/subchannel_stream_client.cc
  59. 8
      src/core/client_channel/subchannel_stream_client.h
  60. 2
      src/core/ext/filters/logging/logging_filter.cc
  61. 4
      src/core/ext/transport/binder/client/binder_connector.cc
  62. 4
      src/core/ext/transport/binder/client/binder_connector.h
  63. 2
      src/core/ext/transport/binder/client/channel_create.cc
  64. 2
      src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
  65. 8
      src/core/ext/transport/chttp2/client/chttp2_connector.cc
  66. 2
      src/core/ext/transport/chttp2/client/chttp2_connector.h
  67. 2
      src/core/ext/xds/xds_transport_grpc.cc
  68. 2
      src/core/lib/security/security_connector/local/local_security_connector.cc
  69. 2
      src/core/lib/surface/init.cc
  70. 7
      src/core/lib/transport/call_filters.h
  71. 6
      src/core/lib/transport/metadata_batch.cc
  72. 2
      src/core/load_balancing/grpclb/grpclb.cc
  73. 8
      src/core/load_balancing/health_check_client.cc
  74. 6
      src/core/load_balancing/health_check_client_internal.h
  75. 8
      src/core/load_balancing/oob_backend_metric.cc
  76. 6
      src/core/load_balancing/oob_backend_metric_internal.h
  77. 2
      src/core/load_balancing/outlier_detection/outlier_detection.cc
  78. 2
      src/core/load_balancing/ring_hash/ring_hash.cc
  79. 2
      src/core/load_balancing/rls/rls.cc
  80. 2
      src/core/load_balancing/xds/xds_cluster_impl.cc
  81. 2
      src/core/load_balancing/xds/xds_cluster_manager.cc
  82. 2
      src/core/load_balancing/xds/xds_override_host.cc
  83. 4
      src/core/resolver/xds/xds_resolver.cc
  84. 1
      src/cpp/ext/csm/BUILD
  85. 7
      src/cpp/ext/csm/csm_observability.cc
  86. 2
      src/cpp/ext/otel/otel_client_filter.cc
  87. 2
      src/cpp/ext/otel/otel_plugin.cc
  88. 1039
      src/objective-c/BoringSSL-GRPC.podspec
  89. 42
      src/python/grpcio/grpc_core_dependencies.py
  90. 6
      src/python/grpcio_observability/make_grpcio_observability.py
  91. 2
      templates/gRPC-Core.podspec.template
  92. 2
      templates/src/objective-c/BoringSSL-GRPC.podspec.template
  93. 109
      test/core/bad_client/tests/simple_request.cc
  94. 13
      test/core/bad_client/tests/simple_request_text_html_content_type.headers
  95. 2
      test/core/client_channel/client_channel_service_config_test.cc
  96. 5
      test/core/client_channel/client_channel_test.cc
  97. 2
      test/core/client_channel/http_proxy_mapper_test.cc
  98. 6
      test/core/client_channel/lb_policy/lb_policy_test_lib.h
  99. 2
      test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
  100. 2
      test/core/client_channel/retry_service_config_test.cc
  101. Some files were not shown because too many files have changed in this diff Show More

84
BUILD
Unescape View File

@ -3002,52 +3002,52 @@ grpc_cc_library(
grpc_cc_library( grpc_cc_library(
name = "grpc_client_channel", name = "grpc_client_channel",
srcs = [ srcs = [
"//src/core:ext/filters/client_channel/backend_metric.cc", "//src/core:client_channel/backend_metric.cc",
"//src/core:ext/filters/client_channel/backup_poller.cc", "//src/core:client_channel/backup_poller.cc",
"//src/core:ext/filters/client_channel/channel_connectivity.cc", "//src/core:client_channel/channel_connectivity.cc",
"//src/core:ext/filters/client_channel/client_channel.cc", "//src/core:client_channel/client_channel_channelz.cc",
"//src/core:ext/filters/client_channel/client_channel_channelz.cc", "//src/core:client_channel/client_channel_factory.cc",
"//src/core:ext/filters/client_channel/client_channel_factory.cc", "//src/core:client_channel/client_channel_filter.cc",
"//src/core:ext/filters/client_channel/client_channel_plugin.cc", "//src/core:client_channel/client_channel_plugin.cc",
"//src/core:ext/filters/client_channel/client_channel_service_config.cc", "//src/core:client_channel/client_channel_service_config.cc",
"//src/core:ext/filters/client_channel/config_selector.cc", "//src/core:client_channel/config_selector.cc",
"//src/core:ext/filters/client_channel/dynamic_filters.cc", "//src/core:client_channel/dynamic_filters.cc",
"//src/core:ext/filters/client_channel/global_subchannel_pool.cc", "//src/core:client_channel/global_subchannel_pool.cc",
"//src/core:ext/filters/client_channel/http_proxy_mapper.cc", "//src/core:client_channel/http_proxy_mapper.cc",
"//src/core:ext/filters/client_channel/local_subchannel_pool.cc", "//src/core:client_channel/local_subchannel_pool.cc",
"//src/core:ext/filters/client_channel/retry_filter.cc", "//src/core:client_channel/retry_filter.cc",
"//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.cc", "//src/core:client_channel/retry_filter_legacy_call_data.cc",
"//src/core:ext/filters/client_channel/retry_service_config.cc", "//src/core:client_channel/retry_service_config.cc",
"//src/core:ext/filters/client_channel/retry_throttle.cc", "//src/core:client_channel/retry_throttle.cc",
"//src/core:ext/filters/client_channel/service_config_channel_arg_filter.cc", "//src/core:client_channel/service_config_channel_arg_filter.cc",
"//src/core:ext/filters/client_channel/subchannel.cc", "//src/core:client_channel/subchannel.cc",
"//src/core:ext/filters/client_channel/subchannel_pool_interface.cc", "//src/core:client_channel/subchannel_pool_interface.cc",
"//src/core:ext/filters/client_channel/subchannel_stream_client.cc", "//src/core:client_channel/subchannel_stream_client.cc",
"//src/core:load_balancing/child_policy_handler.cc", "//src/core:load_balancing/child_policy_handler.cc",
"//src/core:load_balancing/oob_backend_metric.cc", "//src/core:load_balancing/oob_backend_metric.cc",
], ],
hdrs = [ hdrs = [
"//src/core:ext/filters/client_channel/backend_metric.h", "//src/core:client_channel/backend_metric.h",
"//src/core:ext/filters/client_channel/backup_poller.h", "//src/core:client_channel/backup_poller.h",
"//src/core:ext/filters/client_channel/client_channel.h", "//src/core:client_channel/client_channel_channelz.h",
"//src/core:ext/filters/client_channel/client_channel_channelz.h", "//src/core:client_channel/client_channel_factory.h",
"//src/core:ext/filters/client_channel/client_channel_factory.h", "//src/core:client_channel/client_channel_filter.h",
"//src/core:ext/filters/client_channel/client_channel_internal.h", "//src/core:client_channel/client_channel_internal.h",
"//src/core:ext/filters/client_channel/client_channel_service_config.h", "//src/core:client_channel/client_channel_service_config.h",
"//src/core:ext/filters/client_channel/config_selector.h", "//src/core:client_channel/config_selector.h",
"//src/core:ext/filters/client_channel/connector.h", "//src/core:client_channel/connector.h",
"//src/core:ext/filters/client_channel/dynamic_filters.h", "//src/core:client_channel/dynamic_filters.h",
"//src/core:ext/filters/client_channel/global_subchannel_pool.h", "//src/core:client_channel/global_subchannel_pool.h",
"//src/core:ext/filters/client_channel/http_proxy_mapper.h", "//src/core:client_channel/http_proxy_mapper.h",
"//src/core:ext/filters/client_channel/local_subchannel_pool.h", "//src/core:client_channel/local_subchannel_pool.h",
"//src/core:ext/filters/client_channel/retry_filter.h", "//src/core:client_channel/retry_filter.h",
"//src/core:ext/filters/client_channel/retry_filter_legacy_call_data.h", "//src/core:client_channel/retry_filter_legacy_call_data.h",
"//src/core:ext/filters/client_channel/retry_service_config.h", "//src/core:client_channel/retry_service_config.h",
"//src/core:ext/filters/client_channel/retry_throttle.h", "//src/core:client_channel/retry_throttle.h",
"//src/core:ext/filters/client_channel/subchannel.h", "//src/core:client_channel/subchannel.h",
"//src/core:ext/filters/client_channel/subchannel_interface_internal.h", "//src/core:client_channel/subchannel_interface_internal.h",
"//src/core:ext/filters/client_channel/subchannel_pool_interface.h", "//src/core:client_channel/subchannel_pool_interface.h",
"//src/core:ext/filters/client_channel/subchannel_stream_client.h", "//src/core:client_channel/subchannel_stream_client.h",
"//src/core:load_balancing/child_policy_handler.h", "//src/core:load_balancing/child_policy_handler.h",
"//src/core:load_balancing/oob_backend_metric.h", "//src/core:load_balancing/oob_backend_metric.h",
"//src/core:load_balancing/oob_backend_metric_internal.h", "//src/core:load_balancing/oob_backend_metric_internal.h",

84
CMakeLists.txt generated
Unescape View File

@ -1777,32 +1777,32 @@ endif()
add_library(grpc add_library(grpc
src/core/client_channel/backend_metric.cc
src/core/client_channel/backup_poller.cc
src/core/client_channel/channel_connectivity.cc
src/core/client_channel/client_channel_channelz.cc
src/core/client_channel/client_channel_factory.cc
src/core/client_channel/client_channel_filter.cc
src/core/client_channel/client_channel_plugin.cc
src/core/client_channel/client_channel_service_config.cc
src/core/client_channel/config_selector.cc
src/core/client_channel/dynamic_filters.cc
src/core/client_channel/global_subchannel_pool.cc
src/core/client_channel/http_proxy_mapper.cc
src/core/client_channel/local_subchannel_pool.cc
src/core/client_channel/retry_filter.cc
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
src/core/ext/filters/backend_metrics/backend_metric_filter.cc src/core/ext/filters/backend_metrics/backend_metric_filter.cc
src/core/ext/filters/census/grpc_context.cc src/core/ext/filters/census/grpc_context.cc
src/core/ext/filters/channel_idle/channel_idle_filter.cc src/core/ext/filters/channel_idle/channel_idle_filter.cc
src/core/ext/filters/channel_idle/idle_filter_state.cc src/core/ext/filters/channel_idle/idle_filter_state.cc
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
src/core/ext/filters/client_channel/backend_metric.cc
src/core/ext/filters/client_channel/backup_poller.cc
src/core/ext/filters/client_channel/channel_connectivity.cc
src/core/ext/filters/client_channel/client_channel.cc
src/core/ext/filters/client_channel/client_channel_channelz.cc
src/core/ext/filters/client_channel/client_channel_factory.cc
src/core/ext/filters/client_channel/client_channel_plugin.cc
src/core/ext/filters/client_channel/client_channel_service_config.cc
src/core/ext/filters/client_channel/config_selector.cc
src/core/ext/filters/client_channel/dynamic_filters.cc
src/core/ext/filters/client_channel/global_subchannel_pool.cc
src/core/ext/filters/client_channel/http_proxy_mapper.cc
src/core/ext/filters/client_channel/local_subchannel_pool.cc
src/core/ext/filters/client_channel/retry_filter.cc
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
src/core/ext/filters/client_channel/retry_service_config.cc
src/core/ext/filters/client_channel/retry_throttle.cc
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
src/core/ext/filters/client_channel/subchannel.cc
src/core/ext/filters/client_channel/subchannel_pool_interface.cc
src/core/ext/filters/client_channel/subchannel_stream_client.cc
src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/filters/deadline/deadline_filter.cc
src/core/ext/filters/fault_injection/fault_injection_filter.cc src/core/ext/filters/fault_injection/fault_injection_filter.cc
src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
@ -2875,32 +2875,32 @@ endif()
add_library(grpc_unsecure add_library(grpc_unsecure
src/core/client_channel/backend_metric.cc
src/core/client_channel/backup_poller.cc
src/core/client_channel/channel_connectivity.cc
src/core/client_channel/client_channel_channelz.cc
src/core/client_channel/client_channel_factory.cc
src/core/client_channel/client_channel_filter.cc
src/core/client_channel/client_channel_plugin.cc
src/core/client_channel/client_channel_service_config.cc
src/core/client_channel/config_selector.cc
src/core/client_channel/dynamic_filters.cc
src/core/client_channel/global_subchannel_pool.cc
src/core/client_channel/http_proxy_mapper.cc
src/core/client_channel/local_subchannel_pool.cc
src/core/client_channel/retry_filter.cc
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
src/core/ext/filters/backend_metrics/backend_metric_filter.cc src/core/ext/filters/backend_metrics/backend_metric_filter.cc
src/core/ext/filters/census/grpc_context.cc src/core/ext/filters/census/grpc_context.cc
src/core/ext/filters/channel_idle/channel_idle_filter.cc src/core/ext/filters/channel_idle/channel_idle_filter.cc
src/core/ext/filters/channel_idle/idle_filter_state.cc src/core/ext/filters/channel_idle/idle_filter_state.cc
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
src/core/ext/filters/client_channel/backend_metric.cc
src/core/ext/filters/client_channel/backup_poller.cc
src/core/ext/filters/client_channel/channel_connectivity.cc
src/core/ext/filters/client_channel/client_channel.cc
src/core/ext/filters/client_channel/client_channel_channelz.cc
src/core/ext/filters/client_channel/client_channel_factory.cc
src/core/ext/filters/client_channel/client_channel_plugin.cc
src/core/ext/filters/client_channel/client_channel_service_config.cc
src/core/ext/filters/client_channel/config_selector.cc
src/core/ext/filters/client_channel/dynamic_filters.cc
src/core/ext/filters/client_channel/global_subchannel_pool.cc
src/core/ext/filters/client_channel/http_proxy_mapper.cc
src/core/ext/filters/client_channel/local_subchannel_pool.cc
src/core/ext/filters/client_channel/retry_filter.cc
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
src/core/ext/filters/client_channel/retry_service_config.cc
src/core/ext/filters/client_channel/retry_throttle.cc
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
src/core/ext/filters/client_channel/subchannel.cc
src/core/ext/filters/client_channel/subchannel_pool_interface.cc
src/core/ext/filters/client_channel/subchannel_stream_client.cc
src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/filters/deadline/deadline_filter.cc
src/core/ext/filters/fault_injection/fault_injection_filter.cc src/core/ext/filters/fault_injection/fault_injection_filter.cc
src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc

84
Makefile generated
Unescape View File

@ -959,32 +959,32 @@ endif
# deps: ['upb_json_lib', 'upb_textformat_lib', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting'] # deps: ['upb_json_lib', 'upb_textformat_lib', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb_textformat_lib', 'upb_json_lib', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib', 'libssl'] # transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb_textformat_lib', 'upb_json_lib', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib', 'libssl']
LIBGRPC_SRC = \ LIBGRPC_SRC = \
src/core/client_channel/backend_metric.cc \
src/core/client_channel/backup_poller.cc \
src/core/client_channel/channel_connectivity.cc \
src/core/client_channel/client_channel_channelz.cc \
src/core/client_channel/client_channel_factory.cc \
src/core/client_channel/client_channel_filter.cc \
src/core/client_channel/client_channel_plugin.cc \
src/core/client_channel/client_channel_service_config.cc \
src/core/client_channel/config_selector.cc \
src/core/client_channel/dynamic_filters.cc \
src/core/client_channel/global_subchannel_pool.cc \
src/core/client_channel/http_proxy_mapper.cc \
src/core/client_channel/local_subchannel_pool.cc \
src/core/client_channel/retry_filter.cc \
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 \
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
src/core/ext/filters/census/grpc_context.cc \ src/core/ext/filters/census/grpc_context.cc \
src/core/ext/filters/channel_idle/channel_idle_filter.cc \ src/core/ext/filters/channel_idle/channel_idle_filter.cc \
src/core/ext/filters/channel_idle/idle_filter_state.cc \ src/core/ext/filters/channel_idle/idle_filter_state.cc \
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \ src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
src/core/ext/filters/client_channel/backend_metric.cc \
src/core/ext/filters/client_channel/backup_poller.cc \
src/core/ext/filters/client_channel/channel_connectivity.cc \
src/core/ext/filters/client_channel/client_channel.cc \
src/core/ext/filters/client_channel/client_channel_channelz.cc \
src/core/ext/filters/client_channel/client_channel_factory.cc \
src/core/ext/filters/client_channel/client_channel_plugin.cc \
src/core/ext/filters/client_channel/client_channel_service_config.cc \
src/core/ext/filters/client_channel/config_selector.cc \
src/core/ext/filters/client_channel/dynamic_filters.cc \
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
src/core/ext/filters/client_channel/retry_throttle.cc \
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc \
src/core/ext/filters/client_channel/subchannel.cc \
src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
src/core/ext/filters/client_channel/subchannel_stream_client.cc \
src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/filters/deadline/deadline_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_filter.cc \ src/core/ext/filters/fault_injection/fault_injection_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \ src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \
@ -1891,32 +1891,32 @@ endif
# deps: ['upb_message_lib', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting'] # deps: ['upb_message_lib', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib'] # transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib']
LIBGRPC_UNSECURE_SRC = \ LIBGRPC_UNSECURE_SRC = \
src/core/client_channel/backend_metric.cc \
src/core/client_channel/backup_poller.cc \
src/core/client_channel/channel_connectivity.cc \
src/core/client_channel/client_channel_channelz.cc \
src/core/client_channel/client_channel_factory.cc \
src/core/client_channel/client_channel_filter.cc \
src/core/client_channel/client_channel_plugin.cc \
src/core/client_channel/client_channel_service_config.cc \
src/core/client_channel/config_selector.cc \
src/core/client_channel/dynamic_filters.cc \
src/core/client_channel/global_subchannel_pool.cc \
src/core/client_channel/http_proxy_mapper.cc \
src/core/client_channel/local_subchannel_pool.cc \
src/core/client_channel/retry_filter.cc \
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 \
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
src/core/ext/filters/census/grpc_context.cc \ src/core/ext/filters/census/grpc_context.cc \
src/core/ext/filters/channel_idle/channel_idle_filter.cc \ src/core/ext/filters/channel_idle/channel_idle_filter.cc \
src/core/ext/filters/channel_idle/idle_filter_state.cc \ src/core/ext/filters/channel_idle/idle_filter_state.cc \
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \ src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
src/core/ext/filters/client_channel/backend_metric.cc \
src/core/ext/filters/client_channel/backup_poller.cc \
src/core/ext/filters/client_channel/channel_connectivity.cc \
src/core/ext/filters/client_channel/client_channel.cc \
src/core/ext/filters/client_channel/client_channel_channelz.cc \
src/core/ext/filters/client_channel/client_channel_factory.cc \
src/core/ext/filters/client_channel/client_channel_plugin.cc \
src/core/ext/filters/client_channel/client_channel_service_config.cc \
src/core/ext/filters/client_channel/config_selector.cc \
src/core/ext/filters/client_channel/dynamic_filters.cc \
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
src/core/ext/filters/client_channel/retry_throttle.cc \
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc \
src/core/ext/filters/client_channel/subchannel.cc \
src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
src/core/ext/filters/client_channel/subchannel_stream_client.cc \
src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/filters/deadline/deadline_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_filter.cc \ src/core/ext/filters/fault_injection/fault_injection_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \ src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \

84
Package.swift generated
Unescape View File

@ -115,6 +115,48 @@ let package = Package(
"include/grpc/support/thd_id.h", "include/grpc/support/thd_id.h",
"include/grpc/support/time.h", "include/grpc/support/time.h",
"include/grpc/support/workaround_list.h", "include/grpc/support/workaround_list.h",
"src/core/client_channel/backend_metric.cc",
"src/core/client_channel/backend_metric.h",
"src/core/client_channel/backup_poller.cc",
"src/core/client_channel/backup_poller.h",
"src/core/client_channel/channel_connectivity.cc",
"src/core/client_channel/client_channel_channelz.cc",
"src/core/client_channel/client_channel_channelz.h",
"src/core/client_channel/client_channel_factory.cc",
"src/core/client_channel/client_channel_factory.h",
"src/core/client_channel/client_channel_filter.cc",
"src/core/client_channel/client_channel_filter.h",
"src/core/client_channel/client_channel_internal.h",
"src/core/client_channel/client_channel_plugin.cc",
"src/core/client_channel/client_channel_service_config.cc",
"src/core/client_channel/client_channel_service_config.h",
"src/core/client_channel/config_selector.cc",
"src/core/client_channel/config_selector.h",
"src/core/client_channel/connector.h",
"src/core/client_channel/dynamic_filters.cc",
"src/core/client_channel/dynamic_filters.h",
"src/core/client_channel/global_subchannel_pool.cc",
"src/core/client_channel/global_subchannel_pool.h",
"src/core/client_channel/http_proxy_mapper.cc",
"src/core/client_channel/http_proxy_mapper.h",
"src/core/client_channel/local_subchannel_pool.cc",
"src/core/client_channel/local_subchannel_pool.h",
"src/core/client_channel/retry_filter.cc",
"src/core/client_channel/retry_filter.h",
"src/core/client_channel/retry_filter_legacy_call_data.cc",
"src/core/client_channel/retry_filter_legacy_call_data.h",
"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",
"src/core/client_channel/subchannel_pool_interface.cc",
"src/core/client_channel/subchannel_pool_interface.h",
"src/core/client_channel/subchannel_stream_client.cc",
"src/core/client_channel/subchannel_stream_client.h",
"src/core/ext/filters/backend_metrics/backend_metric_filter.cc", "src/core/ext/filters/backend_metrics/backend_metric_filter.cc",
"src/core/ext/filters/backend_metrics/backend_metric_filter.h", "src/core/ext/filters/backend_metrics/backend_metric_filter.h",
"src/core/ext/filters/backend_metrics/backend_metric_provider.h", "src/core/ext/filters/backend_metrics/backend_metric_provider.h",
@ -125,48 +167,6 @@ let package = Package(
"src/core/ext/filters/channel_idle/idle_filter_state.h", "src/core/ext/filters/channel_idle/idle_filter_state.h",
"src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc", "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc",
"src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h", "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h",
"src/core/ext/filters/client_channel/backend_metric.cc",
"src/core/ext/filters/client_channel/backend_metric.h",
"src/core/ext/filters/client_channel/backup_poller.cc",
"src/core/ext/filters/client_channel/backup_poller.h",
"src/core/ext/filters/client_channel/channel_connectivity.cc",
"src/core/ext/filters/client_channel/client_channel.cc",
"src/core/ext/filters/client_channel/client_channel.h",
"src/core/ext/filters/client_channel/client_channel_channelz.cc",
"src/core/ext/filters/client_channel/client_channel_channelz.h",
"src/core/ext/filters/client_channel/client_channel_factory.cc",
"src/core/ext/filters/client_channel/client_channel_factory.h",
"src/core/ext/filters/client_channel/client_channel_internal.h",
"src/core/ext/filters/client_channel/client_channel_plugin.cc",
"src/core/ext/filters/client_channel/client_channel_service_config.cc",
"src/core/ext/filters/client_channel/client_channel_service_config.h",
"src/core/ext/filters/client_channel/config_selector.cc",
"src/core/ext/filters/client_channel/config_selector.h",
"src/core/ext/filters/client_channel/connector.h",
"src/core/ext/filters/client_channel/dynamic_filters.cc",
"src/core/ext/filters/client_channel/dynamic_filters.h",
"src/core/ext/filters/client_channel/global_subchannel_pool.cc",
"src/core/ext/filters/client_channel/global_subchannel_pool.h",
"src/core/ext/filters/client_channel/http_proxy_mapper.cc",
"src/core/ext/filters/client_channel/http_proxy_mapper.h",
"src/core/ext/filters/client_channel/local_subchannel_pool.cc",
"src/core/ext/filters/client_channel/local_subchannel_pool.h",
"src/core/ext/filters/client_channel/retry_filter.cc",
"src/core/ext/filters/client_channel/retry_filter.h",
"src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc",
"src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h",
"src/core/ext/filters/client_channel/retry_service_config.cc",
"src/core/ext/filters/client_channel/retry_service_config.h",
"src/core/ext/filters/client_channel/retry_throttle.cc",
"src/core/ext/filters/client_channel/retry_throttle.h",
"src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc",
"src/core/ext/filters/client_channel/subchannel.cc",
"src/core/ext/filters/client_channel/subchannel.h",
"src/core/ext/filters/client_channel/subchannel_interface_internal.h",
"src/core/ext/filters/client_channel/subchannel_pool_interface.cc",
"src/core/ext/filters/client_channel/subchannel_pool_interface.h",
"src/core/ext/filters/client_channel/subchannel_stream_client.cc",
"src/core/ext/filters/client_channel/subchannel_stream_client.h",
"src/core/ext/filters/deadline/deadline_filter.cc", "src/core/ext/filters/deadline/deadline_filter.cc",
"src/core/ext/filters/deadline/deadline_filter.h", "src/core/ext/filters/deadline/deadline_filter.h",
"src/core/ext/filters/fault_injection/fault_injection_filter.cc", "src/core/ext/filters/fault_injection/fault_injection_filter.cc",

8
bazel/grpc_deps.bzl
Unescape View File

@ -240,11 +240,11 @@ def grpc_deps():
name = "boringssl", name = "boringssl",
# Use github mirror instead of https://boringssl.googlesource.com/boringssl # Use github mirror instead of https://boringssl.googlesource.com/boringssl
# to obtain a boringssl archive with consistent sha256 # to obtain a boringssl archive with consistent sha256
sha256 = "c21ac7356f885189959b7f8b3df5fcc65e54098bfae323396fbb467205c64030", sha256 = "057f662b0e85931a84945b2e89ba201fd44b0583da827c948fe443593690fb83",
strip_prefix = "boringssl-311e6f6d8e77da1f64c3256b30bd1992a555ce6c", strip_prefix = "boringssl-ae72a4514c7afd150596b0a80947f3ca9b8363b5",
urls = [ urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz", "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
"https://github.com/google/boringssl/archive/311e6f6d8e77da1f64c3256b30bd1992a555ce6c.tar.gz", "https://github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
], ],
) )

168
build_autogenerated.yaml generated
Unescape View File

@ -217,32 +217,32 @@ libs:
- include/grpc/support/time.h - include/grpc/support/time.h
- include/grpc/support/workaround_list.h - include/grpc/support/workaround_list.h
headers: headers:
- src/core/client_channel/backend_metric.h
- src/core/client_channel/backup_poller.h
- src/core/client_channel/client_channel_channelz.h
- src/core/client_channel/client_channel_factory.h
- src/core/client_channel/client_channel_filter.h
- src/core/client_channel/client_channel_internal.h
- src/core/client_channel/client_channel_service_config.h
- src/core/client_channel/config_selector.h
- src/core/client_channel/connector.h
- src/core/client_channel/dynamic_filters.h
- src/core/client_channel/global_subchannel_pool.h
- src/core/client_channel/http_proxy_mapper.h
- src/core/client_channel/local_subchannel_pool.h
- src/core/client_channel/retry_filter.h
- src/core/client_channel/retry_filter_legacy_call_data.h
- src/core/client_channel/retry_service_config.h
- src/core/client_channel/retry_throttle.h
- src/core/client_channel/subchannel.h
- src/core/client_channel/subchannel_interface_internal.h
- src/core/client_channel/subchannel_pool_interface.h
- src/core/client_channel/subchannel_stream_client.h
- src/core/ext/filters/backend_metrics/backend_metric_filter.h - src/core/ext/filters/backend_metrics/backend_metric_filter.h
- src/core/ext/filters/backend_metrics/backend_metric_provider.h - src/core/ext/filters/backend_metrics/backend_metric_provider.h
- src/core/ext/filters/channel_idle/channel_idle_filter.h - src/core/ext/filters/channel_idle/channel_idle_filter.h
- src/core/ext/filters/channel_idle/idle_filter_state.h - src/core/ext/filters/channel_idle/idle_filter_state.h
- src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
- src/core/ext/filters/client_channel/backend_metric.h
- src/core/ext/filters/client_channel/backup_poller.h
- src/core/ext/filters/client_channel/client_channel.h
- src/core/ext/filters/client_channel/client_channel_channelz.h
- src/core/ext/filters/client_channel/client_channel_factory.h
- src/core/ext/filters/client_channel/client_channel_internal.h
- src/core/ext/filters/client_channel/client_channel_service_config.h
- src/core/ext/filters/client_channel/config_selector.h
- src/core/ext/filters/client_channel/connector.h
- src/core/ext/filters/client_channel/dynamic_filters.h
- src/core/ext/filters/client_channel/global_subchannel_pool.h
- src/core/ext/filters/client_channel/http_proxy_mapper.h
- src/core/ext/filters/client_channel/local_subchannel_pool.h
- src/core/ext/filters/client_channel/retry_filter.h
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h
- src/core/ext/filters/client_channel/retry_service_config.h
- src/core/ext/filters/client_channel/retry_throttle.h
- src/core/ext/filters/client_channel/subchannel.h
- src/core/ext/filters/client_channel/subchannel_interface_internal.h
- src/core/ext/filters/client_channel/subchannel_pool_interface.h
- src/core/ext/filters/client_channel/subchannel_stream_client.h
- src/core/ext/filters/deadline/deadline_filter.h - src/core/ext/filters/deadline/deadline_filter.h
- src/core/ext/filters/fault_injection/fault_injection_filter.h - src/core/ext/filters/fault_injection/fault_injection_filter.h
- src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h - src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
@ -1234,32 +1234,32 @@ libs:
- third_party/upb/upb/generated_code_support.h - third_party/upb/upb/generated_code_support.h
- third_party/xxhash/xxhash.h - third_party/xxhash/xxhash.h
src: src:
- src/core/client_channel/backend_metric.cc
- src/core/client_channel/backup_poller.cc
- src/core/client_channel/channel_connectivity.cc
- src/core/client_channel/client_channel_channelz.cc
- src/core/client_channel/client_channel_factory.cc
- src/core/client_channel/client_channel_filter.cc
- src/core/client_channel/client_channel_plugin.cc
- src/core/client_channel/client_channel_service_config.cc
- src/core/client_channel/config_selector.cc
- src/core/client_channel/dynamic_filters.cc
- src/core/client_channel/global_subchannel_pool.cc
- src/core/client_channel/http_proxy_mapper.cc
- src/core/client_channel/local_subchannel_pool.cc
- src/core/client_channel/retry_filter.cc
- 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
- src/core/ext/filters/backend_metrics/backend_metric_filter.cc - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
- src/core/ext/filters/census/grpc_context.cc - src/core/ext/filters/census/grpc_context.cc
- src/core/ext/filters/channel_idle/channel_idle_filter.cc - src/core/ext/filters/channel_idle/channel_idle_filter.cc
- src/core/ext/filters/channel_idle/idle_filter_state.cc - src/core/ext/filters/channel_idle/idle_filter_state.cc
- src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
- src/core/ext/filters/client_channel/backend_metric.cc
- src/core/ext/filters/client_channel/backup_poller.cc
- src/core/ext/filters/client_channel/channel_connectivity.cc
- src/core/ext/filters/client_channel/client_channel.cc
- src/core/ext/filters/client_channel/client_channel_channelz.cc
- src/core/ext/filters/client_channel/client_channel_factory.cc
- src/core/ext/filters/client_channel/client_channel_plugin.cc
- src/core/ext/filters/client_channel/client_channel_service_config.cc
- src/core/ext/filters/client_channel/config_selector.cc
- src/core/ext/filters/client_channel/dynamic_filters.cc
- src/core/ext/filters/client_channel/global_subchannel_pool.cc
- src/core/ext/filters/client_channel/http_proxy_mapper.cc
- src/core/ext/filters/client_channel/local_subchannel_pool.cc
- src/core/ext/filters/client_channel/retry_filter.cc
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
- src/core/ext/filters/client_channel/retry_service_config.cc
- src/core/ext/filters/client_channel/retry_throttle.cc
- src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
- src/core/ext/filters/client_channel/subchannel.cc
- src/core/ext/filters/client_channel/subchannel_pool_interface.cc
- src/core/ext/filters/client_channel/subchannel_stream_client.cc
- src/core/ext/filters/deadline/deadline_filter.cc - src/core/ext/filters/deadline/deadline_filter.cc
- src/core/ext/filters/fault_injection/fault_injection_filter.cc - src/core/ext/filters/fault_injection/fault_injection_filter.cc
- src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc - src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
@ -2196,32 +2196,32 @@ libs:
- include/grpc/support/time.h - include/grpc/support/time.h
- include/grpc/support/workaround_list.h - include/grpc/support/workaround_list.h
headers: headers:
- src/core/client_channel/backend_metric.h
- src/core/client_channel/backup_poller.h
- src/core/client_channel/client_channel_channelz.h
- src/core/client_channel/client_channel_factory.h
- src/core/client_channel/client_channel_filter.h
- src/core/client_channel/client_channel_internal.h
- src/core/client_channel/client_channel_service_config.h
- src/core/client_channel/config_selector.h
- src/core/client_channel/connector.h
- src/core/client_channel/dynamic_filters.h
- src/core/client_channel/global_subchannel_pool.h
- src/core/client_channel/http_proxy_mapper.h
- src/core/client_channel/local_subchannel_pool.h
- src/core/client_channel/retry_filter.h
- src/core/client_channel/retry_filter_legacy_call_data.h
- src/core/client_channel/retry_service_config.h
- src/core/client_channel/retry_throttle.h
- src/core/client_channel/subchannel.h
- src/core/client_channel/subchannel_interface_internal.h
- src/core/client_channel/subchannel_pool_interface.h
- src/core/client_channel/subchannel_stream_client.h
- src/core/ext/filters/backend_metrics/backend_metric_filter.h - src/core/ext/filters/backend_metrics/backend_metric_filter.h
- src/core/ext/filters/backend_metrics/backend_metric_provider.h - src/core/ext/filters/backend_metrics/backend_metric_provider.h
- src/core/ext/filters/channel_idle/channel_idle_filter.h - src/core/ext/filters/channel_idle/channel_idle_filter.h
- src/core/ext/filters/channel_idle/idle_filter_state.h - src/core/ext/filters/channel_idle/idle_filter_state.h
- src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
- src/core/ext/filters/client_channel/backend_metric.h
- src/core/ext/filters/client_channel/backup_poller.h
- src/core/ext/filters/client_channel/client_channel.h
- src/core/ext/filters/client_channel/client_channel_channelz.h
- src/core/ext/filters/client_channel/client_channel_factory.h
- src/core/ext/filters/client_channel/client_channel_internal.h
- src/core/ext/filters/client_channel/client_channel_service_config.h
- src/core/ext/filters/client_channel/config_selector.h
- src/core/ext/filters/client_channel/connector.h
- src/core/ext/filters/client_channel/dynamic_filters.h
- src/core/ext/filters/client_channel/global_subchannel_pool.h
- src/core/ext/filters/client_channel/http_proxy_mapper.h
- src/core/ext/filters/client_channel/local_subchannel_pool.h
- src/core/ext/filters/client_channel/retry_filter.h
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h
- src/core/ext/filters/client_channel/retry_service_config.h
- src/core/ext/filters/client_channel/retry_throttle.h
- src/core/ext/filters/client_channel/subchannel.h
- src/core/ext/filters/client_channel/subchannel_interface_internal.h
- src/core/ext/filters/client_channel/subchannel_pool_interface.h
- src/core/ext/filters/client_channel/subchannel_stream_client.h
- src/core/ext/filters/deadline/deadline_filter.h - src/core/ext/filters/deadline/deadline_filter.h
- src/core/ext/filters/fault_injection/fault_injection_filter.h - src/core/ext/filters/fault_injection/fault_injection_filter.h
- src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h - src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
@ -2685,32 +2685,32 @@ libs:
- third_party/upb/upb/wire/reader.h - third_party/upb/upb/wire/reader.h
- third_party/upb/upb/wire/types.h - third_party/upb/upb/wire/types.h
src: src:
- src/core/client_channel/backend_metric.cc
- src/core/client_channel/backup_poller.cc
- src/core/client_channel/channel_connectivity.cc
- src/core/client_channel/client_channel_channelz.cc
- src/core/client_channel/client_channel_factory.cc
- src/core/client_channel/client_channel_filter.cc
- src/core/client_channel/client_channel_plugin.cc
- src/core/client_channel/client_channel_service_config.cc
- src/core/client_channel/config_selector.cc
- src/core/client_channel/dynamic_filters.cc
- src/core/client_channel/global_subchannel_pool.cc
- src/core/client_channel/http_proxy_mapper.cc
- src/core/client_channel/local_subchannel_pool.cc
- src/core/client_channel/retry_filter.cc
- 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
- src/core/ext/filters/backend_metrics/backend_metric_filter.cc - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
- src/core/ext/filters/census/grpc_context.cc - src/core/ext/filters/census/grpc_context.cc
- src/core/ext/filters/channel_idle/channel_idle_filter.cc - src/core/ext/filters/channel_idle/channel_idle_filter.cc
- src/core/ext/filters/channel_idle/idle_filter_state.cc - src/core/ext/filters/channel_idle/idle_filter_state.cc
- src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc - src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
- src/core/ext/filters/client_channel/backend_metric.cc
- src/core/ext/filters/client_channel/backup_poller.cc
- src/core/ext/filters/client_channel/channel_connectivity.cc
- src/core/ext/filters/client_channel/client_channel.cc
- src/core/ext/filters/client_channel/client_channel_channelz.cc
- src/core/ext/filters/client_channel/client_channel_factory.cc
- src/core/ext/filters/client_channel/client_channel_plugin.cc
- src/core/ext/filters/client_channel/client_channel_service_config.cc
- src/core/ext/filters/client_channel/config_selector.cc
- src/core/ext/filters/client_channel/dynamic_filters.cc
- src/core/ext/filters/client_channel/global_subchannel_pool.cc
- src/core/ext/filters/client_channel/http_proxy_mapper.cc
- src/core/ext/filters/client_channel/local_subchannel_pool.cc
- src/core/ext/filters/client_channel/retry_filter.cc
- src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc
- src/core/ext/filters/client_channel/retry_service_config.cc
- src/core/ext/filters/client_channel/retry_throttle.cc
- src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
- src/core/ext/filters/client_channel/subchannel.cc
- src/core/ext/filters/client_channel/subchannel_pool_interface.cc
- src/core/ext/filters/client_channel/subchannel_stream_client.cc
- src/core/ext/filters/deadline/deadline_filter.cc - src/core/ext/filters/deadline/deadline_filter.cc
- src/core/ext/filters/fault_injection/fault_injection_filter.cc - src/core/ext/filters/fault_injection/fault_injection_filter.cc
- src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc - src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc

44
config.m4 generated
Unescape View File

@ -41,32 +41,32 @@ if test "$PHP_GRPC" != "no"; then
PHP_SUBST(GRPC_SHARED_LIBADD) PHP_SUBST(GRPC_SHARED_LIBADD)
PHP_NEW_EXTENSION(grpc, PHP_NEW_EXTENSION(grpc,
src/core/client_channel/backend_metric.cc \
src/core/client_channel/backup_poller.cc \
src/core/client_channel/channel_connectivity.cc \
src/core/client_channel/client_channel_channelz.cc \
src/core/client_channel/client_channel_factory.cc \
src/core/client_channel/client_channel_filter.cc \
src/core/client_channel/client_channel_plugin.cc \
src/core/client_channel/client_channel_service_config.cc \
src/core/client_channel/config_selector.cc \
src/core/client_channel/dynamic_filters.cc \
src/core/client_channel/global_subchannel_pool.cc \
src/core/client_channel/http_proxy_mapper.cc \
src/core/client_channel/local_subchannel_pool.cc \
src/core/client_channel/retry_filter.cc \
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 \
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
src/core/ext/filters/census/grpc_context.cc \ src/core/ext/filters/census/grpc_context.cc \
src/core/ext/filters/channel_idle/channel_idle_filter.cc \ src/core/ext/filters/channel_idle/channel_idle_filter.cc \
src/core/ext/filters/channel_idle/idle_filter_state.cc \ src/core/ext/filters/channel_idle/idle_filter_state.cc \
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \ src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
src/core/ext/filters/client_channel/backend_metric.cc \
src/core/ext/filters/client_channel/backup_poller.cc \
src/core/ext/filters/client_channel/channel_connectivity.cc \
src/core/ext/filters/client_channel/client_channel.cc \
src/core/ext/filters/client_channel/client_channel_channelz.cc \
src/core/ext/filters/client_channel/client_channel_factory.cc \
src/core/ext/filters/client_channel/client_channel_plugin.cc \
src/core/ext/filters/client_channel/client_channel_service_config.cc \
src/core/ext/filters/client_channel/config_selector.cc \
src/core/ext/filters/client_channel/dynamic_filters.cc \
src/core/ext/filters/client_channel/global_subchannel_pool.cc \
src/core/ext/filters/client_channel/http_proxy_mapper.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/retry_filter.cc \
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
src/core/ext/filters/client_channel/retry_service_config.cc \
src/core/ext/filters/client_channel/retry_throttle.cc \
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc \
src/core/ext/filters/client_channel/subchannel.cc \
src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
src/core/ext/filters/client_channel/subchannel_stream_client.cc \
src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/filters/deadline/deadline_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_filter.cc \ src/core/ext/filters/fault_injection/fault_injection_filter.cc \
src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \ src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \
@ -1370,10 +1370,10 @@ if test "$PHP_GRPC" != "no"; then
-DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.62.0dev\""') -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.62.0dev\""')
PHP_ADD_BUILD_DIR($ext_builddir/src/core/client_channel)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/fault_injection) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/fault_injection)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http)

44
config.w32 generated
Unescape View File

@ -6,32 +6,32 @@ ARG_WITH("grpc", "grpc support", "no");
if (PHP_GRPC != "no") { if (PHP_GRPC != "no") {
EXTENSION("grpc", EXTENSION("grpc",
"src\\core\\client_channel\\backend_metric.cc " +
"src\\core\\client_channel\\backup_poller.cc " +
"src\\core\\client_channel\\channel_connectivity.cc " +
"src\\core\\client_channel\\client_channel_channelz.cc " +
"src\\core\\client_channel\\client_channel_factory.cc " +
"src\\core\\client_channel\\client_channel_filter.cc " +
"src\\core\\client_channel\\client_channel_plugin.cc " +
"src\\core\\client_channel\\client_channel_service_config.cc " +
"src\\core\\client_channel\\config_selector.cc " +
"src\\core\\client_channel\\dynamic_filters.cc " +
"src\\core\\client_channel\\global_subchannel_pool.cc " +
"src\\core\\client_channel\\http_proxy_mapper.cc " +
"src\\core\\client_channel\\local_subchannel_pool.cc " +
"src\\core\\client_channel\\retry_filter.cc " +
"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 " +
"src\\core\\ext\\filters\\backend_metrics\\backend_metric_filter.cc " + "src\\core\\ext\\filters\\backend_metrics\\backend_metric_filter.cc " +
"src\\core\\ext\\filters\\census\\grpc_context.cc " + "src\\core\\ext\\filters\\census\\grpc_context.cc " +
"src\\core\\ext\\filters\\channel_idle\\channel_idle_filter.cc " + "src\\core\\ext\\filters\\channel_idle\\channel_idle_filter.cc " +
"src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " + "src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " +
"src\\core\\ext\\filters\\channel_idle\\legacy_channel_idle_filter.cc " + "src\\core\\ext\\filters\\channel_idle\\legacy_channel_idle_filter.cc " +
"src\\core\\ext\\filters\\client_channel\\backend_metric.cc " +
"src\\core\\ext\\filters\\client_channel\\backup_poller.cc " +
"src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +
"src\\core\\ext\\filters\\client_channel\\client_channel.cc " +
"src\\core\\ext\\filters\\client_channel\\client_channel_channelz.cc " +
"src\\core\\ext\\filters\\client_channel\\client_channel_factory.cc " +
"src\\core\\ext\\filters\\client_channel\\client_channel_plugin.cc " +
"src\\core\\ext\\filters\\client_channel\\client_channel_service_config.cc " +
"src\\core\\ext\\filters\\client_channel\\config_selector.cc " +
"src\\core\\ext\\filters\\client_channel\\dynamic_filters.cc " +
"src\\core\\ext\\filters\\client_channel\\global_subchannel_pool.cc " +
"src\\core\\ext\\filters\\client_channel\\http_proxy_mapper.cc " +
"src\\core\\ext\\filters\\client_channel\\local_subchannel_pool.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_filter.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_filter_legacy_call_data.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_service_config.cc " +
"src\\core\\ext\\filters\\client_channel\\retry_throttle.cc " +
"src\\core\\ext\\filters\\client_channel\\service_config_channel_arg_filter.cc " +
"src\\core\\ext\\filters\\client_channel\\subchannel.cc " +
"src\\core\\ext\\filters\\client_channel\\subchannel_pool_interface.cc " +
"src\\core\\ext\\filters\\client_channel\\subchannel_stream_client.cc " +
"src\\core\\ext\\filters\\deadline\\deadline_filter.cc " + "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
"src\\core\\ext\\filters\\fault_injection\\fault_injection_filter.cc " + "src\\core\\ext\\filters\\fault_injection\\fault_injection_filter.cc " +
"src\\core\\ext\\filters\\fault_injection\\fault_injection_service_config_parser.cc " + "src\\core\\ext\\filters\\fault_injection\\fault_injection_service_config_parser.cc " +
@ -1362,12 +1362,12 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc"); FSO.CreateFolder(base_dir+"\\ext\\grpc");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\client_channel");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\backend_metrics"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\backend_metrics");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\census"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\census");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\channel_idle"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\channel_idle");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\deadline"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\deadline");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\fault_injection"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\fault_injection");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http");

88
gRPC-C++.podspec generated
Unescape View File

@ -257,32 +257,32 @@ Pod::Spec.new do |s|
ss.dependency 'abseil/types/variant', abseil_version ss.dependency 'abseil/types/variant', abseil_version
ss.dependency 'abseil/utility/utility', abseil_version ss.dependency 'abseil/utility/utility', abseil_version
ss.source_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', ss.source_files = 'src/core/client_channel/backend_metric.h',
'src/core/client_channel/backup_poller.h',
'src/core/client_channel/client_channel_channelz.h',
'src/core/client_channel/client_channel_factory.h',
'src/core/client_channel/client_channel_filter.h',
'src/core/client_channel/client_channel_internal.h',
'src/core/client_channel/client_channel_service_config.h',
'src/core/client_channel/config_selector.h',
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
'src/core/client_channel/retry_service_config.h',
'src/core/client_channel/retry_throttle.h',
'src/core/client_channel/subchannel.h',
'src/core/client_channel/subchannel_interface_internal.h',
'src/core/client_channel/subchannel_pool_interface.h',
'src/core/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
'src/core/ext/filters/channel_idle/channel_idle_filter.h', 'src/core/ext/filters/channel_idle/channel_idle_filter.h',
'src/core/ext/filters/channel_idle/idle_filter_state.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
'src/core/ext/filters/client_channel/client_channel.h',
'src/core/ext/filters/client_channel/client_channel_channelz.h',
'src/core/ext/filters/client_channel/client_channel_factory.h',
'src/core/ext/filters/client_channel/client_channel_internal.h',
'src/core/ext/filters/client_channel/client_channel_service_config.h',
'src/core/ext/filters/client_channel/config_selector.h',
'src/core/ext/filters/client_channel/connector.h',
'src/core/ext/filters/client_channel/dynamic_filters.h',
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/subchannel.h',
'src/core/ext/filters/client_channel/subchannel_interface_internal.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/deadline/deadline_filter.h', 'src/core/ext/filters/deadline/deadline_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_filter.h', 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h',
@ -1532,32 +1532,32 @@ Pod::Spec.new do |s|
'third_party/zlib/zlib.h', 'third_party/zlib/zlib.h',
'third_party/zlib/zutil.h' 'third_party/zlib/zutil.h'
ss.private_header_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', ss.private_header_files = 'src/core/client_channel/backend_metric.h',
'src/core/client_channel/backup_poller.h',
'src/core/client_channel/client_channel_channelz.h',
'src/core/client_channel/client_channel_factory.h',
'src/core/client_channel/client_channel_filter.h',
'src/core/client_channel/client_channel_internal.h',
'src/core/client_channel/client_channel_service_config.h',
'src/core/client_channel/config_selector.h',
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
'src/core/client_channel/retry_service_config.h',
'src/core/client_channel/retry_throttle.h',
'src/core/client_channel/subchannel.h',
'src/core/client_channel/subchannel_interface_internal.h',
'src/core/client_channel/subchannel_pool_interface.h',
'src/core/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
'src/core/ext/filters/channel_idle/channel_idle_filter.h', 'src/core/ext/filters/channel_idle/channel_idle_filter.h',
'src/core/ext/filters/channel_idle/idle_filter_state.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
'src/core/ext/filters/client_channel/client_channel.h',
'src/core/ext/filters/client_channel/client_channel_channelz.h',
'src/core/ext/filters/client_channel/client_channel_factory.h',
'src/core/ext/filters/client_channel/client_channel_internal.h',
'src/core/ext/filters/client_channel/client_channel_service_config.h',
'src/core/ext/filters/client_channel/config_selector.h',
'src/core/ext/filters/client_channel/connector.h',
'src/core/ext/filters/client_channel/dynamic_filters.h',
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/subchannel.h',
'src/core/ext/filters/client_channel/subchannel_interface_internal.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/deadline/deadline_filter.h', 'src/core/ext/filters/deadline/deadline_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_filter.h', 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h',

132
gRPC-Core.podspec generated
Unescape View File

@ -195,7 +195,7 @@ Pod::Spec.new do |s|
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.33' ss.dependency 'BoringSSL-GRPC', '0.0.32'
ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/algorithm/container', abseil_version
ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/base/config', abseil_version ss.dependency 'abseil/base/config', abseil_version
@ -228,7 +228,49 @@ Pod::Spec.new do |s|
ss.dependency 'abseil/utility/utility', abseil_version ss.dependency 'abseil/utility/utility', abseil_version
ss.compiler_flags = '-DBORINGSSL_PREFIX=GRPC -Wno-unreachable-code -Wno-shorten-64-to-32' ss.compiler_flags = '-DBORINGSSL_PREFIX=GRPC -Wno-unreachable-code -Wno-shorten-64-to-32'
ss.source_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', ss.source_files = 'src/core/client_channel/backend_metric.cc',
'src/core/client_channel/backend_metric.h',
'src/core/client_channel/backup_poller.cc',
'src/core/client_channel/backup_poller.h',
'src/core/client_channel/channel_connectivity.cc',
'src/core/client_channel/client_channel_channelz.cc',
'src/core/client_channel/client_channel_channelz.h',
'src/core/client_channel/client_channel_factory.cc',
'src/core/client_channel/client_channel_factory.h',
'src/core/client_channel/client_channel_filter.cc',
'src/core/client_channel/client_channel_filter.h',
'src/core/client_channel/client_channel_internal.h',
'src/core/client_channel/client_channel_plugin.cc',
'src/core/client_channel/client_channel_service_config.cc',
'src/core/client_channel/client_channel_service_config.h',
'src/core/client_channel/config_selector.cc',
'src/core/client_channel/config_selector.h',
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.cc',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.cc',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.cc',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.cc',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.cc',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.cc',
'src/core/client_channel/retry_filter_legacy_call_data.h',
'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',
'src/core/client_channel/subchannel_pool_interface.cc',
'src/core/client_channel/subchannel_pool_interface.h',
'src/core/client_channel/subchannel_stream_client.cc',
'src/core/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
'src/core/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/census/grpc_context.cc',
@ -238,48 +280,6 @@ Pod::Spec.new do |s|
'src/core/ext/filters/channel_idle/idle_filter_state.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
'src/core/ext/filters/client_channel/backend_metric.cc',
'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.cc',
'src/core/ext/filters/client_channel/backup_poller.h',
'src/core/ext/filters/client_channel/channel_connectivity.cc',
'src/core/ext/filters/client_channel/client_channel.cc',
'src/core/ext/filters/client_channel/client_channel.h',
'src/core/ext/filters/client_channel/client_channel_channelz.cc',
'src/core/ext/filters/client_channel/client_channel_channelz.h',
'src/core/ext/filters/client_channel/client_channel_factory.cc',
'src/core/ext/filters/client_channel/client_channel_factory.h',
'src/core/ext/filters/client_channel/client_channel_internal.h',
'src/core/ext/filters/client_channel/client_channel_plugin.cc',
'src/core/ext/filters/client_channel/client_channel_service_config.cc',
'src/core/ext/filters/client_channel/client_channel_service_config.h',
'src/core/ext/filters/client_channel/config_selector.cc',
'src/core/ext/filters/client_channel/config_selector.h',
'src/core/ext/filters/client_channel/connector.h',
'src/core/ext/filters/client_channel/dynamic_filters.cc',
'src/core/ext/filters/client_channel/dynamic_filters.h',
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc',
'src/core/ext/filters/client_channel/subchannel.cc',
'src/core/ext/filters/client_channel/subchannel.h',
'src/core/ext/filters/client_channel/subchannel_interface_internal.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/client_channel/subchannel_stream_client.cc',
'src/core/ext/filters/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/filters/deadline/deadline_filter.cc',
'src/core/ext/filters/deadline/deadline_filter.h', 'src/core/ext/filters/deadline/deadline_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
@ -2333,32 +2333,32 @@ Pod::Spec.new do |s|
'third_party/zlib/zlib.h', 'third_party/zlib/zlib.h',
'third_party/zlib/zutil.c', 'third_party/zlib/zutil.c',
'third_party/zlib/zutil.h' 'third_party/zlib/zutil.h'
ss.private_header_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', ss.private_header_files = 'src/core/client_channel/backend_metric.h',
'src/core/client_channel/backup_poller.h',
'src/core/client_channel/client_channel_channelz.h',
'src/core/client_channel/client_channel_factory.h',
'src/core/client_channel/client_channel_filter.h',
'src/core/client_channel/client_channel_internal.h',
'src/core/client_channel/client_channel_service_config.h',
'src/core/client_channel/config_selector.h',
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
'src/core/client_channel/retry_service_config.h',
'src/core/client_channel/retry_throttle.h',
'src/core/client_channel/subchannel.h',
'src/core/client_channel/subchannel_interface_internal.h',
'src/core/client_channel/subchannel_pool_interface.h',
'src/core/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/backend_metrics/backend_metric_filter.h',
'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h',
'src/core/ext/filters/channel_idle/channel_idle_filter.h', 'src/core/ext/filters/channel_idle/channel_idle_filter.h',
'src/core/ext/filters/channel_idle/idle_filter_state.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h',
'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
'src/core/ext/filters/client_channel/client_channel.h',
'src/core/ext/filters/client_channel/client_channel_channelz.h',
'src/core/ext/filters/client_channel/client_channel_factory.h',
'src/core/ext/filters/client_channel/client_channel_internal.h',
'src/core/ext/filters/client_channel/client_channel_service_config.h',
'src/core/ext/filters/client_channel/config_selector.h',
'src/core/ext/filters/client_channel/connector.h',
'src/core/ext/filters/client_channel/dynamic_filters.h',
'src/core/ext/filters/client_channel/global_subchannel_pool.h',
'src/core/ext/filters/client_channel/http_proxy_mapper.h',
'src/core/ext/filters/client_channel/local_subchannel_pool.h',
'src/core/ext/filters/client_channel/retry_filter.h',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h',
'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/subchannel.h',
'src/core/ext/filters/client_channel/subchannel_interface_internal.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/client_channel/subchannel_stream_client.h',
'src/core/ext/filters/deadline/deadline_filter.h', 'src/core/ext/filters/deadline/deadline_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_filter.h', 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h',

84
grpc.gemspec generated
Unescape View File

@ -121,6 +121,48 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/support/thd_id.h ) s.files += %w( include/grpc/support/thd_id.h )
s.files += %w( include/grpc/support/time.h ) s.files += %w( include/grpc/support/time.h )
s.files += %w( include/grpc/support/workaround_list.h ) s.files += %w( include/grpc/support/workaround_list.h )
s.files += %w( src/core/client_channel/backend_metric.cc )
s.files += %w( src/core/client_channel/backend_metric.h )
s.files += %w( src/core/client_channel/backup_poller.cc )
s.files += %w( src/core/client_channel/backup_poller.h )
s.files += %w( src/core/client_channel/channel_connectivity.cc )
s.files += %w( src/core/client_channel/client_channel_channelz.cc )
s.files += %w( src/core/client_channel/client_channel_channelz.h )
s.files += %w( src/core/client_channel/client_channel_factory.cc )
s.files += %w( src/core/client_channel/client_channel_factory.h )
s.files += %w( src/core/client_channel/client_channel_filter.cc )
s.files += %w( src/core/client_channel/client_channel_filter.h )
s.files += %w( src/core/client_channel/client_channel_internal.h )
s.files += %w( src/core/client_channel/client_channel_plugin.cc )
s.files += %w( src/core/client_channel/client_channel_service_config.cc )
s.files += %w( src/core/client_channel/client_channel_service_config.h )
s.files += %w( src/core/client_channel/config_selector.cc )
s.files += %w( src/core/client_channel/config_selector.h )
s.files += %w( src/core/client_channel/connector.h )
s.files += %w( src/core/client_channel/dynamic_filters.cc )
s.files += %w( src/core/client_channel/dynamic_filters.h )
s.files += %w( src/core/client_channel/global_subchannel_pool.cc )
s.files += %w( src/core/client_channel/global_subchannel_pool.h )
s.files += %w( src/core/client_channel/http_proxy_mapper.cc )
s.files += %w( src/core/client_channel/http_proxy_mapper.h )
s.files += %w( src/core/client_channel/local_subchannel_pool.cc )
s.files += %w( src/core/client_channel/local_subchannel_pool.h )
s.files += %w( src/core/client_channel/retry_filter.cc )
s.files += %w( src/core/client_channel/retry_filter.h )
s.files += %w( src/core/client_channel/retry_filter_legacy_call_data.cc )
s.files += %w( src/core/client_channel/retry_filter_legacy_call_data.h )
s.files += %w( src/core/client_channel/retry_service_config.cc )
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 )
s.files += %w( src/core/client_channel/subchannel_pool_interface.cc )
s.files += %w( src/core/client_channel/subchannel_pool_interface.h )
s.files += %w( src/core/client_channel/subchannel_stream_client.cc )
s.files += %w( src/core/client_channel/subchannel_stream_client.h )
s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.cc ) s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.cc )
s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.h ) s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_filter.h )
s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_provider.h ) s.files += %w( src/core/ext/filters/backend_metrics/backend_metric_provider.h )
@ -131,48 +173,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.h ) s.files += %w( src/core/ext/filters/channel_idle/idle_filter_state.h )
s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc ) s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc )
s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h ) s.files += %w( src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h )
s.files += %w( src/core/ext/filters/client_channel/backend_metric.cc )
s.files += %w( src/core/ext/filters/client_channel/backend_metric.h )
s.files += %w( src/core/ext/filters/client_channel/backup_poller.cc )
s.files += %w( src/core/ext/filters/client_channel/backup_poller.h )
s.files += %w( src/core/ext/filters/client_channel/channel_connectivity.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel.h )
s.files += %w( src/core/ext/filters/client_channel/client_channel_channelz.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel_channelz.h )
s.files += %w( src/core/ext/filters/client_channel/client_channel_factory.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel_factory.h )
s.files += %w( src/core/ext/filters/client_channel/client_channel_internal.h )
s.files += %w( src/core/ext/filters/client_channel/client_channel_plugin.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel_service_config.cc )
s.files += %w( src/core/ext/filters/client_channel/client_channel_service_config.h )
s.files += %w( src/core/ext/filters/client_channel/config_selector.cc )
s.files += %w( src/core/ext/filters/client_channel/config_selector.h )
s.files += %w( src/core/ext/filters/client_channel/connector.h )
s.files += %w( src/core/ext/filters/client_channel/dynamic_filters.cc )
s.files += %w( src/core/ext/filters/client_channel/dynamic_filters.h )
s.files += %w( src/core/ext/filters/client_channel/global_subchannel_pool.cc )
s.files += %w( src/core/ext/filters/client_channel/global_subchannel_pool.h )
s.files += %w( src/core/ext/filters/client_channel/http_proxy_mapper.cc )
s.files += %w( src/core/ext/filters/client_channel/http_proxy_mapper.h )
s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.cc )
s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.h )
s.files += %w( src/core/ext/filters/client_channel/retry_filter.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_filter.h )
s.files += %w( src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h )
s.files += %w( src/core/ext/filters/client_channel/retry_service_config.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_service_config.h )
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.h )
s.files += %w( src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc )
s.files += %w( src/core/ext/filters/client_channel/subchannel.cc )
s.files += %w( src/core/ext/filters/client_channel/subchannel.h )
s.files += %w( src/core/ext/filters/client_channel/subchannel_interface_internal.h )
s.files += %w( src/core/ext/filters/client_channel/subchannel_pool_interface.cc )
s.files += %w( src/core/ext/filters/client_channel/subchannel_pool_interface.h )
s.files += %w( src/core/ext/filters/client_channel/subchannel_stream_client.cc )
s.files += %w( src/core/ext/filters/client_channel/subchannel_stream_client.h )
s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc ) s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc )
s.files += %w( src/core/ext/filters/deadline/deadline_filter.h ) s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
s.files += %w( src/core/ext/filters/fault_injection/fault_injection_filter.cc ) s.files += %w( src/core/ext/filters/fault_injection/fault_injection_filter.cc )

84
grpc.gyp generated
Unescape View File

@ -273,32 +273,32 @@
'address_sorting', 'address_sorting',
], ],
'sources': [ 'sources': [
'src/core/client_channel/backend_metric.cc',
'src/core/client_channel/backup_poller.cc',
'src/core/client_channel/channel_connectivity.cc',
'src/core/client_channel/client_channel_channelz.cc',
'src/core/client_channel/client_channel_factory.cc',
'src/core/client_channel/client_channel_filter.cc',
'src/core/client_channel/client_channel_plugin.cc',
'src/core/client_channel/client_channel_service_config.cc',
'src/core/client_channel/config_selector.cc',
'src/core/client_channel/dynamic_filters.cc',
'src/core/client_channel/global_subchannel_pool.cc',
'src/core/client_channel/http_proxy_mapper.cc',
'src/core/client_channel/local_subchannel_pool.cc',
'src/core/client_channel/retry_filter.cc',
'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',
'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
'src/core/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/census/grpc_context.cc',
'src/core/ext/filters/channel_idle/channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
'src/core/ext/filters/channel_idle/idle_filter_state.cc', 'src/core/ext/filters/channel_idle/idle_filter_state.cc',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
'src/core/ext/filters/client_channel/backend_metric.cc',
'src/core/ext/filters/client_channel/backup_poller.cc',
'src/core/ext/filters/client_channel/channel_connectivity.cc',
'src/core/ext/filters/client_channel/client_channel.cc',
'src/core/ext/filters/client_channel/client_channel_channelz.cc',
'src/core/ext/filters/client_channel/client_channel_factory.cc',
'src/core/ext/filters/client_channel/client_channel_plugin.cc',
'src/core/ext/filters/client_channel/client_channel_service_config.cc',
'src/core/ext/filters/client_channel/config_selector.cc',
'src/core/ext/filters/client_channel/dynamic_filters.cc',
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc',
'src/core/ext/filters/client_channel/subchannel.cc',
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_channel/subchannel_stream_client.cc',
'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/filters/deadline/deadline_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc',
@ -1145,32 +1145,32 @@
'address_sorting', 'address_sorting',
], ],
'sources': [ 'sources': [
'src/core/client_channel/backend_metric.cc',
'src/core/client_channel/backup_poller.cc',
'src/core/client_channel/channel_connectivity.cc',
'src/core/client_channel/client_channel_channelz.cc',
'src/core/client_channel/client_channel_factory.cc',
'src/core/client_channel/client_channel_filter.cc',
'src/core/client_channel/client_channel_plugin.cc',
'src/core/client_channel/client_channel_service_config.cc',
'src/core/client_channel/config_selector.cc',
'src/core/client_channel/dynamic_filters.cc',
'src/core/client_channel/global_subchannel_pool.cc',
'src/core/client_channel/http_proxy_mapper.cc',
'src/core/client_channel/local_subchannel_pool.cc',
'src/core/client_channel/retry_filter.cc',
'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',
'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
'src/core/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/census/grpc_context.cc',
'src/core/ext/filters/channel_idle/channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
'src/core/ext/filters/channel_idle/idle_filter_state.cc', 'src/core/ext/filters/channel_idle/idle_filter_state.cc',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
'src/core/ext/filters/client_channel/backend_metric.cc',
'src/core/ext/filters/client_channel/backup_poller.cc',
'src/core/ext/filters/client_channel/channel_connectivity.cc',
'src/core/ext/filters/client_channel/client_channel.cc',
'src/core/ext/filters/client_channel/client_channel_channelz.cc',
'src/core/ext/filters/client_channel/client_channel_factory.cc',
'src/core/ext/filters/client_channel/client_channel_plugin.cc',
'src/core/ext/filters/client_channel/client_channel_service_config.cc',
'src/core/ext/filters/client_channel/config_selector.cc',
'src/core/ext/filters/client_channel/dynamic_filters.cc',
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc',
'src/core/ext/filters/client_channel/subchannel.cc',
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_channel/subchannel_stream_client.cc',
'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/filters/deadline/deadline_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc',

25
include/grpcpp/ext/csm_observability.h
Unescape View File

@ -26,7 +26,7 @@
#include "absl/functional/any_invocable.h" #include "absl/functional/any_invocable.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/metrics/meter_provider.h"
#include <grpcpp/ext/otel_plugin.h> #include <grpcpp/ext/otel_plugin.h>
@ -40,7 +40,15 @@ namespace experimental {
// This is a no-op at present, but in the future, this object would be useful // This is a no-op at present, but in the future, this object would be useful
// for performing cleanup. // for performing cleanup.
class CsmObservability {}; class CsmObservability {
public:
CsmObservability() = default;
// Disable copy constructor and copy-assignment operator.
CsmObservability(const CsmObservability&) = delete;
CsmObservability& operator=(const CsmObservability&) = delete;
CsmObservability(CsmObservability&&) = default;
CsmObservability& operator=(CsmObservability&&) = default;
};
// CsmObservabilityBuilder configures observability for all service mesh traffic // CsmObservabilityBuilder configures observability for all service mesh traffic
// for a binary running on CSM. // for a binary running on CSM.
@ -49,8 +57,7 @@ class CsmObservabilityBuilder {
CsmObservabilityBuilder(); CsmObservabilityBuilder();
~CsmObservabilityBuilder(); ~CsmObservabilityBuilder();
CsmObservabilityBuilder& SetMeterProvider( CsmObservabilityBuilder& SetMeterProvider(
std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider);
meter_provider);
// If set, \a target_attribute_filter is called per channel to decide whether // If set, \a target_attribute_filter is called per channel to decide whether
// to record the target attribute on client or to replace it with "other". // to record the target attribute on client or to replace it with "other".
// This helps reduce the cardinality on metrics in cases where many channels // This helps reduce the cardinality on metrics in cases where many channels
@ -90,16 +97,6 @@ class CsmObservabilityBuilder {
std::unique_ptr<grpc::internal::OpenTelemetryPluginBuilderImpl> builder_; std::unique_ptr<grpc::internal::OpenTelemetryPluginBuilderImpl> builder_;
}; };
/// Creates an OpenTelemetryPluginOption that would add additional labels on
/// gRPC metrics to enhance observability for CSM users.
///
/// Sample Usage -
/// OpenTelemetryPluginBuilder()
/// .SetMeterProvider(provider)
/// .AddPluginOption(MakeCsmOpenTelemetryPluginOption())
/// .BuildAndRegisterGlobal();
std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption();
} // namespace experimental } // namespace experimental
} // namespace grpc } // namespace grpc

84
package.xml generated
Unescape View File

@ -103,6 +103,48 @@
<file baseinstalldir="/" name="include/grpc/support/thd_id.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/thd_id.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/time.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/time.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/workaround_list.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/workaround_list.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/backend_metric.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/backend_metric.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/backup_poller.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/backup_poller.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/channel_connectivity.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_channelz.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_channelz.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_factory.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_internal.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_plugin.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_service_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/client_channel_service_config.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/config_selector.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/config_selector.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/connector.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/dynamic_filters.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/dynamic_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/global_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/global_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/http_proxy_mapper.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/http_proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/local_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/local_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_filter_legacy_call_data.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_filter_legacy_call_data.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_service_config.cc" role="src" />
<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" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel_pool_interface.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel_pool_interface.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel_stream_client.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/subchannel_stream_client.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.cc" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_provider.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/backend_metrics/backend_metric_provider.h" role="src" />
@ -113,48 +155,6 @@
<file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/idle_filter_state.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/backend_metric.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/backend_metric.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/channel_connectivity.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_channelz.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_channelz.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_factory.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_internal.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_plugin.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_service_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_service_config.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/config_selector.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/config_selector.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/connector.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/dynamic_filters.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/dynamic_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/global_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/global_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/http_proxy_mapper.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/http_proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/local_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/local_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_service_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_service_config.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_throttle.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_throttle.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_interface_internal.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_pool_interface.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_pool_interface.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_stream_client.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_stream_client.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.cc" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/fault_injection/fault_injection_filter.cc" role="src" /> <file baseinstalldir="/" name="src/core/ext/filters/fault_injection/fault_injection_filter.cc" role="src" />

7
src/boringssl/boringssl_prefix_symbols.h
Unescape View File

@ -1,4 +1,4 @@
// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 311e6f6d8e77da1f64c3256b30bd1992a555ce6c // generated by generate_boringssl_prefix_header.sh on BoringSSL commit: ae72a4514c7afd150596b0a80947f3ca9b8363b5
// Copyright (c) 2018, Google Inc. // Copyright (c) 2018, Google Inc.
// //
@ -1285,17 +1285,12 @@
#define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x) #define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x)
#define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3) #define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3)
#define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt) #define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt)
#define DES_ecb3_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt_ex)
#define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt) #define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt)
#define DES_ecb_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt_ex)
#define DES_ede2_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede2_cbc_encrypt) #define DES_ede2_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede2_cbc_encrypt)
#define DES_ede3_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt) #define DES_ede3_cbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt)
#define DES_ede3_cbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ede3_cbc_encrypt_ex)
#define DES_encrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_encrypt3) #define DES_encrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_encrypt3)
#define DES_ncbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt) #define DES_ncbc_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt)
#define DES_ncbc_encrypt_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ncbc_encrypt_ex)
#define DES_set_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key) #define DES_set_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key)
#define DES_set_key_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_ex)
#define DES_set_key_unchecked BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_unchecked) #define DES_set_key_unchecked BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_key_unchecked)
#define DES_set_odd_parity BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_odd_parity) #define DES_set_odd_parity BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_set_odd_parity)
#define DH_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DH_bits) #define DH_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DH_bits)

0
src/core/ext/filters/client_channel/.clang-format → src/core/client_channel/.clang-format
Unescape View File

0
src/core/ext/filters/client_channel/README.md → src/core/client_channel/README.md
Unescape View File

2
src/core/ext/filters/client_channel/backend_metric.cc → src/core/client_channel/backend_metric.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/backend_metric.h" #include "src/core/client_channel/backend_metric.h"
#include <string.h> #include <string.h>

6
src/core/ext/filters/client_channel/backend_metric.h → src/core/client_channel/backend_metric.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKEND_METRIC_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_BACKEND_METRIC_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKEND_METRIC_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_BACKEND_METRIC_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -44,4 +44,4 @@ const BackendMetricData* ParseBackendMetricData(
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKEND_METRIC_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_BACKEND_METRIC_H

2
src/core/ext/filters/client_channel/backup_poller.cc → src/core/client_channel/backup_poller.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include <inttypes.h> #include <inttypes.h>

6
src/core/ext/filters/client_channel/backup_poller.h → src/core/client_channel/backup_poller.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_BACKUP_POLLER_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_BACKUP_POLLER_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -34,4 +34,4 @@ void grpc_client_channel_start_backup_polling(
void grpc_client_channel_stop_backup_polling( void grpc_client_channel_stop_backup_polling(
grpc_pollset_set* interested_parties); grpc_pollset_set* interested_parties);
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_BACKUP_POLLER_H

2
src/core/ext/filters/client_channel/channel_connectivity.cc → src/core/client_channel/channel_connectivity.cc
Unescape View File

@ -28,7 +28,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/debug/trace.h" #include "src/core/lib/debug/trace.h"

2
src/core/ext/filters/client_channel/client_channel_channelz.cc → src/core/client_channel/client_channel_channelz.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/client_channel/client_channel_channelz.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"

6
src/core/ext/filters/client_channel/client_channel_channelz.h → src/core/client_channel/client_channel_channelz.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -82,4 +82,4 @@ class SubchannelNode : public BaseNode {
} // namespace channelz } // namespace channelz
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_CHANNELZ_H

2
src/core/ext/filters/client_channel/client_channel_factory.cc → src/core/client_channel/client_channel_factory.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_factory.h"
// Channel arg key for client channel factory. // Channel arg key for client channel factory.
#define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory" #define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory"

8
src/core/ext/filters/client_channel/client_channel_factory.h → src/core/client_channel/client_channel_factory.h
Unescape View File

@ -14,14 +14,14 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/resolved_address.h"
@ -43,4 +43,4 @@ class ClientChannelFactory {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H

26
src/core/ext/filters/client_channel/client_channel.cc → src/core/client_channel/client_channel_filter.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
@ -49,18 +49,18 @@
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/filters/client_channel/backend_metric.h" #include "src/core/client_channel/backend_metric.h"
#include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/client_channel/client_channel_channelz.h"
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/client_channel/client_channel_service_config.h" #include "src/core/client_channel/client_channel_service_config.h"
#include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/client_channel/config_selector.h"
#include "src/core/ext/filters/client_channel/dynamic_filters.h" #include "src/core/client_channel/dynamic_filters.h"
#include "src/core/ext/filters/client_channel/global_subchannel_pool.h" #include "src/core/client_channel/global_subchannel_pool.h"
#include "src/core/ext/filters/client_channel/local_subchannel_pool.h" #include "src/core/client_channel/local_subchannel_pool.h"
#include "src/core/ext/filters/client_channel/retry_filter.h" #include "src/core/client_channel/retry_filter.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/ext/filters/deadline/deadline_filter.h" #include "src/core/ext/filters/deadline/deadline_filter.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"

16
src/core/ext/filters/client_channel/client_channel.h → src/core/client_channel/client_channel_filter.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -37,11 +37,11 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_factory.h"
#include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/client_channel/config_selector.h"
#include "src/core/ext/filters/client_channel/dynamic_filters.h" #include "src/core/client_channel/dynamic_filters.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
@ -628,4 +628,4 @@ class ClientChannelFilter::PromiseBasedLoadBalancedCall
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H

6
src/core/ext/filters/client_channel/client_channel_internal.h → src/core/client_channel/client_channel_internal.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -76,4 +76,4 @@ class ClientChannelServiceConfigCallData : public ServiceConfigCallData {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H

6
src/core/ext/filters/client_channel/client_channel_plugin.cc → src/core/client_channel/client_channel_plugin.cc
Unescape View File

@ -22,9 +22,9 @@
#include <grpc/impl/channel_arg_names.h> #include <grpc/impl/channel_arg_names.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/client_channel/client_channel_service_config.h" #include "src/core/client_channel/client_channel_service_config.h"
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/channel_stack_type.h"

2
src/core/ext/filters/client_channel/client_channel_service_config.cc → src/core/client_channel/client_channel_service_config.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/client_channel_service_config.h" #include "src/core/client_channel/client_channel_service_config.h"
#include <map> #include <map>
#include <utility> #include <utility>

6
src/core/ext/filters/client_channel/client_channel_service_config.h → src/core/client_channel/client_channel_service_config.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -108,4 +108,4 @@ class ClientChannelServiceConfigParser : public ServiceConfigParser::Parser {
} // namespace internal } // namespace internal
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H

2
src/core/ext/filters/client_channel/config_selector.cc → src/core/client_channel/config_selector.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/client_channel/config_selector.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gpr/useful.h"

8
src/core/ext/filters/client_channel/config_selector.h → src/core/client_channel/config_selector.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -30,7 +30,7 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gpr/useful.h"
#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted.h"
@ -122,4 +122,4 @@ class DefaultConfigSelector : public ConfigSelector {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H

6
src/core/ext/filters/client_channel/connector.h → src/core/client_channel/connector.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -84,4 +84,4 @@ class SubchannelConnector : public InternallyRefCounted<SubchannelConnector> {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H

2
src/core/ext/filters/client_channel/dynamic_filters.cc → src/core/client_channel/dynamic_filters.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/dynamic_filters.h" #include "src/core/client_channel/dynamic_filters.h"
#include <stddef.h> #include <stddef.h>

6
src/core/ext/filters/client_channel/dynamic_filters.h → src/core/client_channel/dynamic_filters.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -107,4 +107,4 @@ class DynamicFilters : public RefCounted<DynamicFilters> {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H

4
src/core/ext/filters/client_channel/global_subchannel_pool.cc → src/core/client_channel/global_subchannel_pool.cc
Unescape View File

@ -18,11 +18,11 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/global_subchannel_pool.h" #include "src/core/client_channel/global_subchannel_pool.h"
#include <utility> #include <utility>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
namespace grpc_core { namespace grpc_core {

8
src/core/ext/filters/client_channel/global_subchannel_pool.h → src/core/client_channel/global_subchannel_pool.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -25,7 +25,7 @@
#include "absl/base/thread_annotations.h" #include "absl/base/thread_annotations.h"
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/sync.h"
@ -60,4 +60,4 @@ class GlobalSubchannelPool final : public SubchannelPoolInterface {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H

2
src/core/ext/filters/client_channel/http_proxy_mapper.cc → src/core/client_channel/http_proxy_mapper.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/http_proxy_mapper.h" #include "src/core/client_channel/http_proxy_mapper.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

6
src/core/ext/filters/client_channel/http_proxy_mapper.h → src/core/client_channel/http_proxy_mapper.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -50,4 +50,4 @@ void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H

4
src/core/ext/filters/client_channel/local_subchannel_pool.cc → src/core/client_channel/local_subchannel_pool.cc
Unescape View File

@ -18,13 +18,13 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/local_subchannel_pool.h" #include "src/core/client_channel/local_subchannel_pool.h"
#include <utility> #include <utility>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
namespace grpc_core { namespace grpc_core {

8
src/core/ext/filters/client_channel/local_subchannel_pool.h → src/core/client_channel/local_subchannel_pool.h
Unescape View File

@ -16,14 +16,14 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include <map> #include <map>
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
namespace grpc_core { namespace grpc_core {
@ -56,4 +56,4 @@ class LocalSubchannelPool final : public SubchannelPoolInterface {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H

10
src/core/ext/filters/client_channel/retry_filter.cc → src/core/client_channel/retry_filter.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/retry_filter.h" #include "src/core/client_channel/retry_filter.h"
#include <string> #include <string>
@ -26,10 +26,10 @@
#include <grpc/event_engine/event_engine.h> #include <grpc/event_engine/event_engine.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h" #include "src/core/client_channel/retry_filter_legacy_call_data.h"
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/client_channel/retry_throttle.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/debug/trace.h" #include "src/core/lib/debug/trace.h"

12
src/core/ext/filters/client_channel/retry_filter.h → src/core/client_channel/retry_filter.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -31,9 +31,9 @@
#include <grpc/impl/channel_arg_names.h> #include <grpc/impl/channel_arg_names.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/client_channel/retry_throttle.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
@ -119,4 +119,4 @@ class RetryFilter {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H

8
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc → src/core/client_channel/retry_filter_legacy_call_data.cc
Unescape View File

@ -14,7 +14,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h" #include "src/core/client_channel/retry_filter_legacy_call_data.h"
#include <inttypes.h> #include <inttypes.h>
@ -26,9 +26,9 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/client_channel/retry_throttle.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/context.h" #include "src/core/lib/channel/context.h"

14
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h → src/core/client_channel/retry_filter_legacy_call_data.h
Unescape View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -30,10 +30,10 @@
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/status.h> #include <grpc/status.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/client_channel/retry_filter.h" #include "src/core/client_channel/retry_filter.h"
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/client_channel/retry_throttle.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
@ -440,4 +440,4 @@ class RetryFilter::LegacyCallData {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H

2
src/core/ext/filters/client_channel/retry_service_config.cc → src/core/client_channel/retry_service_config.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include <map> #include <map>
#include <string> #include <string>

6
src/core/ext/filters/client_channel/retry_service_config.h → src/core/client_channel/retry_service_config.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -102,4 +102,4 @@ class RetryServiceConfigParser : public ServiceConfigParser::Parser {
} // namespace internal } // namespace internal
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H

2
src/core/ext/filters/client_channel/retry_throttle.cc → src/core/client_channel/retry_throttle.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/client_channel/retry_throttle.h"
#include <map> #include <map>
#include <string> #include <string>

6
src/core/ext/filters/client_channel/retry_throttle.h → src/core/client_channel/retry_throttle.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_THROTTLE_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_THROTTLE_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -89,4 +89,4 @@ class ServerRetryThrottleMap {
} // namespace internal } // namespace internal
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_THROTTLE_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H

0
src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc → src/core/client_channel/service_config_channel_arg_filter.cc
Unescape View File

4
src/core/ext/filters/client_channel/subchannel.cc → src/core/client_channel/subchannel.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
@ -37,7 +37,7 @@
#include <grpc/status.h> #include <grpc/status.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

12
src/core/ext/filters/client_channel/subchannel.h → src/core/client_channel/subchannel.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -31,9 +31,9 @@
#include <grpc/event_engine/event_engine.h> #include <grpc/event_engine/event_engine.h>
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/client_channel/client_channel_channelz.h"
#include "src/core/ext/filters/client_channel/connector.h" #include "src/core/client_channel/connector.h"
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_fwd.h"
@ -384,4 +384,4 @@ class Subchannel : public DualRefCounted<Subchannel> {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H

8
src/core/ext/filters/client_channel/subchannel_interface_internal.h → src/core/client_channel/subchannel_interface_internal.h
Unescape View File

@ -14,12 +14,12 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/gprpp/unique_type_name.h"
#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/load_balancing/subchannel_interface.h"
@ -38,4 +38,4 @@ class InternalSubchannelDataWatcherInterface
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_INTERFACE_INTERNAL_H

2
src/core/ext/filters/client_channel/subchannel_pool_interface.cc → src/core/client_channel/subchannel_pool_interface.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include <string.h> #include <string.h>

6
src/core/ext/filters/client_channel/subchannel_pool_interface.h → src/core/client_channel/subchannel_pool_interface.h
Unescape View File

@ -16,8 +16,8 @@
// //
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -97,4 +97,4 @@ class SubchannelPoolInterface : public RefCounted<SubchannelPoolInterface> {
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_POOL_INTERFACE_H

2
src/core/ext/filters/client_channel/subchannel_stream_client.cc → src/core/client_channel/subchannel_stream_client.cc
Unescape View File

@ -16,7 +16,7 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/client_channel/subchannel_stream_client.h"
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

8
src/core/ext/filters/client_channel/subchannel_stream_client.h → src/core/client_channel/subchannel_stream_client.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -32,7 +32,7 @@
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/status.h> #include <grpc/status.h>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/context.h" #include "src/core/lib/channel/context.h"
#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/orphanable.h"
@ -222,4 +222,4 @@ class SubchannelStreamClient
} // namespace grpc_core } // namespace grpc_core
#endif // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H #endif // GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H

2
src/core/ext/filters/logging/logging_filter.cc
Unescape View File

@ -47,7 +47,7 @@
#include <grpc/status.h> #include <grpc/status.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/logging/logging_sink.h" #include "src/core/ext/filters/logging/logging_sink.h"
#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

4
src/core/ext/transport/binder/client/binder_connector.cc
Unescape View File

@ -28,8 +28,8 @@
#include <grpcpp/security/binder_security_policy.h> #include <grpcpp/security/binder_security_policy.h>
#include "src/core/ext/filters/client_channel/connector.h" #include "src/core/client_channel/connector.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h" #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
#include "src/core/ext/transport/binder/client/security_policy_setting.h" #include "src/core/ext/transport/binder/client/security_policy_setting.h"
#include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/transport/binder_transport.h"

4
src/core/ext/transport/binder/client/binder_connector.h
Unescape View File

@ -27,8 +27,8 @@
#include <grpcpp/channel.h> #include <grpcpp/channel.h>
#include <grpcpp/support/channel_arguments.h> #include <grpcpp/support/channel_arguments.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_factory.h"
#include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h"
namespace grpc_core { namespace grpc_core {

2
src/core/ext/transport/binder/client/channel_create.cc
Unescape View File

@ -43,7 +43,7 @@
#include <grpcpp/impl/grpc_library.h> #include <grpcpp/impl/grpc_library.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/transport/binder/client/channel_create_impl.h" #include "src/core/ext/transport/binder/client/channel_create_impl.h"
#include "src/core/ext/transport/binder/client/connection_id_generator.h" #include "src/core/ext/transport/binder/client/connection_id_generator.h"
#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h" #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"

2
src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
Unescape View File

@ -26,7 +26,7 @@
#include <grpc/event_engine/event_engine.h> #include <grpc/event_engine/event_engine.h>
#include "src/core/ext/filters/client_channel/connector.h" #include "src/core/client_channel/connector.h"
#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
#include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

8
src/core/ext/transport/chttp2/client/chttp2_connector.cc
Unescape View File

@ -39,10 +39,10 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/sync.h> #include <grpc/support/sync.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_factory.h"
#include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/filters/client_channel/connector.h" #include "src/core/client_channel/connector.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/ext/transport/chttp2/client/chttp2_connector.h
Unescape View File

@ -26,7 +26,7 @@
#include <grpc/event_engine/event_engine.h> #include <grpc/event_engine/event_engine.h>
#include "src/core/ext/filters/client_channel/connector.h" #include "src/core/client_channel/connector.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/closure.h"

2
src/core/ext/xds/xds_transport_grpc.cc
Unescape View File

@ -37,7 +37,7 @@
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/lib/security/security_connector/local/local_security_connector.cc
Unescape View File

@ -37,7 +37,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/lib/surface/init.cc
Unescape View File

@ -29,7 +29,7 @@
#include <grpc/support/sync.h> #include <grpc/support/sync.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/trace.h" #include "src/core/lib/debug/trace.h"
#include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h"

7
src/core/lib/transport/call_filters.h
Unescape View File

@ -491,8 +491,8 @@ struct AddOpImpl<FilterType, T,
// absl::Status $INTERCEPTOR_NAME(const $VALUE_TYPE&, FilterType*) // absl::Status $INTERCEPTOR_NAME(const $VALUE_TYPE&, FilterType*)
template <typename FilterType, typename T, template <typename FilterType, typename T,
absl::Status (FilterType::Call::*impl)(typename T::element_type&, absl::Status (FilterType::Call::*impl)(
FilterType*)> const typename T::element_type&, FilterType*)>
struct AddOpImpl<FilterType, T, struct AddOpImpl<FilterType, T,
absl::Status (FilterType::Call::*)( absl::Status (FilterType::Call::*)(
const typename T::element_type&, FilterType*), const typename T::element_type&, FilterType*),
@ -722,7 +722,8 @@ template <typename FilterType, typename T, typename R,
struct AddOpImpl< struct AddOpImpl<
FilterType, T, FilterType, T,
R (FilterType::Call::*)(typename T::element_type&, FilterType*), impl, R (FilterType::Call::*)(typename T::element_type&, FilterType*), impl,
absl::enable_if_t<std::is_same<absl::Status, PromiseResult<R>>::value>> { absl::enable_if_t<!std::is_same<R, absl::Status>::value &&
std::is_same<absl::Status, PromiseResult<R>>::value>> {
static void Add(FilterType* channel_data, size_t call_offset, static void Add(FilterType* channel_data, size_t call_offset,
Layout<FallibleOperator<T>>& to) { Layout<FallibleOperator<T>>& to) {
class Promise { class Promise {

6
src/core/lib/transport/metadata_batch.cc
Unescape View File

@ -64,7 +64,7 @@ absl::optional<absl::string_view> UnknownMap::GetStringValue(
} // namespace metadata_detail } // namespace metadata_detail
ContentTypeMetadata::MementoType ContentTypeMetadata::ParseMemento( ContentTypeMetadata::MementoType ContentTypeMetadata::ParseMemento(
Slice value, bool, MetadataParseErrorFn on_error) { Slice value, bool, MetadataParseErrorFn /*on_error*/) {
auto out = kInvalid; auto out = kInvalid;
auto value_string = value.as_string_view(); auto value_string = value.as_string_view();
if (value_string == "application/grpc") { if (value_string == "application/grpc") {
@ -76,7 +76,9 @@ ContentTypeMetadata::MementoType ContentTypeMetadata::ParseMemento(
} else if (value_string.empty()) { } else if (value_string.empty()) {
out = kEmpty; out = kEmpty;
} else { } else {
on_error("invalid value", value); // We are intentionally not invoking on_error here since the spec is not
// clear on what the behavior should be here, so to avoid breaking anyone,
// we should continue to accept this.
} }
return out; return out;
} }

2
src/core/load_balancing/grpclb/grpclb.cc
Unescape View File

@ -93,7 +93,7 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

8
src/core/load_balancing/health_check_client.cc
Unescape View File

@ -40,11 +40,11 @@
#include <grpc/status.h> #include <grpc/status.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/client_channel/client_channel_channelz.h"
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/health_check_client_internal.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/client_channel/subchannel_stream_client.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channel_trace.h"

6
src/core/load_balancing/health_check_client_internal.h
Unescape View File

@ -32,9 +32,9 @@
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/client_channel/subchannel_stream_client.h"
#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/sync.h"

8
src/core/load_balancing/oob_backend_metric.cc
Unescape View File

@ -38,11 +38,11 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/filters/client_channel/backend_metric.h" #include "src/core/client_channel/backend_metric.h"
#include "src/core/ext/filters/client_channel/client_channel_channelz.h" #include "src/core/client_channel/client_channel_channelz.h"
#include "src/core/load_balancing/oob_backend_metric_internal.h" #include "src/core/load_balancing/oob_backend_metric_internal.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/client_channel/subchannel_stream_client.h"
#include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channel_trace.h"
#include "src/core/lib/debug/trace.h" #include "src/core/lib/debug/trace.h"
#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/debug_location.h"

6
src/core/load_balancing/oob_backend_metric_internal.h
Unescape View File

@ -30,9 +30,9 @@
#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/oob_backend_metric.h" #include "src/core/load_balancing/oob_backend_metric.h"
#include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/client_channel/subchannel.h"
#include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/ext/filters/client_channel/subchannel_stream_client.h" #include "src/core/client_channel/subchannel_stream_client.h"
#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/sync.h"

2
src/core/load_balancing/outlier_detection/outlier_detection.cc
Unescape View File

@ -46,7 +46,7 @@
#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/health_check_client_internal.h"
#include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/config/core_configuration.h"

2
src/core/load_balancing/ring_hash/ring_hash.cc
Unescape View File

@ -42,7 +42,7 @@
#include <grpc/support/json.h> #include <grpc/support/json.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/load_balancing/pick_first/pick_first.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/load_balancing/rls/rls.cc
Unescape View File

@ -63,7 +63,7 @@
#include <grpc/support/json.h> #include <grpc/support/json.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/backoff/backoff.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
src/core/load_balancing/xds/xds_cluster_impl.cc
Unescape View File

@ -37,7 +37,7 @@
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/backend_metric_data.h"
#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/load_balancing/xds/xds_channel_args.h"

2
src/core/load_balancing/xds/xds_cluster_manager.cc
Unescape View File

@ -38,7 +38,7 @@
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/config/core_configuration.h"

2
src/core/load_balancing/xds/xds_override_host.cc
Unescape View File

@ -47,7 +47,7 @@
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/load_balancing/child_policy_handler.h" #include "src/core/load_balancing/child_policy_handler.h"
#include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
#include "src/core/ext/xds/xds_health_status.h" #include "src/core/ext/xds/xds_health_status.h"

4
src/core/resolver/xds/xds_resolver.cc
Unescape View File

@ -48,8 +48,8 @@
#include <grpc/status.h> #include <grpc/status.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/client_channel/config_selector.h" #include "src/core/client_channel/config_selector.h"
#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client_grpc.h" #include "src/core/ext/xds/xds_client_grpc.h"

1
src/cpp/ext/csm/BUILD
Unescape View File

@ -46,6 +46,7 @@ grpc_cc_library(
"absl/types:optional", "absl/types:optional",
"absl/types:variant", "absl/types:variant",
"google_cloud_cpp:opentelemetry", "google_cloud_cpp:opentelemetry",
"otel/api",
"otel/sdk/src/metrics", "otel/sdk/src/metrics",
"otel/sdk:headers", "otel/sdk:headers",
"upb_base_lib", "upb_base_lib",

7
src/cpp/ext/csm/csm_observability.cc
Unescape View File

@ -107,8 +107,7 @@ CsmObservabilityBuilder::CsmObservabilityBuilder()
CsmObservabilityBuilder::~CsmObservabilityBuilder() = default; CsmObservabilityBuilder::~CsmObservabilityBuilder() = default;
CsmObservabilityBuilder& CsmObservabilityBuilder::SetMeterProvider( CsmObservabilityBuilder& CsmObservabilityBuilder::SetMeterProvider(
std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider) {
meter_provider) {
builder_->SetMeterProvider(meter_provider); builder_->SetMeterProvider(meter_provider);
return *this; return *this;
} }
@ -139,9 +138,5 @@ absl::StatusOr<CsmObservability> CsmObservabilityBuilder::BuildAndRegister() {
return CsmObservability(); return CsmObservability();
} }
std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption() {
return std::make_unique<grpc::internal::CsmOpenTelemetryPluginOption>();
}
} // namespace experimental } // namespace experimental
} // namespace grpc } // namespace grpc

2
src/cpp/ext/otel/otel_client_filter.cc
Unescape View File

@ -44,7 +44,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/context.h" #include "src/core/lib/channel/context.h"
#include "src/core/lib/channel/status_util.h" #include "src/core/lib/channel/status_util.h"

2
src/cpp/ext/otel/otel_plugin.cc
Unescape View File

@ -32,7 +32,7 @@
#include <grpcpp/ext/otel_plugin.h> #include <grpcpp/ext/otel_plugin.h>
#include <grpcpp/version_info.h> #include <grpcpp/version_info.h>
#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/config/core_configuration.h"

1039
src/objective-c/BoringSSL-GRPC.podspec
View File

File diff suppressed because it is too large Load Diff

42
src/python/grpcio/grpc_core_dependencies.py generated
Unescape View File

@ -15,32 +15,32 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_core_dependencies.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_core_dependencies.py.template`!!!
CORE_SOURCE_FILES = [ CORE_SOURCE_FILES = [
'src/core/client_channel/backend_metric.cc',
'src/core/client_channel/backup_poller.cc',
'src/core/client_channel/channel_connectivity.cc',
'src/core/client_channel/client_channel_channelz.cc',
'src/core/client_channel/client_channel_factory.cc',
'src/core/client_channel/client_channel_filter.cc',
'src/core/client_channel/client_channel_plugin.cc',
'src/core/client_channel/client_channel_service_config.cc',
'src/core/client_channel/config_selector.cc',
'src/core/client_channel/dynamic_filters.cc',
'src/core/client_channel/global_subchannel_pool.cc',
'src/core/client_channel/http_proxy_mapper.cc',
'src/core/client_channel/local_subchannel_pool.cc',
'src/core/client_channel/retry_filter.cc',
'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',
'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc',
'src/core/ext/filters/census/grpc_context.cc', 'src/core/ext/filters/census/grpc_context.cc',
'src/core/ext/filters/channel_idle/channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/channel_idle_filter.cc',
'src/core/ext/filters/channel_idle/idle_filter_state.cc', 'src/core/ext/filters/channel_idle/idle_filter_state.cc',
'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc', 'src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc',
'src/core/ext/filters/client_channel/backend_metric.cc',
'src/core/ext/filters/client_channel/backup_poller.cc',
'src/core/ext/filters/client_channel/channel_connectivity.cc',
'src/core/ext/filters/client_channel/client_channel.cc',
'src/core/ext/filters/client_channel/client_channel_channelz.cc',
'src/core/ext/filters/client_channel/client_channel_factory.cc',
'src/core/ext/filters/client_channel/client_channel_plugin.cc',
'src/core/ext/filters/client_channel/client_channel_service_config.cc',
'src/core/ext/filters/client_channel/config_selector.cc',
'src/core/ext/filters/client_channel/dynamic_filters.cc',
'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
'src/core/ext/filters/client_channel/http_proxy_mapper.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/retry_filter.cc',
'src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc',
'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc',
'src/core/ext/filters/client_channel/subchannel.cc',
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_channel/subchannel_stream_client.cc',
'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/filters/deadline/deadline_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_filter.cc', 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc', 'src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc',

6
src/python/grpcio_observability/make_grpcio_observability.py
Unescape View File

@ -66,11 +66,7 @@ GRPCIO_OBSERVABILITY_ROOT_PREFIX = "src/python/grpcio_observability/"
COPY_FILES_SOURCE_TARGET_PAIRS = [ COPY_FILES_SOURCE_TARGET_PAIRS = [
("include", "grpc_root/include"), ("include", "grpc_root/include"),
("third_party/abseil-cpp/absl", "third_party/abseil-cpp/absl"), ("third_party/abseil-cpp/absl", "third_party/abseil-cpp/absl"),
("src/core/lib", "grpc_root/src/core/lib"), ("src/core", "grpc_root/src/core"),
(
"src/core/load_balancing",
"grpc_root/src/core/load_balancing",
),
] ]
# grpc repo root # grpc repo root

2
templates/gRPC-Core.podspec.template
Unescape View File

@ -198,7 +198,7 @@
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.33' ss.dependency 'BoringSSL-GRPC', '0.0.32'
% for abseil_spec in grpc_abseil_specs: % for abseil_spec in grpc_abseil_specs:
ss.dependency '${abseil_spec}', abseil_version ss.dependency '${abseil_spec}', abseil_version
% endfor % endfor

2
templates/src/objective-c/BoringSSL-GRPC.podspec.template
Unescape View File

@ -70,7 +70,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL-GRPC' s.name = 'BoringSSL-GRPC'
version = '0.0.33' version = '0.0.32'
s.version = version s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
# Adapted from the homepage: # Adapted from the homepage:

109
test/core/bad_client/tests/simple_request.cc
Unescape View File

@ -81,6 +81,27 @@
"\x10\x0cgrpc-timeout\x02" \ "\x10\x0cgrpc-timeout\x02" \
"5S" "5S"
#define PFX_STR_TEXT_HTML_CONTENT_TYPE_HEADER \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
"\x00\x00\x00\x04\x00\x00\x00\x00\x00" /* settings frame */ \
"\x00\x00\xdf\x01\x04\x00\x00\x00\x01" /* headers: generated from \
simple_request_text_html_content_type.headers \
in this directory */ \
"\x10\x05:path\x08/foo/bar" \
"\x10\x07:scheme\x04http" \
"\x10\x07:method\x04POST" \
"\x10\x04host\x09localhost" \
"\x10\x0c" \
"content-type\x09text/html" \
"\x10\x14grpc-accept-encoding\x15" \
"deflate,identity,gzip" \
"\x10\x02te\x08trailers" \
"\x10\x0auser-agent\"bad-client grpc-c/0.12.0.0 (linux)" \
"\x10\x0cgrpc-timeout\x03" \
"10S" \
"\x10\x0cgrpc-timeout\x02" \
"5S"
static void verifier(grpc_server* server, grpc_completion_queue* cq, static void verifier(grpc_server* server, grpc_completion_queue* cq,
void* /*registered_method*/) { void* /*registered_method*/) {
grpc_call_error error; grpc_call_error error;
@ -107,6 +128,67 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq,
grpc_call_unref(s); grpc_call_unref(s);
} }
static void VerifyRpcDoesNotGetCanceled(grpc_server* server,
grpc_completion_queue* cq,
void* /*registered_method*/) {
grpc_call_error error;
grpc_call* s;
grpc_call_details call_details;
grpc_core::CqVerifier cqv(cq);
grpc_metadata_array request_metadata_recv;
int was_cancelled = 2;
grpc_call_details_init(&call_details);
grpc_metadata_array_init(&request_metadata_recv);
error = grpc_server_request_call(server, &s, &call_details,
&request_metadata_recv, cq, cq,
grpc_core::CqVerifier::tag(101));
GPR_ASSERT(GRPC_CALL_OK == error);
cqv.Expect(grpc_core::CqVerifier::tag(101), true);
cqv.Verify();
GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.host, "localhost"));
GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.method, "/foo/bar"));
grpc_op* op;
grpc_op ops[6];
// Send the initial metadata and the status from the server.
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op->flags = 0;
op->reserved = nullptr;
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op->flags = 0;
op->reserved = nullptr;
op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
grpc_slice status_details = grpc_slice_from_static_string("xyz");
op->data.send_status_from_server.status_details = &status_details;
op->flags = 0;
op->reserved = nullptr;
op++;
error = grpc_call_start_batch(s, ops, static_cast<size_t>(op - ops),
grpc_core::CqVerifier::tag(103), nullptr);
GPR_ASSERT(GRPC_CALL_OK == error);
cqv.Expect(grpc_core::CqVerifier::tag(103), true);
cqv.Verify();
// If the call had an error, `was_cancelled` would be 1.
// GPR_ASSERT(was_cancelled == 1);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_unref(s);
}
static void failure_verifier(grpc_server* server, grpc_completion_queue* cq, static void failure_verifier(grpc_server* server, grpc_completion_queue* cq,
void* /*registered_method*/) { void* /*registered_method*/) {
while (grpc_core::Server::FromC(server)->HasOpenConnections()) { while (grpc_core::Server::FromC(server)->HasOpenConnections()) {
@ -120,45 +202,50 @@ int main(int argc, char** argv) {
grpc::testing::TestEnvironment env(&argc, argv); grpc::testing::TestEnvironment env(&argc, argv);
grpc_init(); grpc_init();
/* basic request: check that things are working */ // basic request: check that things are working
GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR, 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR, 0);
GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR_UNUSUAL, 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR_UNUSUAL, 0);
GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR_UNUSUAL2, 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR_UNUSUAL2, 0);
/* push an illegal data frame */ // A basic request with a "content-type: text/html" header. The spec is
// not clear on what the behavior should be here, so to avoid breaking anyone,
// we should continue to accept this header.
GRPC_RUN_BAD_CLIENT_TEST(VerifyRpcDoesNotGetCanceled, nullptr,
PFX_STR_TEXT_HTML_CONTENT_TYPE_HEADER, 0);
// push an illegal data frame
GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr,
PFX_STR PFX_STR
"\x00\x00\x05\x00\x00\x00\x00\x00\x01" "\x00\x00\x05\x00\x00\x00\x00\x00\x01"
"\x34\x00\x00\x00\x00", "\x34\x00\x00\x00\x00",
0); 0);
/* push a data frame with bad flags */ // push a data frame with bad flags
GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr,
PFX_STR "\x00\x00\x00\x00\x02\x00\x00\x00\x01", 0); PFX_STR "\x00\x00\x00\x00\x02\x00\x00\x00\x01", 0);
/* push a window update with a bad length */ // push a window update with a bad length
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x00\x01\x08\x00\x00\x00\x00\x01", 0); PFX_STR "\x00\x00\x01\x08\x00\x00\x00\x00\x01", 0);
/* push a window update with bad flags */ // push a window update with bad flags
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x00\x00\x08\x10\x00\x00\x00\x01", 0); PFX_STR "\x00\x00\x00\x08\x10\x00\x00\x00\x01", 0);
/* push a window update with bad data (0 is not legal window size increment) // push a window update with bad data (0 is not legal window size increment)
*/
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR PFX_STR
"\x00\x00\x04\x08\x00\x00\x00\x00\x01" "\x00\x00\x04\x08\x00\x00\x00\x00\x01"
"\x00\x00\x00\x00", "\x00\x00\x00\x00",
0); 0);
/* push a short goaway */ // push a short goaway
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x00\x04\x07\x00\x00\x00\x00\x00", 0); PFX_STR "\x00\x00\x04\x07\x00\x00\x00\x00\x00", 0);
/* disconnect before sending goaway */ // disconnect before sending goaway
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x01\x12\x07\x00\x00\x00\x00\x00", PFX_STR "\x00\x01\x12\x07\x00\x00\x00\x00\x00",
GRPC_BAD_CLIENT_DISCONNECT); GRPC_BAD_CLIENT_DISCONNECT);
/* push a rst_stream with a bad length */ // push a rst_stream with a bad length
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x00\x01\x03\x00\x00\x00\x00\x01", 0); PFX_STR "\x00\x00\x01\x03\x00\x00\x00\x00\x01", 0);
/* push a rst_stream with bad flags */ // push a rst_stream with bad flags
GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr,
PFX_STR "\x00\x00\x00\x03\x10\x00\x00\x00\x01", 0); PFX_STR "\x00\x00\x00\x03\x10\x00\x00\x00\x01", 0);

13
test/core/bad_client/tests/simple_request_text_html_content_type.headers
Unescape View File

@ -0,0 +1,13 @@
# headers used in simple_request.c
# use tools/codegen/core/gen_header_frame.py to generate the binary strings
# contained in the source code
:path: /foo/bar
:scheme: http
:method: POST
host: localhost
content-type: text/html
grpc-accept-encoding: deflate,identity,gzip
te: trailers
user-agent: bad-client grpc-c/0.12.0.0 (linux)
grpc-timeout: 10S
grpc-timeout: 5S

2
test/core/client_channel/client_channel_service_config_test.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "src/core/ext/filters/client_channel/client_channel_service_config.h" #include "src/core/client_channel/client_channel_service_config.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"

5
test/core/client_channel/client_channel_test.cc
Unescape View File

@ -16,8 +16,6 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/client_channel.h"
#include <memory> #include <memory>
#include "absl/types/optional.h" #include "absl/types/optional.h"
@ -25,7 +23,8 @@
#include <grpc/impl/channel_arg_names.h> #include <grpc/impl/channel_arg_names.h>
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/client_channel_filter.h"
#include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/endpoint_addresses.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"

2
test/core/client_channel/http_proxy_mapper_test.cc
Unescape View File

@ -16,7 +16,7 @@
// //
// //
#include "src/core/ext/filters/client_channel/http_proxy_mapper.h" #include "src/core/client_channel/http_proxy_mapper.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"

6
test/core/client_channel/lb_policy/lb_policy_test_lib.h
Unescape View File

@ -54,9 +54,9 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/ext/filters/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/filters/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/address_utils/sockaddr_utils.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"

2
test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
Unescape View File

@ -22,7 +22,7 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include "src/core/ext/filters/client_channel/client_channel_service_config.h" #include "src/core/client_channel/client_channel_service_config.h"
#include "src/core/ext/xds/xds_health_status.h" #include "src/core/ext/xds/xds_health_status.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/ref_counted_ptr.h"

2
test/core/client_channel/retry_service_config_test.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_service_config.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save