gritz-native 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11284795837121fb007d3158c2fa704281946741d262e2101cf0ab3b134183e5
-  data.tar.gz: b1c1a7c414f1b3f435af88183f8da23dd7aaabcff4591355dbfdd138deeffcb0
+  metadata.gz: c84c8135c9f1374962f4dd07181d16d2568498ceb55c4eb03c7d0dce59d475d8
+  data.tar.gz: c4dbff62a8188ea82f4c49eb4a7b470a4fee5cbf9199489f88bbab74b8ee08fb
 SHA512:
-  metadata.gz: 832837820eb0ecb86bef7fe3cf84514f52a22b92933fb08bf9fd8d3cb48fee690585ba42c853bee984bdd801fb93c7fdaa96e5a873ffee93b976b417f99f08b0
-  data.tar.gz: f7b4a6ba6ba8ad367db6d6d486fc041471f73a7fa72663ed90ee71ed1445122d287c92c2ceaef986b9b7572445f3c03960e4a65f01af4588be904b2c67d251a8
+  metadata.gz: c61a25e22d150d219828f0a07f9dc39069fb792b3c8b5fefd82b6af6637071d7849df836736bcfe600da23eff7d8f39d604f8b5602966768e92dcc3915f71fb1
+  data.tar.gz: 1d4279464949f4bfacaf45405bc9c670de00b25673d3a5dc6ec941de86c24bd9cb475b6db5790000425fb6c74883042515f65b645b5fefb875e33ebfb739723b

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.0
+
+- Connect `Gritz::Client` to all four native RPC forms with shared worker-local channels and deferred credentials.
+- Cancel unfinished response streams and decode downstream status, trailers and protobuf rich error details into typed Gritz errors.
+- Pass retry and load-balancing service configuration to the native channel.
+- Run installed worker telemetry with real-server test helpers and close it after the final RPC observations.
+
 ## 0.3.0
 
 - Serve TLS and mTLS connections and expose authenticated client certificates to handlers.

data/README.md

@@ -10,6 +10,10 @@ require "gritz/native"
 
 The entry point loads `gritz-core` and registers `Gritz::Transport::Native`. The configuration value is `transport :native`. Use [gritz](https://github.com/gritzrpc/gritz) for the default combination and executable. The Fiber adapter `gritz-async` is planned separately.
 
+The adapter also connects `Gritz::Client.define` to all four RPC forms, sharing channels within each worker and creating fresh connections after fork. It cancels unfinished streams, decodes rich downstream errors, and passes retry/load-balancing configuration to C-core. See the [client guide](https://github.com/gritzrpc/gritz-core/blob/main/docs/guides/clients.md).
+
+The [three-service integration report](https://github.com/gritzrpc/gritz-otel/blob/main/docs/reports/T4-08-client-chain.md) records worker-local channels, propagated deadlines, connected server/client spans and real OTLP/HTTP metrics.
+
 ```ruby
 Gritz::Testing::Server.start(controllers: [GreeterController]) do |server|
   stub = Helloworld::Greeter::Stub.new(server.address, :this_channel_is_insecure)

data/lib/gritz/native/version.rb

@@ -2,6 +2,6 @@
 
 module Gritz
   module Native
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/gritz/native.rb

@@ -12,4 +12,7 @@ require_relative "transport/native/call"
 require_relative "transport/native/bridge"
 require_relative "transport/native/server"
 require_relative "transport/native/health"
+require_relative "transport/native/client"
 require_relative "testing/server"
+
+Gritz::Client.adapter = Gritz::Transport::Native::Client

data/lib/gritz/testing/server.rb

@@ -39,10 +39,11 @@ module Gritz
         begin
           @config.preload! if @config.preload_app?
           router = Router.new(controllers: @config.controllers, strict: @config.strict_routes, logger: @logger)
-          dispatcher = Dispatcher.new(router:, middleware: @config.middleware, logger: @logger)
-          @transport = Transport::Native.new(config: @config, dispatcher:, logger: @logger)
           @lifecycle_started = true
           @config.run_hooks(:on_worker_boot, 0)
+          @recorder = @config.metrics_recorder_factory&.call(worker: 0)
+          dispatcher = Dispatcher.new(router:, middleware: @config.middleware, logger: @logger, metrics: @recorder)
+          @transport = Transport::Native.new(config: @config, dispatcher:, logger: @logger)
           @port = transport.bind
           @address = @config.bind.sub(/:\d+\z/, ":#{port}")
           transport.start
@@ -63,16 +64,30 @@ module Gritz
         return if @stopped
 
         @stopped = true
+        deadline = monotonic + @config.shutdown_timeout
         begin
           @health_stop&.push(true)
-          if @health_thread && !@health_thread.join(@config.shutdown_timeout)
+          if @health_thread && !@health_thread.join([deadline - monotonic, 0].max)
             @health_thread.kill.join
           end
-          transport&.stop(deadline: Time.now + @config.shutdown_timeout)
+          transport&.stop(deadline: Time.now + [deadline - monotonic, 0].max)
         ensure
-          @config.run_hooks(:on_worker_shutdown, 0) if @lifecycle_started
+          begin
+            @config.run_hooks(:on_worker_shutdown, 0) if @lifecycle_started
+          ensure
+            begin
+              @recorder&.observe_rejected(transport.stats.fetch(:rejected_total, 0)) if transport
+              @recorder&.observe_worker({ pid: Process.pid, index: 0, state: "stopped" })
+            ensure
+              @recorder&.close(timeout: [deadline - monotonic, 0].max)
+            end
+          end
         end
       end
+
+      private
+
+      def monotonic = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
   end
 end

data/lib/gritz/transport/native/client.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "client_invocation"
+
+module Gritz
+  module Transport
+    class Native
+      # Builds official gRPC connections only on the first process-local client call.
+      # @api private
+      class Client
+        Connection = Struct.new(:target, :credentials, :args, :channel, keyword_init: true)
+
+        def self.connect(target:, credentials:, args:)
+          resolved = credentials.respond_to?(:call) ? credentials.call : credentials
+          resolved = :this_channel_is_insecure if resolved == :insecure
+          channel_credentials = resolved.is_a?(GRPC::Core::CallCredentials) ? GRPC::Core::ChannelCredentials.new : resolved
+          channel = GRPC::ClientStub.setup_channel(nil, target, channel_credentials, args.dup)
+          Connection.new(target:, credentials: resolved, args:, channel:)
+        end
+
+        def self.invoke(stub_class:, connection:, method:, request:, options:, around:, &)
+          stub = stub_class.new(connection.target, connection.credentials,
+                                channel_override: connection.channel, channel_args: connection.args.dup)
+          stub.extend(ClientInvocation)
+          stub.instance_variable_set(:@gritz_around, around)
+          stub.public_send(method, request, options, &)
+        end
+      end
+    end
+  end
+end

data/lib/gritz/transport/native/client_invocation.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Gritz
+  module Transport
+    class Native
+      # Captures the generated stub's route and keeps middleware around native completion.
+      # @api private
+      module ClientInvocation
+        { request_response: :unary, client_streamer: :client_streaming,
+          server_streamer: :server_streaming, bidi_streamer: :bidi }.each do |native_method, kind|
+          define_method(native_method) do |method, request, marshal, unmarshal, **options, &block|
+            terminal = lambda do |context, &_reply|
+              execute_gritz_client(context) do |response|
+                input = context.method.client_streaming? ? context.each_request : context.request
+                super(method, input, marshal, unmarshal, **context.options.merge(return_op: true), &response)
+              end
+            end
+            @gritz_around.call(terminal, method:, kind:, request:, options:, &block)
+          end
+        end
+
+        private
+
+        def execute_gritz_client(context)
+          context.check_deadline!
+          context.check_cancelled!
+          response = if context.method.server_streaming?
+                       lambda do |message|
+                         context.check_deadline!
+                         context.check_cancelled!
+                         context.response_block.call(message)
+                       end
+                     end
+          operation = yield(response)
+          context.operation = operation
+          result = operation.execute
+          completed = true
+          result
+        rescue GRPC::BadStatus => e
+          raise decode_gritz_error(e)
+        ensure
+          if operation && !completed
+            context.store[:gritz_cancelled] = true
+            cancel_gritz_operation(operation)
+          end
+        end
+
+        def cancel_gritz_operation(operation)
+          operation.cancel
+        rescue GRPC::Core::CallError
+          # A received non-OK status may already have closed the native call.
+          nil
+        end
+
+        def decode_gritz_error(error)
+          status = begin
+            error.to_rpc_status
+          rescue Google::Protobuf::ParseError, TypeError, ArgumentError
+            nil
+          end
+          details = if status && status.code == error.code
+                      status.details.map { |any| decode_gritz_detail(any) }
+                    else
+                      []
+                    end
+          code = error.code.is_a?(Integer) && (1...Errors::CODES.length).cover?(error.code) ? error.code : 2
+          klass = Errors.for_code(code)
+          klass.new(error.details, details:, metadata: error.metadata.dup, remote: true)
+        end
+
+        def decode_gritz_detail(any)
+          descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(any.type_name)
+          descriptor.respond_to?(:msgclass) ? any.unpack(descriptor.msgclass) : any
+        rescue Google::Protobuf::ParseError, TypeError, ArgumentError
+          any
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritz-native
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yudai Takada
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,8 @@ files:
 - lib/gritz/transport/native.rb
 - lib/gritz/transport/native/bridge.rb
 - lib/gritz/transport/native/call.rb
+- lib/gritz/transport/native/client.rb
+- lib/gritz/transport/native/client_invocation.rb
 - lib/gritz/transport/native/health.rb
 - lib/gritz/transport/native/server.rb
 homepage: https://github.com/gritzrpc/gritz-native