grpc 1.49.0.pre1 → 1.50.0.pre1

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -27,53 +27,10 @@
 
 extern void grpc_register_extra_plugins(void);
 
-void grpc_chttp2_plugin_init(void);
-void grpc_chttp2_plugin_shutdown(void);
-void grpc_client_channel_init(void);
-void grpc_client_channel_shutdown(void);
-void grpc_lb_policy_grpclb_init(void);
-void grpc_lb_policy_grpclb_shutdown(void);
-void grpc_lb_policy_priority_init(void);
-void grpc_lb_policy_priority_shutdown(void);
-void grpc_lb_policy_outlier_detection_init(void);
-void grpc_lb_policy_outlier_detection_shutdown(void);
-void grpc_lb_policy_weighted_target_init(void);
-void grpc_lb_policy_weighted_target_shutdown(void);
-void grpc_lb_policy_pick_first_init(void);
-void grpc_lb_policy_pick_first_shutdown(void);
-void grpc_lb_policy_round_robin_init(void);
-void grpc_lb_policy_round_robin_shutdown(void);
 void grpc_resolver_dns_ares_init(void);
 void grpc_resolver_dns_ares_shutdown(void);
-namespace grpc_core {
-void GrpcLbPolicyRingHashInit(void);
-void GrpcLbPolicyRingHashShutdown(void);
-#ifndef GRPC_NO_RLS
-void RlsLbPluginInit();
-void RlsLbPluginShutdown();
-#endif  // !GRPC_NO_RLS
-}  // namespace grpc_core
 
 void grpc_register_built_in_plugins(void) {
-  grpc_register_plugin(grpc_client_channel_init, grpc_client_channel_shutdown);
-  grpc_register_plugin(grpc_lb_policy_grpclb_init,
-                       grpc_lb_policy_grpclb_shutdown);
-#ifndef GRPC_NO_RLS
-  grpc_register_plugin(grpc_core::RlsLbPluginInit,
-                       grpc_core::RlsLbPluginShutdown);
-#endif  // !GRPC_NO_RLS
-  grpc_register_plugin(grpc_lb_policy_outlier_detection_init,
-                       grpc_lb_policy_outlier_detection_shutdown);
-  grpc_register_plugin(grpc_lb_policy_priority_init,
-                       grpc_lb_policy_priority_shutdown);
-  grpc_register_plugin(grpc_lb_policy_weighted_target_init,
-                       grpc_lb_policy_weighted_target_shutdown);
-  grpc_register_plugin(grpc_lb_policy_pick_first_init,
-                       grpc_lb_policy_pick_first_shutdown);
-  grpc_register_plugin(grpc_lb_policy_round_robin_init,
-                       grpc_lb_policy_round_robin_shutdown);
-  grpc_register_plugin(grpc_core::GrpcLbPolicyRingHashInit,
-                       grpc_core::GrpcLbPolicyRingHashShutdown);
   grpc_register_plugin(grpc_resolver_dns_ares_init,
                        grpc_resolver_dns_ares_shutdown);
   grpc_register_extra_plugins();
@@ -88,8 +45,7 @@ extern void SecurityRegisterHandshakerFactories(
 extern void RegisterClientAuthorityFilter(CoreConfiguration::Builder* builder);
 extern void RegisterChannelIdleFilters(CoreConfiguration::Builder* builder);
 extern void RegisterDeadlineFilter(CoreConfiguration::Builder* builder);
-extern void RegisterGrpcLbLoadReportingFilter(
-    CoreConfiguration::Builder* builder);
+extern void RegisterGrpcLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterHttpFilters(CoreConfiguration::Builder* builder);
 extern void RegisterMessageSizeFilter(CoreConfiguration::Builder* builder);
 extern void RegisterSecurityFilters(CoreConfiguration::Builder* builder);
@@ -102,6 +58,17 @@ extern void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder);
 extern void RegisterAresDnsResolver(CoreConfiguration::Builder* builder);
 extern void RegisterSockaddrResolver(CoreConfiguration::Builder* builder);
 extern void RegisterFakeResolver(CoreConfiguration::Builder* builder);
+extern void RegisterPriorityLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterOutlierDetectionLbPolicy(
+    CoreConfiguration::Builder* builder);
+extern void RegisterWeightedTargetLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterPickFirstLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterRoundRobinLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterRingHashLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
+#ifndef GRPC_NO_RLS
+extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
+#endif  // !GRPC_NO_RLS
 #ifdef GPR_SUPPORT_BINDER_TRANSPORT
 extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
 #endif
@@ -112,11 +79,17 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   // the start of the handshaker list.
   RegisterHttpConnectHandshaker(builder);
   RegisterTCPConnectHandshaker(builder);
+  RegisterPriorityLbPolicy(builder);
+  RegisterOutlierDetectionLbPolicy(builder);
+  RegisterWeightedTargetLbPolicy(builder);
+  RegisterPickFirstLbPolicy(builder);
+  RegisterRoundRobinLbPolicy(builder);
+  RegisterRingHashLbPolicy(builder);
   BuildClientChannelConfiguration(builder);
   SecurityRegisterHandshakerFactories(builder);
   RegisterClientAuthorityFilter(builder);
   RegisterChannelIdleFilters(builder);
-  RegisterGrpcLbLoadReportingFilter(builder);
+  RegisterGrpcLbPolicy(builder);
   RegisterHttpFilters(builder);
   RegisterDeadlineFilter(builder);
   RegisterMessageSizeFilter(builder);
@@ -127,9 +100,13 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterNativeDnsResolver(builder);
   RegisterSockaddrResolver(builder);
   RegisterFakeResolver(builder);
+  RegisterHttpProxyMapper(builder);
 #ifdef GPR_SUPPORT_BINDER_TRANSPORT
   RegisterBinderResolver(builder);
 #endif
+#ifndef GRPC_NO_RLS
+  RegisterRlsLbPolicy(builder);
+#endif  // !GRPC_NO_RLS
   // Run last so it gets a consistent location.
   // TODO(ctiller): Is this actually necessary?
   RegisterSecurityFilters(builder);

data/src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -26,37 +26,12 @@ namespace grpc_core {
 void XdsClientGlobalInit();
 void XdsClientGlobalShutdown();
 }  // namespace grpc_core
-void grpc_certificate_provider_registry_init(void);
-void grpc_certificate_provider_registry_shutdown(void);
-namespace grpc_core {
-void FileWatcherCertificateProviderInit();
-void FileWatcherCertificateProviderShutdown();
-}  // namespace grpc_core
-void grpc_lb_policy_cds_init(void);
-void grpc_lb_policy_cds_shutdown(void);
-void grpc_lb_policy_xds_cluster_impl_init(void);
-void grpc_lb_policy_xds_cluster_impl_shutdown(void);
-void grpc_lb_policy_xds_cluster_resolver_init(void);
-void grpc_lb_policy_xds_cluster_resolver_shutdown(void);
-void grpc_lb_policy_xds_cluster_manager_init(void);
-void grpc_lb_policy_xds_cluster_manager_shutdown(void);
 #endif
 
 void grpc_register_extra_plugins() {
 #ifndef GRPC_NO_XDS
   grpc_register_plugin(grpc_core::XdsClientGlobalInit,
                        grpc_core::XdsClientGlobalShutdown);
-  grpc_register_plugin(grpc_certificate_provider_registry_init,
-                       grpc_certificate_provider_registry_shutdown);
-  grpc_register_plugin(grpc_core::FileWatcherCertificateProviderInit,
-                       grpc_core::FileWatcherCertificateProviderShutdown);
-  grpc_register_plugin(grpc_lb_policy_cds_init, grpc_lb_policy_cds_shutdown);
-  grpc_register_plugin(grpc_lb_policy_xds_cluster_impl_init,
-                       grpc_lb_policy_xds_cluster_impl_shutdown);
-  grpc_register_plugin(grpc_lb_policy_xds_cluster_resolver_init,
-                       grpc_lb_policy_xds_cluster_resolver_shutdown);
-  grpc_register_plugin(grpc_lb_policy_xds_cluster_manager_init,
-                       grpc_lb_policy_xds_cluster_manager_shutdown);
 #endif
 }
 
@@ -68,6 +43,14 @@ extern void RegisterXdsChannelStackModifier(
 extern void RegisterChannelDefaultCreds(CoreConfiguration::Builder* builder);
 extern void RegisterXdsResolver(CoreConfiguration::Builder* builder);
 extern void RegisterCloud2ProdResolver(CoreConfiguration::Builder* builder);
+extern void RegisterXdsClusterManagerLbPolicy(
+    CoreConfiguration::Builder* builder);
+extern void RegisterXdsClusterImplLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterCdsLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterXdsClusterResolverLbPolicy(
+    CoreConfiguration::Builder* builder);
+extern void RegisterFileWatcherCertificateProvider(
+    CoreConfiguration::Builder* builder);
 #endif
 void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   // Use builder to avoid unused-parameter warning.
@@ -80,6 +63,11 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   RegisterChannelDefaultCreds(builder);
   RegisterXdsResolver(builder);
   RegisterCloud2ProdResolver(builder);
+  RegisterXdsClusterManagerLbPolicy(builder);
+  RegisterXdsClusterImplLbPolicy(builder);
+  RegisterCdsLbPolicy(builder);
+  RegisterXdsClusterResolverLbPolicy(builder);
+  RegisterFileWatcherCertificateProvider(builder);
 #endif
 }
 }  // namespace grpc_core

