grpc 1.62.0-x86-linux → 1.63.0-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2acbe1523cf3e6bd330134b4989dd66b3927ee5f2889a90f158f927bc150a613
-  data.tar.gz: 8c35f87791f87b9ef7eb7cd471c27d4fead01eb7a795de215719dadea1b2b432
+  metadata.gz: 7212c9b768f35bfdfa374e234e55a780017fe20b7fc958e1f39d135a2020435a
+  data.tar.gz: b567e51647677338abebef457ba4976fb33d5bbc22eedbc4c10ee1e635b4347b
 SHA512:
-  metadata.gz: b811dd479d258003bf424b9cc2b50e32068da396dd0b594e887e27ad2080edc15bec6464a7e81cdd334a9065cf6365ac3b9cfc2d56e9f0437c04e62321d2921c
-  data.tar.gz: 3ccc244f956b212f65b26ba93e65c44b8c83699d2ca0321c40774c3b0ba96a25cf3ecd25025449d709734b7db5b2671a58ab328b2ff71d7d88b49085adffa49e
+  metadata.gz: 18ea54f9519199bf1bdfc29c5b5434c4be9f318caa964c0470c4b73b16c14602dc5b35a63b2a08d38b6ee4661ed1bd28ba6f9e22021d2d57fa948f431d6d1e38
+  data.tar.gz: d52a2e07d259be3bb5782f74fea59345d712f32c79106c2545a5cc17916538225110ae2ade2a732b9be83f1bfa7cf43e93c9fcfe4874da20ac601b5228d2943f

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

@@ -100,8 +100,6 @@ ENV['EMBED_OPENSSL'] = (RUBY_ENGINE != 'truffleruby').to_s
 # Don't embed on TruffleRuby (the system zlib is already linked for the zlib C extension, slow build times)
 ENV['EMBED_ZLIB'] = (RUBY_ENGINE != 'truffleruby').to_s
 
-ENV['EMBED_CARES'] = 'true'
-
 ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
 if apple_toolchain && !cross_compiling
   if RUBY_PLATFORM =~ /arm64/
@@ -192,7 +190,6 @@ if grpc_config == 'dbg'
   $CFLAGS << ' -O0'
 end
 
-$LDFLAGS << ' -Wl,-wrap,memcpy' if linux
 # Do not statically link standard libraries on TruffleRuby as this does not work when compiling to bitcode
 if linux && RUBY_ENGINE != 'truffleruby'
   $LDFLAGS << ' -static-libgcc -static-libstdc++'

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

