grpc 1.30.2-x86-linux → 1.31.0.pre1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b0f08711d7858b72b17d5ad14ab7f3a058a6de8464f89a9c0b40b40acfd79ee
-  data.tar.gz: daaf8d7cdb2997b81afa2ba0f536de0d5d6ef252f939f658491b84fddbe82b7c
+  metadata.gz: 62f8c0d65f56ade416c6956da117c2a49e007d330e7652a423e9bd2a449a51c9
+  data.tar.gz: d8cd95311532e1f563523fc2ddecf9e8dbd5efd9864dc7852ba451d399fa5a6d
 SHA512:
-  metadata.gz: 5f10eb8296e77f627fbe649b935c2d2d5049e4b190204b6eb941cd2cd57d21fc9110fa9752ad7dd968c2a796a448362ef33f5e4fbf26624091ad1e766312d093
-  data.tar.gz: 0f4c0e6393ef87401298bca243e577b1ddea1f08b8d09e8b8decd96186c8f7aec790e3b67e8dedc779c99c2d986e262f195790acff3d12abe5d540487c729257
+  metadata.gz: '08d03e4cd384efe73b531d75bfd88dd63dfa18cd2c377c28ec86f9776d9e67621bdc2f60054de6aaa3aee33c8be37ecc4e07a8e97ad80f121bf26495b09f548a'
+  data.tar.gz: 564e65e0ccccda252f12cdb18aff7710b98ef049d7cdfe82fcb8df51556e76d3e8002aaa54ec24e80bda105d7418d4574e2dda6d4d1b15137d9deb8d07194827

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

@@ -25,7 +25,7 @@ grpc_config = ENV['GRPC_CONFIG'] || 'opt'
 ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
 
 if ENV['AR'].nil? || ENV['AR'].size == 0
-    ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
+    ENV['AR'] = RbConfig::CONFIG['AR']
 end
 if ENV['CC'].nil? || ENV['CC'].size == 0
     ENV['CC'] = RbConfig::CONFIG['CC']
@@ -37,7 +37,10 @@ if ENV['LD'].nil? || ENV['LD'].size == 0
     ENV['LD'] = ENV['CC']
 end
 
-ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/
+if RUBY_PLATFORM =~ /darwin/
+  ENV['AR'] = 'libtool'
+  ENV['ARFLAGS'] = '-o'
+ end
 
 ENV['EMBED_OPENSSL'] = 'true'
 ENV['EMBED_ZLIB'] = 'true'

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

@@ -48,7 +48,7 @@ static VALUE grpc_rb_sBatchResult;
 
 /* grpc_rb_cMdAry is the MetadataArray class whose instances proxy
  * grpc_metadata_array. */
-static VALUE grpc_rb_cMdAry;
+VALUE grpc_rb_cMdAry;
 
 /* id_credentials is the name of the hidden ivar that preserves the value
  * of the credentials added to the call */
@@ -103,7 +103,7 @@ static void grpc_rb_call_destroy(void* p) {
   xfree(p);
 }
 