data/src/ruby/ext/grpc/extconf.rb

@@ -86,7 +86,6 @@ end
 
 env_append 'CPPFLAGS', '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
 env_append 'CPPFLAGS', '-DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\""'
-env_append 'CPPFLAGS', '-DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt
 
 require_relative '../../lib/grpc/version'
 env_append 'CPPFLAGS', '-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"' + GRPC::VERSION + '\""'
@@ -111,6 +110,7 @@ unless windows
   exit 1 unless $? == 0
 end
 
+$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt
 $CFLAGS << ' -I' + File.join(grpc_root, 'include')
 
 ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export')

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.49.0.pre1'
+  VERSION = '1.50.0.pre1'
 end

data/src/ruby/spec/channel_spec.rb

@@ -154,14 +154,19 @@ describe GRPC::Core::Channel do
     end
 
     it 'raises an error if called on a closed channel' do
+      STDERR.puts "#{Time.now}: begin: raises an error if called on a closed channel"
       ch = GRPC::Core::Channel.new(fake_host, nil, :this_channel_is_insecure)
+      STDERR.puts "#{Time.now}: created channel"
       ch.close
+      STDERR.puts "#{Time.now}: closed channel"
 
       deadline = Time.now + 5
       blk = proc do
         ch.create_call(nil, nil, 'phony_method', nil, deadline)
+        STDERR.puts "#{Time.now}: created call"
       end
       expect(&blk).to raise_error(RuntimeError)
+      STDERR.puts "#{Time.now}: finished: raises an error if called on a closed channel"
     end
 
     it 'raises if grpc was initialized in another process' do

data/src/ruby/spec/generic/server_interceptors_spec.rb

@@ -17,7 +17,7 @@ describe 'Server Interceptors' do
   let(:interceptor) { TestServerInterceptor.new }
   let(:request) { EchoMsg.new }
   let(:trailing_metadata) { {} }
-  let(:service) { EchoService.new(trailing_metadata) }
+  let(:service) { EchoService.new(**trailing_metadata) }
   let(:interceptors) { [] }
 
   before(:each) do

data/src/ruby/spec/user_agent_spec.rb

@@ -49,7 +49,7 @@ describe 'user agent' do
   it 'client sends expected user agent' do
     stub = UserAgentEchoServiceStub.new("localhost:#{@port}",
                                         :this_channel_is_insecure,
-                                        {})
+                                        channel_args: {})
     response = stub.an_rpc(EchoMsg.new)
     expected_user_agent_prefix = "grpc-ruby/#{GRPC::VERSION}"
     expect(response.msg.start_with?(expected_user_agent_prefix)).to be true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.49.0.pre1
+  version: 1.50.0.pre1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire:
 bindir: src/ruby/bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -338,9 +338,6 @@ files:
 - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc
 - 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/proxy_mapper.h
-- src/core/ext/filters/client_channel/proxy_mapper_registry.cc
-- src/core/ext/filters/client_channel/proxy_mapper_registry.h
 - src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
@@ -418,6 +415,8 @@ files:
 - src/core/ext/transport/chttp2/transport/chttp2_transport.h
 - src/core/ext/transport/chttp2/transport/context_list.cc
 - src/core/ext/transport/chttp2/transport/context_list.h