@@ -467,6 +467,7 @@ void Init_grpc_c() {
   grpc_rb_mGrpcCore = rb_define_module_under(grpc_rb_mGRPC, "Core");
   grpc_rb_sNewServerRpc = rb_struct_define(
       "NewServerRpc", "method", "host", "deadline", "metadata", "call", NULL);
+  rb_global_variable(&grpc_rb_sStatus);
   grpc_rb_sStatus = rb_const_get(rb_cStruct, rb_intern("Status"));
   sym_code = ID2SYM(rb_intern("code"));
   sym_details = ID2SYM(rb_intern("details"));

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

@@ -64,7 +64,6 @@ grpc_completion_queue_destroy_type grpc_completion_queue_destroy_import;
 grpc_completion_queue_thread_local_cache_init_type grpc_completion_queue_thread_local_cache_init_import;
 grpc_completion_queue_thread_local_cache_flush_type grpc_completion_queue_thread_local_cache_flush_import;
 grpc_channel_check_connectivity_state_type grpc_channel_check_connectivity_state_import;
-grpc_channel_num_external_connectivity_watchers_type grpc_channel_num_external_connectivity_watchers_import;
 grpc_channel_watch_connectivity_state_type grpc_channel_watch_connectivity_state_import;
 grpc_channel_support_connectivity_watcher_type grpc_channel_support_connectivity_watcher_import;
 grpc_channel_create_call_type grpc_channel_create_call_import;
@@ -355,7 +354,6 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_completion_queue_thread_local_cache_init_import = (grpc_completion_queue_thread_local_cache_init_type) GetProcAddress(library, "grpc_completion_queue_thread_local_cache_init");
   grpc_completion_queue_thread_local_cache_flush_import = (grpc_completion_queue_thread_local_cache_flush_type) GetProcAddress(library, "grpc_completion_queue_thread_local_cache_flush");
   grpc_channel_check_connectivity_state_import = (grpc_channel_check_connectivity_state_type) GetProcAddress(library, "grpc_channel_check_connectivity_state");
-  grpc_channel_num_external_connectivity_watchers_import = (grpc_channel_num_external_connectivity_watchers_type) GetProcAddress(library, "grpc_channel_num_external_connectivity_watchers");
   grpc_channel_watch_connectivity_state_import = (grpc_channel_watch_connectivity_state_type) GetProcAddress(library, "grpc_channel_watch_connectivity_state");
   grpc_channel_support_connectivity_watcher_import = (grpc_channel_support_connectivity_watcher_type) GetProcAddress(library, "grpc_channel_support_connectivity_watcher");
   grpc_channel_create_call_import = (grpc_channel_create_call_type) GetProcAddress(library, "grpc_channel_create_call");

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

@@ -167,9 +167,6 @@ extern grpc_completion_queue_thread_local_cache_flush_type grpc_completion_queue
 typedef grpc_connectivity_state(*grpc_channel_check_connectivity_state_type)(grpc_channel* channel, int try_to_connect);
 extern grpc_channel_check_connectivity_state_type grpc_channel_check_connectivity_state_import;
 #define grpc_channel_check_connectivity_state grpc_channel_check_connectivity_state_import
-typedef int(*grpc_channel_num_external_connectivity_watchers_type)(grpc_channel* channel);
-extern grpc_channel_num_external_connectivity_watchers_type grpc_channel_num_external_connectivity_watchers_import;
-#define grpc_channel_num_external_connectivity_watchers grpc_channel_num_external_connectivity_watchers_import
 typedef void(*grpc_channel_watch_connectivity_state_type)(grpc_channel* channel, grpc_connectivity_state last_observed_state, gpr_timespec deadline, grpc_completion_queue* cq, void* tag);
 extern grpc_channel_watch_connectivity_state_type grpc_channel_watch_connectivity_state_import;
 #define grpc_channel_watch_connectivity_state grpc_channel_watch_connectivity_state_import

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

@@ -169,10 +169,13 @@ module GRPC
       batch_result = @call.run_batch(ops)
       unless @metadata_received
         @call.metadata = batch_result.metadata
-        @metadata_received = true
       end
       set_input_stream_done
       attach_status_results_and_complete_call(batch_result)
+    ensure
+      # Ensure we don't attempt to request the initial metadata again
+      # in case an exception occurs.
+      @metadata_received = true
     end
 
     def attach_status_results_and_complete_call(recv_status_batch_result)
@@ -258,12 +261,15 @@ module GRPC
       batch_result = @call.run_batch(ops)
       unless @metadata_received
         @call.metadata = batch_result.metadata
-        @metadata_received = true
       end
       get_message_from_batch_result(batch_result)
     rescue GRPC::Core::CallError => e
       GRPC.logger.info("remote_read: #{e}")
       nil
+    ensure
+      # Ensure we don't attempt to request the initial metadata again
+      # in case an exception occurs.
+      @metadata_received = true
     end
 
     def get_message_from_batch_result(recv_message_batch_result)

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

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

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

@@ -61,6 +61,7 @@ FailingStub = FailingService.rpc_stub_class
 class SlowService
   include GRPC::GenericService
   rpc :an_rpc, EchoMsg, EchoMsg
+  rpc :a_server_streaming_rpc, EchoMsg, stream(EchoMsg)
   attr_reader :received_md, :delay
 
   def initialize(_default_var = 'ignored')
@@ -74,6 +75,13 @@ class SlowService
     @received_md << call.metadata unless call.metadata.nil?
     req  # send back the req as the response
   end
+
+  def a_server_streaming_rpc(_, call)
+    GRPC.logger.info("starting a slow #{@delay} server streaming rpc")
+    sleep @delay
+    @received_md << call.metadata unless call.metadata.nil?
+    [EchoMsg.new, EchoMsg.new]
+  end
 end
 
 SlowStub = SlowService.rpc_stub_class
@@ -410,6 +418,23 @@ describe GRPC::RpcServer do
         t.join
       end
 
+      it 'should raise DeadlineExceeded', server: true do
+        service = SlowService.new
+        @srv.handle(service)
+        t = Thread.new { @srv.run }
+        @srv.wait_till_running
+        req = EchoMsg.new
+        stub = SlowStub.new(@host, :this_channel_is_insecure, **client_opts)
+        timeout = service.delay - 0.1
+        deadline = GRPC::Core::TimeConsts.from_relative_time(timeout)
+        responses = stub.a_server_streaming_rpc(req,
+                                                deadline: deadline,
+                                                metadata: { k1: 'v1', k2: 'v2' })
+        expect { responses.to_a }.to raise_error(GRPC::DeadlineExceeded)
+        @srv.stop
+        t.join
+      end
+
       it 'should handle cancellation correctly', server: true do
         request_received = false
         request_received_mu = Mutex.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.62.0
+  version: 1.63.0
 platform: x86-linux
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby