Call into plugin registry from config code (#27041)

* Call into plugin registry from config code * Automated change: Fix sanity tests * Remove unused name * Remove unused name Co-authored-by: ctiller <ctiller@users.noreply.github.com>
2021-08-18 08:39:08 -07:00 · 2021-08-18 08:39:08 -07:00 · 4c8a0d91c6
parent 48b194f737
commit 4c8a0d91c6
16 changed files with 50 additions and 0 deletions
--- a/2
+++ b/2
@ -342,6 +342,7 @@ grpc_cc_library(
    standalone = True,
    visibility = ["@grpc:public"],
    deps = [
+        "config",
        "gpr_base",
        "grpc_base_c",
        "grpc_common",
@ -379,6 +380,7 @@ grpc_cc_library(
        "@grpc:public",
    ],
    deps = [
+        "config",
        "gpr_base",
        "grpc_base_c",
        "grpc_common",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1854,6 +1854,7 @@ add_library(grpc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
  src/core/lib/compression/stream_compression_identity.cc
+  src/core/lib/config/core_configuration.cc
  src/core/lib/debug/stats.cc
  src/core/lib/debug/stats_data.cc
  src/core/lib/debug/trace.cc
@ -2492,6 +2493,7 @@ add_library(grpc_unsecure
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
  src/core/lib/compression/stream_compression_identity.cc
+  src/core/lib/config/core_configuration.cc
  src/core/lib/debug/stats.cc
  src/core/lib/debug/stats_data.cc
  src/core/lib/debug/trace.cc
--- a/2
+++ b/2
@ -1374,6 +1374,7 @@ LIBGRPC_SRC = \
    src/core/lib/compression/stream_compression.cc \
    src/core/lib/compression/stream_compression_gzip.cc \
    src/core/lib/compression/stream_compression_identity.cc \
+    src/core/lib/config/core_configuration.cc \
    src/core/lib/debug/stats.cc \
    src/core/lib/debug/stats_data.cc \
    src/core/lib/debug/trace.cc \
@ -1862,6 +1863,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/compression/stream_compression.cc \
    src/core/lib/compression/stream_compression_gzip.cc \
    src/core/lib/compression/stream_compression_identity.cc \
+    src/core/lib/config/core_configuration.cc \
    src/core/lib/debug/stats.cc \
    src/core/lib/debug/stats_data.cc \
    src/core/lib/debug/trace.cc \
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -732,6 +732,7 @@ libs:
  - src/core/lib/compression/stream_compression.h
  - src/core/lib/compression/stream_compression_gzip.h
  - src/core/lib/compression/stream_compression_identity.h
+  - src/core/lib/config/core_configuration.h
  - src/core/lib/debug/stats.h
  - src/core/lib/debug/stats_data.h
  - src/core/lib/debug/trace.h
@ -1269,6 +1270,7 @@ libs:
  - src/core/lib/compression/stream_compression.cc
  - src/core/lib/compression/stream_compression_gzip.cc
  - src/core/lib/compression/stream_compression_identity.cc
+  - src/core/lib/config/core_configuration.cc
  - src/core/lib/debug/stats.cc
  - src/core/lib/debug/stats_data.cc
  - src/core/lib/debug/trace.cc
@ -1773,6 +1775,7 @@ libs:
  - src/core/lib/compression/stream_compression.h
  - src/core/lib/compression/stream_compression_gzip.h
  - src/core/lib/compression/stream_compression_identity.h
+  - src/core/lib/config/core_configuration.h
  - src/core/lib/debug/stats.h
  - src/core/lib/debug/stats_data.h
  - src/core/lib/debug/trace.h
@ -2037,6 +2040,7 @@ libs:
  - src/core/lib/compression/stream_compression.cc
  - src/core/lib/compression/stream_compression_gzip.cc
  - src/core/lib/compression/stream_compression_identity.cc
+  - src/core/lib/config/core_configuration.cc
  - src/core/lib/debug/stats.cc
  - src/core/lib/debug/stats_data.cc
  - src/core/lib/debug/trace.cc
--- a/config.m4
+++ b/config.m4
@ -382,6 +382,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/compression/stream_compression.cc \
    src/core/lib/compression/stream_compression_gzip.cc \
    src/core/lib/compression/stream_compression_identity.cc \
+    src/core/lib/config/core_configuration.cc \
    src/core/lib/debug/stats.cc \
    src/core/lib/debug/stats_data.cc \
    src/core/lib/debug/trace.cc \
@ -1185,6 +1186,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr)
--- a/config.w32
+++ b/config.w32
@ -348,6 +348,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\compression\\stream_compression.cc " +
    "src\\core\\lib\\compression\\stream_compression_gzip.cc " +
    "src\\core\\lib\\compression\\stream_compression_identity.cc " +
+    "src\\core\\lib\\config\\core_configuration.cc " +
    "src\\core\\lib\\debug\\stats.cc " +
    "src\\core\\lib\\debug\\stats_data.cc " +
    "src\\core\\lib\\debug\\trace.cc " +
@ -1286,6 +1287,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\channel");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\config");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\debug");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -527,6 +527,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/compression/stream_compression.h',
                      'src/core/lib/compression/stream_compression_gzip.h',
                      'src/core/lib/compression/stream_compression_identity.h',
+                      'src/core/lib/config/core_configuration.h',
                      'src/core/lib/debug/stats.h',
                      'src/core/lib/debug/stats_data.h',
                      'src/core/lib/debug/trace.h',
@ -1191,6 +1192,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/compression/stream_compression.h',
                              'src/core/lib/compression/stream_compression_gzip.h',
                              'src/core/lib/compression/stream_compression_identity.h',
+                              'src/core/lib/config/core_configuration.h',
                              'src/core/lib/debug/stats.h',
                              'src/core/lib/debug/stats_data.h',
                              'src/core/lib/debug/trace.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -860,6 +860,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/compression/stream_compression_gzip.h',
                      'src/core/lib/compression/stream_compression_identity.cc',
                      'src/core/lib/compression/stream_compression_identity.h',
+                      'src/core/lib/config/core_configuration.cc',
+                      'src/core/lib/config/core_configuration.h',
                      'src/core/lib/debug/stats.cc',
                      'src/core/lib/debug/stats.h',
                      'src/core/lib/debug/stats_data.cc',
@ -1778,6 +1780,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/compression/stream_compression.h',
                              'src/core/lib/compression/stream_compression_gzip.h',
                              'src/core/lib/compression/stream_compression_identity.h',
+                              'src/core/lib/config/core_configuration.h',
                              'src/core/lib/debug/stats.h',
                              'src/core/lib/debug/stats_data.h',
                              'src/core/lib/debug/trace.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -773,6 +773,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/compression/stream_compression_gzip.h )
  s.files += %w( src/core/lib/compression/stream_compression_identity.cc )
  s.files += %w( src/core/lib/compression/stream_compression_identity.h )
+  s.files += %w( src/core/lib/config/core_configuration.cc )
+  s.files += %w( src/core/lib/config/core_configuration.h )
  s.files += %w( src/core/lib/debug/stats.cc )
  s.files += %w( src/core/lib/debug/stats.h )
  s.files += %w( src/core/lib/debug/stats_data.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -807,6 +807,7 @@
        'src/core/lib/compression/stream_compression.cc',
        'src/core/lib/compression/stream_compression_gzip.cc',
        'src/core/lib/compression/stream_compression_identity.cc',
+        'src/core/lib/config/core_configuration.cc',
        'src/core/lib/debug/stats.cc',
        'src/core/lib/debug/stats_data.cc',
        'src/core/lib/debug/trace.cc',
@ -1268,6 +1269,7 @@
        'src/core/lib/compression/stream_compression.cc',
        'src/core/lib/compression/stream_compression_gzip.cc',
        'src/core/lib/compression/stream_compression_identity.cc',
+        'src/core/lib/config/core_configuration.cc',
        'src/core/lib/debug/stats.cc',
        'src/core/lib/debug/stats_data.cc',
        'src/core/lib/debug/trace.cc',
--- a/package.xml
+++ b/package.xml
@ -753,6 +753,8 @@
    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_gzip.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_identity.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_identity.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/config/core_configuration.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/config/core_configuration.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/stats.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/stats_data.cc" role="src" />
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@ -20,6 +20,8 @@

 #include <grpc/grpc.h>

+#include "src/core/lib/config/core_configuration.h"
+
 void grpc_http_filters_init(void);
 void grpc_http_filters_shutdown(void);
 void grpc_chttp2_plugin_init(void);
@ -160,3 +162,11 @@ void grpc_register_built_in_plugins(void) {
                       grpc_core::GoogleCloud2ProdResolverShutdown);
 #endif
 }
+
+namespace grpc_core {
+
+void BuildCoreConfiguration(CoreConfiguration::Builder*) {
+  // TODO(ctiller): Incrementally call out to plugins as we require them to register things with builder.
+}
+
+}
--- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
@ -20,6 +20,8 @@

 #include <grpc/grpc.h>

+#include "src/core/lib/config/core_configuration.h"
+
 void grpc_http_filters_init(void);
 void grpc_http_filters_shutdown(void);
 void grpc_chttp2_plugin_init(void);
@ -113,3 +115,11 @@ void grpc_register_built_in_plugins(void) {
  grpc_register_plugin(grpc_workaround_cronet_compression_filter_init,
                       grpc_workaround_cronet_compression_filter_shutdown);
 }
+
+namespace grpc_core {
+
+void BuildCoreConfiguration(CoreConfiguration::Builder*) {
+  // TODO(ctiller): Incrementally call out to plugins as we require them to register things with builder.
+}
+
+}
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -357,6 +357,7 @@ CORE_SOURCE_FILES = [
    'src/core/lib/compression/stream_compression.cc',
    'src/core/lib/compression/stream_compression_gzip.cc',
    'src/core/lib/compression/stream_compression_identity.cc',
+    'src/core/lib/config/core_configuration.cc',
    'src/core/lib/debug/stats.cc',
    'src/core/lib/debug/stats_data.cc',
    'src/core/lib/debug/trace.cc',
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1706,6 +1706,8 @@ src/core/lib/compression/stream_compression_gzip.cc \
 src/core/lib/compression/stream_compression_gzip.h \
 src/core/lib/compression/stream_compression_identity.cc \
 src/core/lib/compression/stream_compression_identity.h \
+src/core/lib/config/core_configuration.cc \
+src/core/lib/config/core_configuration.h \
 src/core/lib/debug/stats.cc \
 src/core/lib/debug/stats.h \
 src/core/lib/debug/stats_data.cc \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1543,6 +1543,8 @@ src/core/lib/compression/stream_compression_gzip.cc \
 src/core/lib/compression/stream_compression_gzip.h \
 src/core/lib/compression/stream_compression_identity.cc \
 src/core/lib/compression/stream_compression_identity.h \
+src/core/lib/config/core_configuration.cc \
+src/core/lib/config/core_configuration.h \
 src/core/lib/debug/stats.cc \
 src/core/lib/debug/stats.h \
 src/core/lib/debug/stats_data.cc \