+- src/core/ext/transport/chttp2/transport/decode_huff.cc
+- src/core/ext/transport/chttp2/transport/decode_huff.h
 - src/core/ext/transport/chttp2/transport/flow_control.cc
 - src/core/ext/transport/chttp2/transport/flow_control.h
 - src/core/ext/transport/chttp2/transport/frame.h
@@ -1025,9 +1024,6 @@ files:
 - src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h
 - src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
 - src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h
-- src/core/ext/xds/certificate_provider_factory.h
-- src/core/ext/xds/certificate_provider_registry.cc
-- src/core/ext/xds/certificate_provider_registry.h
 - src/core/ext/xds/certificate_provider_store.cc
 - src/core/ext/xds/certificate_provider_store.h
 - src/core/ext/xds/file_watcher_certificate_provider_factory.cc
@@ -1037,6 +1033,8 @@ files:
 - src/core/ext/xds/xds_api.h
 - src/core/ext/xds/xds_bootstrap.cc
 - src/core/ext/xds/xds_bootstrap.h
+- src/core/ext/xds/xds_bootstrap_grpc.cc
+- src/core/ext/xds/xds_bootstrap_grpc.h
 - src/core/ext/xds/xds_certificate_provider.cc
 - src/core/ext/xds/xds_certificate_provider.h
 - src/core/ext/xds/xds_channel_args.h
@@ -1145,13 +1143,14 @@ files:
 - src/core/lib/event_engine/posix_engine/timer_heap.h
 - src/core/lib/event_engine/posix_engine/timer_manager.cc
 - src/core/lib/event_engine/posix_engine/timer_manager.h
-- src/core/lib/event_engine/promise.h
 - src/core/lib/event_engine/resolved_address.cc
 - src/core/lib/event_engine/slice.cc
 - src/core/lib/event_engine/slice_buffer.cc
 - src/core/lib/event_engine/socket_notifier.h
 - src/core/lib/event_engine/thread_pool.cc
 - src/core/lib/event_engine/thread_pool.h
+- src/core/lib/event_engine/time_util.cc
+- src/core/lib/event_engine/time_util.h
 - src/core/lib/event_engine/trace.cc
 - src/core/lib/event_engine/trace.h
 - src/core/lib/event_engine/utils.cc
@@ -1162,6 +1161,10 @@ files:
 - src/core/lib/event_engine/windows/win_socket.h
 - src/core/lib/event_engine/windows/windows_engine.cc
 - src/core/lib/event_engine/windows/windows_engine.h
+- src/core/lib/experiments/config.cc
+- src/core/lib/experiments/config.h
+- src/core/lib/experiments/experiments.cc
+- src/core/lib/experiments/experiments.h
 - src/core/lib/gpr/alloc.cc
 - src/core/lib/gpr/alloc.h
 - src/core/lib/gpr/atm.cc
@@ -1169,10 +1172,6 @@ files:
 - src/core/lib/gpr/cpu_linux.cc
 - src/core/lib/gpr/cpu_posix.cc
 - src/core/lib/gpr/cpu_windows.cc
-- src/core/lib/gpr/env.h
-- src/core/lib/gpr/env_linux.cc
-- src/core/lib/gpr/env_posix.cc
-- src/core/lib/gpr/env_windows.cc
 - src/core/lib/gpr/log.cc
 - src/core/lib/gpr/log_android.cc
 - src/core/lib/gpr/log_linux.cc
@@ -1186,7 +1185,6 @@ files:
 - src/core/lib/gpr/string_posix.cc
 - src/core/lib/gpr/string_util_windows.cc
 - src/core/lib/gpr/string_windows.cc
-- src/core/lib/gpr/string_windows.h
 - src/core/lib/gpr/sync.cc
 - src/core/lib/gpr/sync_abseil.cc
 - src/core/lib/gpr/sync_posix.cc
@@ -1210,6 +1208,10 @@ files:
 - src/core/lib/gprpp/cpp_impl_of.h
 - src/core/lib/gprpp/debug_location.h
 - src/core/lib/gprpp/dual_ref_counted.h
+- src/core/lib/gprpp/env.h
+- src/core/lib/gprpp/env_linux.cc
+- src/core/lib/gprpp/env_posix.cc
+- src/core/lib/gprpp/env_windows.cc
 - src/core/lib/gprpp/examine_stack.cc
 - src/core/lib/gprpp/examine_stack.h
 - src/core/lib/gprpp/fork.cc