-static const rb_data_type_t grpc_rb_md_ary_data_type = {
+const rb_data_type_t grpc_rb_md_ary_data_type = {
     "grpc_metadata_array",
     {GRPC_RB_GC_NOT_MARKED,
      GRPC_RB_GC_DONT_FREE,
@@ -489,6 +489,7 @@ static int grpc_rb_md_ary_capacity_hash_cb(VALUE key, VALUE val,
 
 /* grpc_rb_md_ary_convert converts a ruby metadata hash into
    a grpc_metadata_array.
+   Note that this function may throw exceptions.
 */
 void grpc_rb_md_ary_convert(VALUE md_ary_hash, grpc_metadata_array* md_ary) {
   VALUE md_ary_obj = Qnil;

data/src/ruby/ext/grpc/rb_call.h

@@ -23,6 +23,10 @@
 
 #include <grpc/grpc.h>
 
+extern const rb_data_type_t grpc_rb_md_ary_data_type;
+
+extern VALUE grpc_rb_cMdAry;
+
 /* Gets the wrapped call from a VALUE. */
 grpc_call* grpc_rb_get_wrapped_call(VALUE v);
 

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

@@ -54,10 +54,41 @@ typedef struct callback_params {
   grpc_credentials_plugin_metadata_cb callback;
 } callback_params;
 
-static VALUE grpc_rb_call_credentials_callback(VALUE callback_args) {
+static VALUE grpc_rb_call_credentials_callback(VALUE args) {
   VALUE result = rb_hash_new();
-  VALUE metadata = rb_funcall(rb_ary_entry(callback_args, 0), rb_intern("call"),
-                              1, rb_ary_entry(callback_args, 1));
+  VALUE callback_func = rb_ary_entry(args, 0);
+  VALUE callback_args = rb_ary_entry(args, 1);
+  VALUE md_ary_obj = rb_ary_entry(args, 2);
+  if (gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    VALUE callback_func_str = rb_funcall(callback_func, rb_intern("to_s"), 0);
+    VALUE callback_args_str = rb_funcall(callback_args, rb_intern("to_s"), 0);
+    VALUE callback_source_info =
+        rb_funcall(callback_func, rb_intern("source_location"), 0);
+    if (callback_source_info != Qnil) {
+      VALUE source_filename = rb_ary_entry(callback_source_info, 0);
+      VALUE source_line_number = rb_funcall(
+          rb_ary_entry(callback_source_info, 1), rb_intern("to_s"), 0);
+      gpr_log(GPR_DEBUG,
+              "GRPC_RUBY: grpc_rb_call_credentials invoking user callback:|%s| "
+              "source_filename:%s line_number:%s with arguments:|%s|",
+              StringValueCStr(callback_func_str),
+              StringValueCStr(source_filename),
+              StringValueCStr(source_line_number),
+              StringValueCStr(callback_args_str));
+    } else {
+      gpr_log(GPR_DEBUG,
+              "GRPC_RUBY: grpc_rb_call_credentials invoking user callback:|%s| "
+              "(failed to get source filename and line) with arguments:|%s|",
+              StringValueCStr(callback_func_str),
+              StringValueCStr(callback_args_str));
+    }
+  }
+  VALUE metadata =
+      rb_funcall(callback_func, rb_intern("call"), 1, callback_args);
+  grpc_metadata_array* md_ary = NULL;
+  TypedData_Get_Struct(md_ary_obj, grpc_metadata_array,
+                       &grpc_rb_md_ary_data_type, md_ary);
+  grpc_rb_md_ary_convert(metadata, md_ary);
   rb_hash_aset(result, rb_str_new2("metadata"), metadata);
   rb_hash_aset(result, rb_str_new2("status"), INT2NUM(GRPC_STATUS_OK));
   rb_hash_aset(result, rb_str_new2("details"), rb_str_new2(""));
@@ -67,14 +98,23 @@ static VALUE grpc_rb_call_credentials_callback(VALUE callback_args) {
 static VALUE grpc_rb_call_credentials_callback_rescue(VALUE args,
                                                       VALUE exception_object) {
   VALUE result = rb_hash_new();
-  VALUE backtrace =
-      rb_funcall(rb_funcall(exception_object, rb_intern("backtrace"), 0),
-                 rb_intern("join"), 1, rb_str_new2("\n\tfrom "));
+  VALUE backtrace = rb_funcall(exception_object, rb_intern("backtrace"), 0);
+  VALUE backtrace_str;
+  if (backtrace != Qnil) {
+    backtrace_str =
+        rb_funcall(backtrace, rb_intern("join"), 1, rb_str_new2("\n\tfrom "));
+  } else {
+    backtrace_str = rb_str_new2(
+        "failed to get backtrace, this exception was likely thrown from native "
+        "code");
+  }
   VALUE rb_exception_info =
       rb_funcall(exception_object, rb_intern("inspect"), 0);
   (void)args;
-  gpr_log(GPR_INFO, "Call credentials callback failed: %s\n%s",
-          StringValueCStr(rb_exception_info), StringValueCStr(backtrace));
+  gpr_log(GPR_INFO,
+          "GRPC_RUBY call credentials callback failed, exception inspect:|%s| "
+          "backtrace:|%s|",
+          StringValueCStr(rb_exception_info), StringValueCStr(backtrace_str));
   rb_hash_aset(result, rb_str_new2("metadata"), Qnil);
   rb_hash_aset(result, rb_str_new2("status"),
                INT2NUM(GRPC_STATUS_UNAUTHENTICATED));
@@ -98,11 +138,15 @@ static void grpc_rb_call_credentials_callback_with_gil(void* param) {
   rb_hash_aset(args, ID2SYM(rb_intern("jwt_aud_uri")), auth_uri);
   rb_ary_push(callback_args, params->get_metadata);
   rb_ary_push(callback_args, args);
+  // Wrap up the grpc_metadata_array into a ruby object and do the conversion
+  // from hash to grpc_metadata_array within the rescue block, because the
+  // conversion can throw exceptions.
+  rb_ary_push(callback_args,
+              TypedData_Wrap_Struct(grpc_rb_cMdAry, &grpc_rb_md_ary_data_type,
+                                    &md_ary));
   result = rb_rescue(grpc_rb_call_credentials_callback, callback_args,
                      grpc_rb_call_credentials_callback_rescue, Qnil);
   // Both callbacks return a hash, so result should be a hash
-  grpc_rb_md_ary_convert(rb_hash_aref(result, rb_str_new2("metadata")),
-                         &md_ary);
   status = NUM2INT(rb_hash_aref(result, rb_str_new2("status")));
   details = rb_hash_aref(result, rb_str_new2("details"));
   error_details = StringValueCStr(details);

data/src/ruby/lib/grpc/generic/interceptors.rb

@@ -172,7 +172,7 @@ module GRPC
       i = @interceptors.pop
       return yield unless i
 
-      i.send(type, args) do
+      i.send(type, **args) do
         if @interceptors.any?
           intercept!(type, args) do
             yield

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.30.2
+  version: 1.31.0.pre1
 platform: x86-linux
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -343,52 +343,52 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.8.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/pb/health/checker_spec.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/testdata/README
+- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/testdata/server1.key
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/debug_message_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
 - src/ruby/spec/pb/codegen/package_option_spec.rb
-- src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/pb/health/checker_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/errors_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/compression_options_spec.rb
 - src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/client_interceptors_spec.rb
 - src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/client_interceptors_spec.rb
 - src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
 - src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/server1.pem
-- src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/server1.key
-- src/ruby/spec/testdata/client.key
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/errors_spec.rb
-- src/ruby/spec/channel_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/call_spec.rb
-- src/ruby/spec/debug_message_spec.rb
-- src/ruby/spec/call_credentials_spec.rb