grpc 1.80.0 → 1.81.0

data/src/core/xds/grpc/xds_route_config.cc

@@ -25,9 +25,7 @@
 #include "re2/re2.h"
 #include "src/core/util/match.h"
 #include "src/core/util/matchers.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
+#include "src/core/util/string.h"
 
 namespace grpc_core {
 
@@ -36,10 +34,15 @@ namespace grpc_core {
 //
 
 std::string XdsRouteConfigResource::FilterConfigOverride::ToString() const {
-  return absl::StrCat(
-      "{config_proto_type=", config_proto_type, ", config=", JsonDump(config),
-      ", filter_config=",
-      filter_config == nullptr ? "null" : filter_config->ToString(), "}");
+  std::string result = "{config_proto_type=";
+  StrAppend(result, config_proto_type);
+  StrAppend(result, ", config=");
+  StrAppend(result, JsonDump(config));
+  StrAppend(result, ", filter_config=");
+  StrAppend(result,
+            filter_config == nullptr ? "null" : filter_config->ToString());
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -48,19 +51,21 @@ std::string XdsRouteConfigResource::FilterConfigOverride::ToString() const {
 
 std::string XdsRouteConfigResource::RetryPolicy::RetryBackOff::ToString()
     const {
-  std::vector<std::string> contents;
-  contents.push_back(
-      absl::StrCat("RetryBackOff Base: ", base_interval.ToString()));
-  contents.push_back(
-      absl::StrCat("RetryBackOff max: ", max_interval.ToString()));
-  return absl::StrJoin(contents, ",");
+  std::string result = "{base_interval=";
+  StrAppend(result, base_interval.ToString());
+  StrAppend(result, ", max_interval=");
+  StrAppend(result, max_interval.ToString());
+  StrAppend(result, "}");
+  return result;
 }
 
 std::string XdsRouteConfigResource::RetryPolicy::ToString() const {
-  std::vector<std::string> contents;
-  contents.push_back(absl::StrFormat("num_retries=%d", num_retries));
-  contents.push_back(retry_back_off.ToString());
-  return absl::StrCat("{", absl::StrJoin(contents, ","), "}");
+  std::string result = "{num_retries=";
+  StrAppend(result, std::to_string(num_retries));
+  StrAppend(result, ", retry_back_off=");
+  StrAppend(result, retry_back_off.ToString());
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -68,17 +73,25 @@ std::string XdsRouteConfigResource::RetryPolicy::ToString() const {
 //
 
 std::string XdsRouteConfigResource::Route::Matchers::ToString() const {
-  std::vector<std::string> contents;
-  contents.push_back(
-      absl::StrFormat("PathMatcher{%s}", path_matcher.ToString()));
-  for (const HeaderMatcher& header_matcher : header_matchers) {
-    contents.push_back(header_matcher.ToString());
+  std::string result = "{path_matcher={";
+  StrAppend(result, path_matcher.ToString());
+  StrAppend(result, "}");
+  if (!header_matchers.empty()) {
+    StrAppend(result, ", header_matchers=[");
+    bool is_first = true;
+    for (const HeaderMatcher& header_matcher : header_matchers) {
+      if (!is_first) StrAppend(result, ", ");
+      StrAppend(result, header_matcher.ToString());
+      is_first = false;
+    }
+    StrAppend(result, "]");
   }
   if (fraction_per_million.has_value()) {
-    contents.push_back(absl::StrFormat("Fraction Per Million %d",
-                                       fraction_per_million.value()));
+    StrAppend(result, ", fraction_per_million=");
+    StrAppend(result, std::to_string(*fraction_per_million));
   }
-  return absl::StrJoin(contents, "\n");
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -137,9 +150,18 @@ bool XdsRouteConfigResource::Route::RouteAction::HashPolicy::Header::operator==(
 std::string
 XdsRouteConfigResource::Route::RouteAction::HashPolicy::Header::ToString()
     const {
-  return absl::StrCat("Header ", header_name, "/",
-                      (regex == nullptr) ? "" : regex->pattern(), "/",
-                      regex_substitution);
+  std::string result = "header{name=";
+  StrAppend(result, header_name);
+  if (regex != nullptr) {
+    StrAppend(result, ", regex=");
+    StrAppend(result, regex->pattern());
+  }
+  if (!regex_substitution.empty()) {
+    StrAppend(result, ", regex_substitution=");
+    StrAppend(result, regex_substitution);
+  }
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -148,11 +170,15 @@ XdsRouteConfigResource::Route::RouteAction::HashPolicy::Header::ToString()
 
 std::string XdsRouteConfigResource::Route::RouteAction::HashPolicy::ToString()
     const {
-  std::string type = Match(
-      policy, [](const Header& header) { return header.ToString(); },
-      [](const ChannelId&) -> std::string { return "ChannelId"; });
-  return absl::StrCat("{", type, ", terminal=", terminal ? "true" : "false",
-                      "}");
+  std::string result = "{";
+  Match(
+      policy,
+      [&](const Header& header) { StrAppend(result, header.ToString()); },
+      [&](const ChannelId&) { StrAppend(result, "ChannelId"); });
+  StrAppend(result, ", terminal=");
+  StrAppend(result, terminal ? "true" : "false");
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -161,18 +187,24 @@ std::string XdsRouteConfigResource::Route::RouteAction::HashPolicy::ToString()
 
 std::string
 XdsRouteConfigResource::Route::RouteAction::ClusterWeight::ToString() const {
-  std::vector<std::string> contents;
-  contents.push_back(absl::StrCat("cluster=", name));
-  contents.push_back(absl::StrCat("weight=", weight));
+  std::string result = "{cluster=";
+  StrAppend(result, name);
+  StrAppend(result, ", weight=");
+  StrAppend(result, std::to_string(weight));
   if (!typed_per_filter_config.empty()) {
-    std::vector<std::string> parts;
+    StrAppend(result, ", typed_per_filter_config={");
+    bool is_first = true;
     for (const auto& [key, config] : typed_per_filter_config) {
-      parts.push_back(absl::StrCat(key, "=", config.ToString()));
+      if (!is_first) StrAppend(result, ", ");
+      StrAppend(result, key);
+      StrAppend(result, "=");
+      StrAppend(result, config.ToString());
+      is_first = false;
     }
-    contents.push_back(absl::StrCat("typed_per_filter_config={",
-                                    absl::StrJoin(parts, ", "), "}"));
+    StrAppend(result, "}");
   }
-  return absl::StrCat("{", absl::StrJoin(contents, ", "), "}");
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -180,36 +212,57 @@ XdsRouteConfigResource::Route::RouteAction::ClusterWeight::ToString() const {
 //
 
 std::string XdsRouteConfigResource::Route::RouteAction::ToString() const {
-  std::vector<std::string> contents;
-  contents.reserve(hash_policies.size());
+  std::string result = "{";
+  bool is_first = true;
   for (const HashPolicy& hash_policy : hash_policies) {
-    contents.push_back(absl::StrCat("hash_policy=", hash_policy.ToString()));
+    StrAppend(result, "hash_policy=");
+    StrAppend(result, hash_policy.ToString());
+    is_first = false;
   }
   if (retry_policy.has_value()) {
-    contents.push_back(absl::StrCat("retry_policy=", retry_policy->ToString()));
+    if (!is_first) StrAppend(result, ", ");
+    StrAppend(result, "retry_policy=");
+    StrAppend(result, retry_policy->ToString());
+    is_first = false;
   }
   Match(
       action,
-      [&contents](const ClusterName& cluster_name) {
-        contents.push_back(
-            absl::StrFormat("Cluster name: %s", cluster_name.cluster_name));
+      [&](const ClusterName& cluster_name) {
+        if (!is_first) StrAppend(result, ", ");
+        StrAppend(result, "cluster_name=");
+        StrAppend(result, cluster_name.cluster_name);
+        is_first = false;
       },
-      [&contents](const std::vector<ClusterWeight>& weighted_clusters) {
-        for (const ClusterWeight& cluster_weight : weighted_clusters) {
-          contents.push_back(cluster_weight.ToString());
+      [&](const std::vector<ClusterWeight>& weighted_clusters) {
+        if (!is_first) StrAppend(result, ", ");
+        StrAppend(result, "weighted_clusters=[");
+        for (size_t i = 0; i < weighted_clusters.size(); ++i) {
+          if (i > 0) StrAppend(result, ", ");
+          StrAppend(result, weighted_clusters[i].ToString());
         }
+        StrAppend(result, "]");
+        is_first = false;
       },
-      [&contents](
-          const ClusterSpecifierPluginName& cluster_specifier_plugin_name) {
-        contents.push_back(absl::StrFormat(
-            "Cluster specifier plugin name: %s",
-            cluster_specifier_plugin_name.cluster_specifier_plugin_name));
+      [&](const ClusterSpecifierPluginName& cluster_specifier_plugin_name) {
+        if (!is_first) StrAppend(result, ", ");
+        StrAppend(result, "cluster_specifier_plugin_name=");
+        StrAppend(result,
+                  cluster_specifier_plugin_name.cluster_specifier_plugin_name);
+        is_first = false;
       });
   if (max_stream_duration.has_value()) {
-    contents.push_back(max_stream_duration->ToString());
+    if (!is_first) StrAppend(result, ", ");
+    StrAppend(result, ", max_stream_duration=");
+    StrAppend(result, max_stream_duration->ToString());
+    is_first = false;
   }
-  if (auto_host_rewrite) contents.push_back("auto_host_rewrite=true");
-  return absl::StrCat("{", absl::StrJoin(contents, ", "), "}");
+  if (auto_host_rewrite) {
+    if (!is_first) StrAppend(result, ", ");
+    StrAppend(result, "auto_host_rewrite=true");
+    is_first = false;
+  }
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -217,26 +270,32 @@ std::string XdsRouteConfigResource::Route::RouteAction::ToString() const {
 //
 
 std::string XdsRouteConfigResource::Route::ToString() const {
-  std::vector<std::string> contents;
-  contents.push_back(matchers.ToString());
-  auto* route_action =
-      std::get_if<XdsRouteConfigResource::Route::RouteAction>(&action);
-  if (route_action != nullptr) {
-    contents.push_back(absl::StrCat("route=", route_action->ToString()));
-  } else if (std::holds_alternative<
-                 XdsRouteConfigResource::Route::NonForwardingAction>(action)) {
-    contents.push_back("non_forwarding_action={}");
-  } else {
-    contents.push_back("unknown_action={}");
-  }
+  std::string result = "{matchers=";
+  StrAppend(result, matchers.ToString());
+  Match(
+      action,
+      [&](const UnknownAction&) {
+        StrAppend(result, ",\n  unknown_action={}");
+      },
+      [&](const RouteAction& route_action) {
+        StrAppend(result, ",\n  route_action=");
+        StrAppend(result, route_action.ToString());
+      },
+      [&](const NonForwardingAction&) {
+        StrAppend(result, ",\n  non_forwarding_action={}");
+      });
   if (!typed_per_filter_config.empty()) {
-    contents.push_back("typed_per_filter_config={");
+    StrAppend(result, ",\n  typed_per_filter_config={");
     for (const auto& [name, config] : typed_per_filter_config) {
-      contents.push_back(absl::StrCat("  ", name, "=", config.ToString()));
+      StrAppend(result, "\n    ");
+      StrAppend(result, name);
+      StrAppend(result, "=");
+      StrAppend(result, config.ToString());
     }
-    contents.push_back("}");
+    StrAppend(result, "\n  }");
   }
-  return absl::StrJoin(contents, "\n");
+  StrAppend(result, "}");
+  return result;
 }
 
 //
@@ -244,26 +303,27 @@ std::string XdsRouteConfigResource::Route::ToString() const {
 //
 
 std::string XdsRouteConfigResource::VirtualHost::ToString() const {
-  std::vector<std::string> parts;
-  parts.push_back(
-      absl::StrCat("vhost={\n"
-                   "  domains=[",
-                   absl::StrJoin(domains, ", "),
-                   "]\n"
-                   "  routes=[\n"));
+  std::string result = "{domains=[";
+  bool is_first = true;
+  for (const std::string& domain : domains) {
+    if (!is_first) StrAppend(result, ", ");
+    StrAppend(result, domain);
+    is_first = false;
+  }
+  StrAppend(result, "]\n  routes=[");
   for (const XdsRouteConfigResource::Route& route : routes) {
-    parts.push_back("    {\n");
-    parts.push_back(route.ToString());
-    parts.push_back("\n    }\n");
+    StrAppend(result, "\n    ");
+    StrAppend(result, route.ToString());
   }
-  parts.push_back("  ]\n");
-  parts.push_back("  typed_per_filter_config={\n");
+  StrAppend(result, "  ]\n  typed_per_filter_config={");
   for (const auto& [name, config] : typed_per_filter_config) {
-    parts.push_back(absl::StrCat("    ", name, "=", config.ToString(), "\n"));
+    StrAppend(result, "\n    ");
+    StrAppend(result, name);
+    StrAppend(result, "=");
+    StrAppend(result, config.ToString());
   }
-  parts.push_back("  }\n");
-  parts.push_back("}\n");
-  return absl::StrJoin(parts, "");
+  StrAppend(result, "\n  }}");
+  return result;
 }
 
 //
@@ -271,17 +331,28 @@ std::string XdsRouteConfigResource::VirtualHost::ToString() const {
 //
 
 std::string XdsRouteConfigResource::ToString() const {
-  std::vector<std::string> parts;
-  parts.reserve(virtual_hosts.size());
-  for (const VirtualHost& vhost : virtual_hosts) {
-    parts.push_back(vhost.ToString());
+  std::string result = "{vhosts=[";
+  for (size_t i = 0; i < virtual_hosts.size(); ++i) {
+    StrAppend(result, i > 0 ? ",\n  " : "\n  ");
+    StrAppend(result, virtual_hosts[i].ToString());
   }
-  parts.push_back("cluster_specifier_plugins={\n");
-  for (const auto& [name, plugin] : cluster_specifier_plugin_map) {
-    parts.push_back(absl::StrFormat("%s={%s}\n", name, plugin));
+  StrAppend(result, "\n  ]");
+  if (!cluster_specifier_plugin_map.empty()) {
+    if (!virtual_hosts.empty()) StrAppend(result, ",");
+    StrAppend(result, "\n  cluster_specifier_plugins={");
+    bool is_first = true;
+    for (const auto& [name, plugin] : cluster_specifier_plugin_map) {
+      StrAppend(result, is_first ? "\n    " : ",\n    ");
+      StrAppend(result, name);
+      StrAppend(result, "={");
+      StrAppend(result, plugin);
+      StrAppend(result, "}\n");
+      is_first = false;
+    }
+    StrAppend(result, "}");
   }
-  parts.push_back("}");
-  return absl::StrJoin(parts, "");
+  StrAppend(result, "}");
+  return result;
 }
 
 }  // namespace grpc_core

data/src/core/xds/grpc/xds_server_grpc.cc

@@ -28,6 +28,7 @@
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
+#include "src/core/util/string.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
@@ -204,33 +205,41 @@ void GrpcXdsServer::JsonPostLoad(const Json& json, const JsonArgs& args,
 }
 
 std::string GrpcXdsServer::Key() const {
-  std::vector<std::string> parts;
-  parts.push_back("{");
-  parts.push_back(absl::StrCat("target=", server_target_->Key()));
+  std::string result = "{target=";
+  StrAppend(result, server_target_->Key());
   if (!server_features_.empty()) {
-    parts.push_back(absl::StrCat("server_features=[",
-                                 absl::StrJoin(server_features_, ","), "]"));
+    StrAppend(result, ", server_features=[");
+    bool is_first = true;
+    for (const auto& feature : server_features_) {
+      if (!is_first) StrAppend(result, ", ");
+      StrAppend(result, feature);
+      is_first = false;
+    }
+    StrAppend(result, "]");
   }
-  parts.push_back("}");
-  return absl::StrJoin(parts, ",");
+  StrAppend(result, "}");
+  return result;
 }
 
 std::string GrpcXdsServerTarget::Key() const {
-  std::vector<std::string> parts;
-  parts.push_back("{");
-  parts.push_back(absl::StrCat("server_uri=", server_uri_));
+  std::string result = "{server_uri=";
+  StrAppend(result, server_uri_);
   if (channel_creds_config_ != nullptr) {
-    parts.push_back(
-        absl::StrCat("channel_creds={type=", channel_creds_config_->type(),
-                     ", config=", channel_creds_config_->ToString(), "}"));
+    StrAppend(result, ", channel_creds={type=");
+    StrAppend(result, channel_creds_config_->type());
+    StrAppend(result, ", config=");
+    StrAppend(result, channel_creds_config_->ToString());
+    StrAppend(result, "}");
   }
   for (const auto& call_creds_config : call_creds_configs_) {
-    parts.push_back(absl::StrCat("call_creds={type=", call_creds_config->type(),
-                                 ", config=", call_creds_config->ToString(),
-                                 "}"));
+    StrAppend(result, ", call_creds={type=");
+    StrAppend(result, call_creds_config->type());
+    StrAppend(result, ", config=");
+    StrAppend(result, call_creds_config->ToString());
+    StrAppend(result, "}");
   }
-  parts.push_back("}");
-  return absl::StrJoin(parts, ",");
+  StrAppend(result, "}");
+  return result;
 }
 
 bool GrpcXdsServerTarget::Equals(const XdsServerTarget& other) const {

data/src/ruby/bin/math_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 
 descriptor_data = "\n\nmath.proto\x12\x04math\",\n\x07\x44ivArgs\x12\x10\n\x08\x64ividend\x18\x01 \x01(\x03\x12\x0f\n\x07\x64ivisor\x18\x02 \x01(\x03\"/\n\x08\x44ivReply\x12\x10\n\x08quotient\x18\x01 \x01(\x03\x12\x11\n\tremainder\x18\x02 \x01(\x03\"\x18\n\x07\x46ibArgs\x12\r\n\x05limit\x18\x01 \x01(\x03\"\x12\n\x03Num\x12\x0b\n\x03num\x18\x01 \x01(\x03\"\x19\n\x08\x46ibReply\x12\r\n\x05\x63ount\x18\x01 \x01(\x03\x32\xa4\x01\n\x04Math\x12&\n\x03\x44iv\x12\r.math.DivArgs\x1a\x0e.math.DivReply\"\x00\x12.\n\x07\x44ivMany\x12\r.math.DivArgs\x1a\x0e.math.DivReply\"\x00(\x01\x30\x01\x12#\n\x03\x46ib\x12\r.math.FibArgs\x1a\t.math.Num\"\x00\x30\x01\x12\x1f\n\x03Sum\x12\t.math.Num\x1a\t.math.Num\"\x00(\x01\x62\x06proto3"
 
-pool = Google::Protobuf::DescriptorPool.generated_pool
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
 
 module Math

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

@@ -154,21 +154,7 @@ def have_ruby_abi_version()
   # See also discussion for Ruby 3.4 in https://github.com/grpc/grpc/pull/38338 and https://github.com/grpc/grpc/pull/38487
   return false if RUBY_PATCHLEVEL >= 0
 
-  min_version = Gem::Version.new('3.2')
-
-  begin
-    current_version = Gem::Version.new(RUBY_VERSION)
-    if current_version >= min_version
-      puts "Ruby version #{RUBY_VERSION} >= 3.2. Assuming ruby_abi_version symbol is present."
-      true
-    else
-      puts "Ruby version #{RUBY_VERSION} < 3.2. Assuming ruby_abi_version symbol is NOT present."
-      false
-    end
-  rescue ArgumentError
-    puts "Failed to parse ruby version  #{RUBY_VERSION}. Assuming ruby_abi_version symbol is NOT present."
-    false
-  end
+  true
 end
 
 def ext_export_filename()

data/src/ruby/ext/grpc/rb_call_credentials.c

@@ -306,6 +306,7 @@ static VALUE grpc_rb_call_credentials_compose(int argc, VALUE* argv,
     return self;
   }
   mark = rb_ary_new();
+  rb_ary_push(mark, self);
   creds = grpc_rb_get_wrapped_call_credentials(self);
   for (int i = 0; i < argc; i++) {
     rb_ary_push(mark, argv[i]);

data/src/ruby/ext/grpc/rb_grpc_imports.generated.c

@@ -107,6 +107,7 @@ grpc_local_credentials_create_type grpc_local_credentials_create_import;
 grpc_local_server_credentials_create_type grpc_local_server_credentials_create_import;
 grpc_tls_credentials_options_set_check_call_host_type grpc_tls_credentials_options_set_check_call_host_import;
 grpc_tls_credentials_options_set_tls_session_key_log_file_path_type grpc_tls_credentials_options_set_tls_session_key_log_file_path_import;
+grpc_tls_credentials_options_set_key_exchange_groups_type grpc_tls_credentials_options_set_key_exchange_groups_import;
 grpc_metadata_array_init_type grpc_metadata_array_init_import;
 grpc_metadata_array_destroy_type grpc_metadata_array_destroy_import;
 grpc_call_details_init_type grpc_call_details_init_import;
@@ -395,6 +396,7 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_local_server_credentials_create_import = (grpc_local_server_credentials_create_type) GetProcAddress(library, "grpc_local_server_credentials_create");
   grpc_tls_credentials_options_set_check_call_host_import = (grpc_tls_credentials_options_set_check_call_host_type) GetProcAddress(library, "grpc_tls_credentials_options_set_check_call_host");
   grpc_tls_credentials_options_set_tls_session_key_log_file_path_import = (grpc_tls_credentials_options_set_tls_session_key_log_file_path_type) GetProcAddress(library, "grpc_tls_credentials_options_set_tls_session_key_log_file_path");
+  grpc_tls_credentials_options_set_key_exchange_groups_import = (grpc_tls_credentials_options_set_key_exchange_groups_type) GetProcAddress(library, "grpc_tls_credentials_options_set_key_exchange_groups");
   grpc_metadata_array_init_import = (grpc_metadata_array_init_type) GetProcAddress(library, "grpc_metadata_array_init");
   grpc_metadata_array_destroy_import = (grpc_metadata_array_destroy_type) GetProcAddress(library, "grpc_metadata_array_destroy");
   grpc_call_details_init_import = (grpc_call_details_init_type) GetProcAddress(library, "grpc_call_details_init");

data/src/ruby/ext/grpc/rb_grpc_imports.generated.h

@@ -297,6 +297,9 @@ extern grpc_tls_credentials_options_set_check_call_host_type grpc_tls_credential
 typedef void(*grpc_tls_credentials_options_set_tls_session_key_log_file_path_type)(grpc_tls_credentials_options* options, const char* path);
 extern grpc_tls_credentials_options_set_tls_session_key_log_file_path_type grpc_tls_credentials_options_set_tls_session_key_log_file_path_import;
 #define grpc_tls_credentials_options_set_tls_session_key_log_file_path grpc_tls_credentials_options_set_tls_session_key_log_file_path_import
+typedef void(*grpc_tls_credentials_options_set_key_exchange_groups_type)(grpc_tls_credentials_options* options, const grpc_tls_key_exchange_group* groups, size_t num_groups);
+extern grpc_tls_credentials_options_set_key_exchange_groups_type grpc_tls_credentials_options_set_key_exchange_groups_import;
+#define grpc_tls_credentials_options_set_key_exchange_groups grpc_tls_credentials_options_set_key_exchange_groups_import
 typedef void(*grpc_metadata_array_init_type)(grpc_metadata_array* array);
 extern grpc_metadata_array_init_type grpc_metadata_array_init_import;
 #define grpc_metadata_array_init grpc_metadata_array_init_import

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

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.80.0'
+  VERSION = '1.81.0'
 end

data/src/ruby/pb/generate_proto_ruby.sh

@@ -20,7 +20,7 @@ cd $(dirname $0)/../../..
 # protoc and grpc_*_plugin binaries can be obtained by running
 # $ bazel build @com_google_protobuf//:protoc //src/compiler:all
 PROTOC=bazel-bin/external/protobuf+/protoc
-PLUGIN=protoc-gen-grpc=bazel-bin/src/compiler/grpc_ruby_plugin
+PLUGIN=protoc-gen-grpc=bazel-bin/src/compiler/grpc_ruby_plugin_binary
 
 $PROTOC -I src/proto src/proto/grpc/health/v1/health.proto \
     --grpc_out=src/ruby/pb \

data/src/ruby/pb/grpc/health/v1/health_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 
 descriptor_data = "\n\x1bgrpc/health/v1/health.proto\x12\x0egrpc.health.v1\"%\n\x12HealthCheckRequest\x12\x0f\n\x07service\x18\x01 \x01(\t\"\xa9\x01\n\x13HealthCheckResponse\x12\x41\n\x06status\x18\x01 \x01(\x0e\x32\x31.grpc.health.v1.HealthCheckResponse.ServingStatus\"O\n\rServingStatus\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SERVING\x10\x01\x12\x0f\n\x0bNOT_SERVING\x10\x02\x12\x13\n\x0fSERVICE_UNKNOWN\x10\x03\x32\xae\x01\n\x06Health\x12P\n\x05\x43heck\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse\x12R\n\x05Watch\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse0\x01\x42\x61\n\x11io.grpc.health.v1B\x0bHealthProtoP\x01Z,google.golang.org/grpc/health/grpc_health_v1\xaa\x02\x0eGrpc.Health.V1b\x06proto3"
 
-pool = Google::Protobuf::DescriptorPool.generated_pool
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
 
 module Grpc

data/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 
 descriptor_data = "\n\"src/proto/grpc/testing/empty.proto\x12\x0cgrpc.testing\"\x07\n\x05\x45mptyb\x06proto3"
 
-pool = Google::Protobuf::DescriptorPool.generated_pool
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
 
 module Grpc

data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 
 descriptor_data = "\n%src/proto/grpc/testing/messages.proto\x12\x0cgrpc.testing\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"@\n\x07Payload\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x0c\n\x04\x62ody\x18\x02 \x01(\x0c\"+\n\nEchoStatus\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xc3\x03\n\rSimpleRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x15\n\rresponse_size\x18\x02 \x01(\x05\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x15\n\rfill_username\x18\x04 \x01(\x08\x12\x18\n\x10\x66ill_oauth_scope\x18\x05 \x01(\x08\x12\x34\n\x13response_compressed\x18\x06 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x32\n\x11\x65xpect_compressed\x18\x08 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x16\n\x0e\x66ill_server_id\x18\t \x01(\x08\x12\x1e\n\x16\x66ill_grpclb_route_type\x18\n \x01(\x08\x12;\n\x15orca_per_query_report\x18\x0b \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"\xbe\x01\n\x0eSimpleResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boauth_scope\x18\x03 \x01(\t\x12\x11\n\tserver_id\x18\x04 \x01(\t\x12\x38\n\x11grpclb_route_type\x18\x05 \x01(\x0e\x32\x1d.grpc.testing.GrpclbRouteType\x12\x10\n\x08hostname\x18\x06 \x01(\t\"w\n\x19StreamingInputCallRequest\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x32\n\x11\x65xpect_compressed\x18\x02 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"=\n\x1aStreamingInputCallResponse\x12\x1f\n\x17\x61ggregated_payload_size\x18\x01 \x01(\x05\"d\n\x12ResponseParameters\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\x13\n\x0binterval_us\x18\x02 \x01(\x05\x12+\n\ncompressed\x18\x03 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"\x9f\x02\n\x1aStreamingOutputCallRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12=\n\x13response_parameters\x18\x02 \x03(\x0b\x32 .grpc.testing.ResponseParameters\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x35\n\x0forca_oob_report\x18\x08 \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"E\n\x1bStreamingOutputCallResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\"3\n\x0fReconnectParams\x12 \n\x18max_reconnect_backoff_ms\x18\x01 \x01(\x05\"3\n\rReconnectInfo\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\nbackoff_ms\x18\x02 \x03(\x05\"X\n\x18LoadBalancerStatsRequest\x12\x10\n\x08num_rpcs\x18\x01 \x01(\x05\x12\x13\n\x0btimeout_sec\x18\x02 \x01(\x05\x12\x15\n\rmetadata_keys\x18\x03 \x03(\t\"\xb2\x08\n\x19LoadBalancerStatsResponse\x12M\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x37.grpc.testing.LoadBalancerStatsResponse.RpcsByPeerEntry\x12\x14\n\x0cnum_failures\x18\x02 \x01(\x05\x12Q\n\x0erpcs_by_method\x18\x03 \x03(\x0b\x32\x39.grpc.testing.LoadBalancerStatsResponse.RpcsByMethodEntry\x12W\n\x11metadatas_by_peer\x18\x04 \x03(\x0b\x32<.grpc.testing.LoadBalancerStatsResponse.MetadatasByPeerEntry\x1ao\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x42\n\x04type\x18\x03 \x01(\x0e\x32\x34.grpc.testing.LoadBalancerStatsResponse.MetadataType\x1aV\n\x0bRpcMetadata\x12G\n\x08metadata\x18\x01 \x03(\x0b\x32\x35.grpc.testing.LoadBalancerStatsResponse.MetadataEntry\x1a[\n\x0eMetadataByPeer\x12I\n\x0crpc_metadata\x18\x01 \x03(\x0b\x32\x33.grpc.testing.LoadBalancerStatsResponse.RpcMetadata\x1a\x99\x01\n\nRpcsByPeer\x12X\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x42.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer.RpcsByPeerEntry\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1ag\n\x11RpcsByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x41\n\x05value\x18\x02 \x01(\x0b\x32\x32.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer:\x02\x38\x01\x1an\n\x14MetadatasByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x45\n\x05value\x18\x02 \x01(\x0b\x32\x36.grpc.testing.LoadBalancerStatsResponse.MetadataByPeer:\x02\x38\x01\"6\n\x0cMetadataType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07INITIAL\x10\x01\x12\x0c\n\x08TRAILING\x10\x02\"%\n#LoadBalancerAccumulatedStatsRequest\"\xd8\x07\n$LoadBalancerAccumulatedStatsResponse\x12v\n\x1anum_rpcs_started_by_method\x18\x01 \x03(\x0b\x32N.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsStartedByMethodEntryB\x02\x18\x01\x12z\n\x1cnum_rpcs_succeeded_by_method\x18\x02 \x03(\x0b\x32P.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsSucceededByMethodEntryB\x02\x18\x01\x12t\n\x19num_rpcs_failed_by_method\x18\x03 \x03(\x0b\x32M.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsFailedByMethodEntryB\x02\x18\x01\x12`\n\x10stats_per_method\x18\x04 \x03(\x0b\x32\x46.grpc.testing.LoadBalancerAccumulatedStatsResponse.StatsPerMethodEntry\x1a=\n\x1bNumRpcsStartedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a?\n\x1dNumRpcsSucceededByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a<\n\x1aNumRpcsFailedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\xae\x01\n\x0bMethodStats\x12\x14\n\x0crpcs_started\x18\x01 \x01(\x05\x12Z\n\x06result\x18\x02 \x03(\x0b\x32J.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats.ResultEntry\x1a-\n\x0bResultEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1au\n\x13StatsPerMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12M\n\x05value\x18\x02 \x01(\x0b\x32>.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats:\x02\x38\x01\"\xba\x02\n\x16\x43lientConfigureRequest\x12;\n\x05types\x18\x01 \x03(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12?\n\x08metadata\x18\x02 \x03(\x0b\x32-.grpc.testing.ClientConfigureRequest.Metadata\x12\x13\n\x0btimeout_sec\x18\x03 \x01(\x05\x1a\x62\n\x08Metadata\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\")\n\x07RpcType\x12\x0e\n\nEMPTY_CALL\x10\x00\x12\x0e\n\nUNARY_CALL\x10\x01\"\x19\n\x17\x43lientConfigureResponse\"\x19\n\nMemorySize\x12\x0b\n\x03rss\x18\x01 \x01(\x03\"\xb6\x02\n\x0eTestOrcaReport\x12\x17\n\x0f\x63pu_utilization\x18\x01 \x01(\x01\x12\x1a\n\x12memory_utilization\x18\x02 \x01(\x01\x12\x43\n\x0crequest_cost\x18\x03 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.RequestCostEntry\x12\x42\n\x0butilization\x18\x04 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.UtilizationEntry\x1a\x32\n\x10RequestCostEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x1a\x32\n\x10UtilizationEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\"V\n\x16SetReturnStatusRequest\x12\x1b\n\x13grpc_code_to_return\x18\x01 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x02 \x01(\t\"\xe7\x01\n\x0bHookRequest\x12=\n\x07\x63ommand\x18\x01 \x01(\x0e\x32,.grpc.testing.HookRequest.HookRequestCommand\x12\x1b\n\x13grpc_code_to_return\x18\x02 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x03 \x01(\t\x12\x13\n\x0bserver_port\x18\x04 \x01(\x05\"F\n\x12HookRequestCommand\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\t\n\x05START\x10\x01\x12\x08\n\x04STOP\x10\x02\x12\n\n\x06RETURN\x10\x03\"\x0e\n\x0cHookResponse*\x1f\n\x0bPayloadType\x12\x10\n\x0c\x43OMPRESSABLE\x10\x00*o\n\x0fGrpclbRouteType\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_UNKNOWN\x10\x00\x12\x1e\n\x1aGRPCLB_ROUTE_TYPE_FALLBACK\x10\x01\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_BACKEND\x10\x02\x42\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
 
-pool = Google::Protobuf::DescriptorPool.generated_pool
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
 
 module Grpc

data/src/ruby/pb/src/proto/grpc/testing/test_pb.rb

@@ -10,7 +10,7 @@ require 'src/proto/grpc/testing/messages_pb'
 
 descriptor_data = "\n!src/proto/grpc/testing/test.proto\x12\x0cgrpc.testing\x1a\"src/proto/grpc/testing/empty.proto\x1a%src/proto/grpc/testing/messages.proto2\xcb\x05\n\x0bTestService\x12\x35\n\tEmptyCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x46\n\tUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12O\n\x12\x43\x61\x63heableUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12l\n\x13StreamingOutputCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse0\x01\x12i\n\x12StreamingInputCall\x12\'.grpc.testing.StreamingInputCallRequest\x1a(.grpc.testing.StreamingInputCallResponse(\x01\x12i\n\x0e\x46ullDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12i\n\x0eHalfDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2U\n\x14UnimplementedService\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2\x89\x01\n\x10ReconnectService\x12;\n\x05Start\x12\x1d.grpc.testing.ReconnectParams\x1a\x13.grpc.testing.Empty\x12\x38\n\x04Stop\x12\x13.grpc.testing.Empty\x1a\x1b.grpc.testing.ReconnectInfo2\x86\x02\n\x18LoadBalancerStatsService\x12\x63\n\x0eGetClientStats\x12&.grpc.testing.LoadBalancerStatsRequest\x1a\'.grpc.testing.LoadBalancerStatsResponse\"\x00\x12\x84\x01\n\x19GetClientAccumulatedStats\x12\x31.grpc.testing.LoadBalancerAccumulatedStatsRequest\x1a\x32.grpc.testing.LoadBalancerAccumulatedStatsResponse\"\x00\x32\xcc\x01\n\x0bHookService\x12\x30\n\x04Hook\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12L\n\x0fSetReturnStatus\x12$.grpc.testing.SetReturnStatusRequest\x1a\x13.grpc.testing.Empty\x12=\n\x11\x43learReturnStatus\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2\xd5\x01\n\x16XdsUpdateHealthService\x12\x36\n\nSetServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x39\n\rSetNotServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12H\n\x0fSendHookRequest\x12\x19.grpc.testing.HookRequest\x1a\x1a.grpc.testing.HookResponse2{\n\x1fXdsUpdateClientConfigureService\x12X\n\tConfigure\x12$.grpc.testing.ClientConfigureRequest\x1a%.grpc.testing.ClientConfigureResponseB\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
 
-pool = Google::Protobuf::DescriptorPool.generated_pool
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
 
 module Grpc