@@ -1227,11 +1229,14 @@ files:
 - src/core/lib/gprpp/mpscq.cc
 - src/core/lib/gprpp/mpscq.h
 - src/core/lib/gprpp/no_destruct.h
+- src/core/lib/gprpp/notification.h
 - src/core/lib/gprpp/orphanable.h
 - src/core/lib/gprpp/overload.h
+- src/core/lib/gprpp/packed_table.h
 - src/core/lib/gprpp/ref_counted.h
 - src/core/lib/gprpp/ref_counted_ptr.h
 - src/core/lib/gprpp/single_set_ptr.h
+- src/core/lib/gprpp/sorted_pack.h
 - src/core/lib/gprpp/stat.h
 - src/core/lib/gprpp/stat_posix.cc
 - src/core/lib/gprpp/stat_windows.cc
@@ -1239,6 +1244,8 @@ files:
 - src/core/lib/gprpp/status_helper.h
 - src/core/lib/gprpp/sync.h
 - src/core/lib/gprpp/table.h
+- src/core/lib/gprpp/tchar.cc
+- src/core/lib/gprpp/tchar.h
 - src/core/lib/gprpp/thd.h
 - src/core/lib/gprpp/thd_posix.cc
 - src/core/lib/gprpp/thd_windows.cc
@@ -1249,8 +1256,13 @@ files:
 - src/core/lib/gprpp/time_util.cc
 - src/core/lib/gprpp/time_util.h
 - src/core/lib/gprpp/unique_type_name.h
+- src/core/lib/gprpp/validation_errors.cc
+- src/core/lib/gprpp/validation_errors.h
 - src/core/lib/gprpp/work_serializer.cc
 - src/core/lib/gprpp/work_serializer.h
+- src/core/lib/handshaker/proxy_mapper.h
+- src/core/lib/handshaker/proxy_mapper_registry.cc
+- src/core/lib/handshaker/proxy_mapper_registry.h
 - src/core/lib/http/format_request.cc
 - src/core/lib/http/format_request.h
 - src/core/lib/http/httpcli.cc
@@ -1408,9 +1420,6 @@ files:
 - src/core/lib/load_balancing/subchannel_interface.h
 - src/core/lib/matchers/matchers.cc
 - src/core/lib/matchers/matchers.h
-- src/core/lib/profiling/basic_timers.cc
-- src/core/lib/profiling/stap_timers.cc
-- src/core/lib/profiling/timers.h
 - src/core/lib/promise/activity.cc
 - src/core/lib/promise/activity.h
 - src/core/lib/promise/arena_promise.h
@@ -1466,6 +1475,9 @@ files:
 - src/core/lib/security/authorization/matchers.h
 - src/core/lib/security/authorization/rbac_policy.cc
 - src/core/lib/security/authorization/rbac_policy.h
+- src/core/lib/security/certificate_provider/certificate_provider_factory.h
+- src/core/lib/security/certificate_provider/certificate_provider_registry.cc
+- src/core/lib/security/certificate_provider/certificate_provider_registry.h
 - src/core/lib/security/context/security_context.cc
 - src/core/lib/security/context/security_context.h
 - src/core/lib/security/credentials/alts/alts_credentials.cc
@@ -1615,6 +1627,8 @@ files:
 - src/core/lib/surface/event_string.h
 - src/core/lib/surface/init.cc
 - src/core/lib/surface/init.h
+- src/core/lib/surface/init_internally.cc
+- src/core/lib/surface/init_internally.h
 - src/core/lib/surface/lame_client.cc
 - src/core/lib/surface/lame_client.h
 - src/core/lib/surface/metadata_array.cc

data/src/core/ext/filters/client_channel/proxy_mapper_registry.h

@@ -1,56 +0,0 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_REGISTRY_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_REGISTRY_H
-
-#include <grpc/support/port_platform.h>
-
-#include <memory>
-#include <string>
-
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-
-#include "src/core/ext/filters/client_channel/proxy_mapper.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/iomgr/resolved_address.h"
-
-namespace grpc_core {
-
-class ProxyMapperRegistry {
- public:
-  static void Init();
-  static void Shutdown();
-
-  /// Registers a new proxy mapper.
-  /// If \a at_start is true, the new mapper will be at the beginning of
-  /// the list.  Otherwise, it will be added to the end.
-  static void Register(bool at_start,
-                       std::unique_ptr<ProxyMapperInterface> mapper);
-
-  static absl::optional<std::string> MapName(absl::string_view server_uri,
-                                             ChannelArgs* args);
-
-  static absl::optional<grpc_resolved_address> MapAddress(
-      const grpc_resolved_address& address, ChannelArgs* args);
-};
-
-}  // namespace grpc_core
-
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_REGISTRY_H */

data/src/core/ext/xds/certificate_provider_registry.cc

@@ -1,103 +0,0 @@
-//
-//
-// Copyright 2020 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/certificate_provider_registry.h"
-
-#include <string.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include <grpc/support/log.h>
-
-namespace grpc_core {
-
-namespace {
-
-class RegistryState {
- public:
-  void RegisterCertificateProviderFactory(
-      std::unique_ptr<CertificateProviderFactory> factory) {
-    gpr_log(GPR_DEBUG, "registering certificate provider factory for \"%s\"",
-            factory->name());
-    for (size_t i = 0; i < factories_.size(); ++i) {
-      GPR_ASSERT(strcmp(factories_[i]->name(), factory->name()) != 0);
-    }
-    factories_.push_back(std::move(factory));
-  }
-
-  CertificateProviderFactory* LookupCertificateProviderFactory(
-      absl::string_view name) const {
-    for (size_t i = 0; i < factories_.size(); ++i) {
-      if (name == factories_[i]->name()) {
-        return factories_[i].get();
-      }
-    }
-    return nullptr;
-  }
-
- private:
-  std::vector<std::unique_ptr<CertificateProviderFactory>> factories_;
-};
-
-RegistryState* g_state = nullptr;
-
-}  // namespace
-
-//
-// CertificateProviderRegistry
-//
-
-CertificateProviderFactory*
-CertificateProviderRegistry::LookupCertificateProviderFactory(
-    absl::string_view name) {
-  GPR_ASSERT(g_state != nullptr);
-  return g_state->LookupCertificateProviderFactory(name);
-}
-
-void CertificateProviderRegistry::InitRegistry() {
-  if (g_state == nullptr) g_state = new RegistryState();
-}
-
-void CertificateProviderRegistry::ShutdownRegistry() {
-  delete g_state;
-  g_state = nullptr;
-}
-
-void CertificateProviderRegistry::RegisterCertificateProviderFactory(
-    std::unique_ptr<CertificateProviderFactory> factory) {
-  InitRegistry();
-  g_state->RegisterCertificateProviderFactory(std::move(factory));
-}
-
-}  // namespace grpc_core
-
-//
-// Plugin registration
-//
-
-void grpc_certificate_provider_registry_init() {
-  grpc_core::CertificateProviderRegistry::InitRegistry();
-}
-
-void grpc_certificate_provider_registry_shutdown() {
-  grpc_core::CertificateProviderRegistry::ShutdownRegistry();
-}

data/src/core/ext/xds/certificate_provider_registry.h

@@ -1,59 +0,0 @@
-//
-//
-// Copyright 2020 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#ifndef GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H
-#define GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H
-
-#include <grpc/support/port_platform.h>
-
-#include <memory>
-
-#include "absl/strings/string_view.h"
-
-#include "src/core/ext/xds/certificate_provider_factory.h"
-
-namespace grpc_core {
-
-// Global registry for all the certificate provider plugins.
-class CertificateProviderRegistry {
- public:
-  // Returns the factory for the plugin keyed by name.
-  static CertificateProviderFactory* LookupCertificateProviderFactory(
-      absl::string_view name);
-
-  // The following methods are used to create and populate the
-  // CertificateProviderRegistry. NOT THREAD SAFE -- to be used only during
-  // global gRPC initialization and shutdown.
-
-  // Global initialization of the registry.
-  static void InitRegistry();
-
-  // Global shutdown of the registry.
-  static void ShutdownRegistry();
-
-  // Register a provider with the registry. Can only be called after calling
-  // InitRegistry(). The key of the factory is extracted from factory
-  // parameter with method CertificateProviderFactory::name. If the same key
-  // is registered twice, an exception is raised.
-  static void RegisterCertificateProviderFactory(
-      std::unique_ptr<CertificateProviderFactory> factory);
-};
-
-}  // namespace grpc_core
-
-#endif  // GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H