gruf 2.15.0 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a807b73598db4fb6caf6e0ed79d164342c1f6f0cfa4b0cf03f83f40cb71baabf
-  data.tar.gz: c750eac85c6739048498c5579dabbcf268bc796e998e26c14c7b6e2a96ad3d88
+  metadata.gz: 1f7ea5bc2b3a0c64008a565c470d19b948814f9c636ccdea72b93703f384ca77
+  data.tar.gz: f5a23c82e85208104baec460d93f650e66189dfb3b27dc0c409dc32b21bcda4a
 SHA512:
-  metadata.gz: 0ab26cdfa7b95fc92694dc328ac66b32994f35ddfb5bf9f63fb235256853f77f1b4c382bb01870c1afd5d037a2e915cacc0d5c8c307c30d480b90f5d0b373736
-  data.tar.gz: 06b7a29c4f6bd167178e68d77c4bc68fa704233232b405fa193db8fb4721895391fce58ab70fd06c92ff6a31a4276f20ac8a00a834e0f4c8757ad03f153abeba
+  metadata.gz: b227b3fc5253dbace401291e9643e2703244e9e83020d9516358ed78caef24f56668d61f9411f1b2dc25fa5854d711cc5b54346937f71d6835e00f98cd003e46
+  data.tar.gz: 61f863b87320654ec2b247953b3817ae854ae4e601bc0c09206803a8cc2e453a8f80c77b0679b2cb03f870f5a0ba6c44ca8be8bc2ea6f1d34d0c03c7527b888b

data/CHANGELOG.md

@@ -2,8 +2,28 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.16.1
+
+* Fix issue where default gRPC health check was loaded even if unused or not desired; now only loaded when requested
+
+### 2.16.0
+
+- Add opt-in ability to serve the official [gRPC health check](https://github.com/grpc/grpc/blob/master/src/ruby/pb/grpc/health/v1/health_services_pb.rb)
+  automatically via `health_check_enabled` configuration option (or `GRUF_HEALTH_CHECK_ENABLED` environment
+  variable).
+- Add `health_check_hook` configuration option to implement a custom response for the above gRPC built-in health check
+- [#156] Allow passing a specific list of services to run via the gruf binstub
+- [#163] Add `context` hash attribute to `Gruf::Controllers::Request` to allow interceptors to pass information down
+  to a gruf controller
+- Drop Ruby 2.6 support (EOL'ed on March 31st, 2022)
+
+### 2.15.1
+
+- Fix issue where GRPC_SERVER_POOL_KEEP_ALIVE and GRPC_SERVER_POLL_PERIOD when set via ENV are not cast to int
+
 ### 2.15.0
 
+- NOTE: This changes the way that gruf controllers are autoloaded. See [UPGRADING.md] for more details.
 - Autoload Gruf Controllers with zeitwerk, allowing for code reloading in development environments
 - Add `GRUF_CONTROLLERS_PATH` ENV to allow ENV-based runtime configuration of path to gruf controller files
 - Move `ServiceBinder` from instance to static class for performance improvements

data/gruf.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables << 'gruf'
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6', '< 3.2'
+  spec.required_ruby_version = '>= 2.7', '< 3.2'
 
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/bigcommerce/gruf/issues',
@@ -44,12 +44,7 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_development_dependency 'bundler-audit', '>= 0.6'
-  # rubocop:disable Gemspec/RubyVersionGlobalsUsage
-  spec.add_development_dependency(
-    'factory_bot',
-    (Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5') ? '>= 6.1' : '~> 5.2')
-  )
-  # rubocop:enable Gemspec/RubyVersionGlobalsUsage
+  spec.add_development_dependency 'factory_bot', '>= 6.1'
   spec.add_development_dependency 'ffaker', '>= 2.15'
   spec.add_development_dependency 'pry', '~> 0.12'
   spec.add_development_dependency 'pry-byebug', '>= 3.9'

data/lib/gruf/cli/executor.rb

@@ -52,19 +52,11 @@ module Gruf
       #
       def run
         exception = nil
-        # wait to load controllers until last possible second to allow late configuration
-        ::Gruf.autoloaders.load!(controllers_path: Gruf.controllers_path)
-        # allow lazy registering globally as late as possible, this allows more flexible binstub injections
-        @services = ::Gruf.services unless @services&.any?
 
-        unless @services.any?
-          raise NoServicesBoundError,
-                'No services bound to this gruf process; please bind a service to a Gruf controller ' \
-                'to start the server successfully'
-        end
+        # allow lazy registering globally as late as possible, this allows more flexible binstub injections
+        register_services!
 
         begin
-          @services.each { |s| @server.add_service(s) }
           @hook_executor.call(:before_server_start, server: @server)
           @server.start!
         rescue StandardError => e
@@ -84,14 +76,15 @@ module Gruf
       # Setup options for CLI execution and configure Gruf based on inputs
       #
       def setup!
-        opts = parse_options
+        @options = parse_options
 
-        Gruf.server_binding_url = opts[:host] if opts[:host]
-        if opts.suppress_default_interceptors?
+        Gruf.server_binding_url = @options[:host] if @options[:host]
+        if @options.suppress_default_interceptors?
           Gruf.interceptors.remove(Gruf::Interceptors::ActiveRecord::ConnectionReset)
           Gruf.interceptors.remove(Gruf::Interceptors::Instrumentation::OutputMetadataTimer)
         end
-        Gruf.backtrace_on_error = true if opts.backtrace_on_error?
+        Gruf.backtrace_on_error = true if @options.backtrace_on_error?
+        Gruf.health_check_enabled = true if @options.health_check?
       end
 
       ##
@@ -106,6 +99,8 @@ module Gruf
             exit(0)
           end
           o.string '--host', 'Specify the binding url for the gRPC service'
+          o.string '--services', 'Optional. Run gruf with only the passed gRPC service classes (comma-separated)'
+          o.bool '--health-check', 'Serve the default gRPC health check (defaults to false). '
           o.bool '--suppress-default-interceptors', 'Do not use the default interceptors'
           o.bool '--backtrace-on-error', 'Push backtraces on exceptions to the error serializer'
           o.null '-v', '--version', 'print gruf version' do
@@ -114,6 +109,83 @@ module Gruf
           end
         end
       end
+
+      ##
+      # Register services; note that this happens after gruf is initialized, and right before the server is run.
+      # This will interpret the services to run in the following precedence:
+      # 1. initializer arguments to the executor
+      # 2. ARGV options (the --services option)
+      # 3. services set to the global gruf configuration (Gruf.services)
+      #
+      def register_services!
+        # wait to load controllers until last possible second to allow late configuration
+        ::Gruf.autoloaders.load!(controllers_path: Gruf.controllers_path)
+
+        services = determine_services(@services)
+        services = bind_health_check!(services) if health_check_enabled?
+
+        services.map! { |s| s.is_a?(Class) ? s : s.constantize }
+
+        if services.any?
+          services.each { |s| @server.add_service(s) }
+          return
+        end
+
+        raise NoServicesBoundError
+      rescue NoServicesBoundError
+        @logger.fatal 'FATAL ERROR: No services bound to this gruf process; please bind a service to a Gruf ' \
+                      'controller to start the server successfully'
+        exit(1)
+      rescue NameError => e
+        @logger.fatal 'FATAL ERROR: Could not start server; passed services to run are not loaded or valid ' \
+                      "constants: #{e.message}"
+        exit(1)
+      rescue StandardError => e
+        @logger.fatal "FATAL ERROR: Could not start server: #{e.message}"
+        exit(1)
+      end
+
+      ##
+      # @return [Boolean]
+      #
+      def health_check_enabled?
+        ::Gruf.health_check_enabled
+      end
+
+      ##
+      # Load the health check if enabled into the services array
+      #
+      # @param [Array<Class>] services
+      # @return [Array<Class>]
+      #
+      def bind_health_check!(services)
+        # do this here to trigger autoloading the controller in zeitwerk, since we don't explicitly load this
+        # controller. This binds the service and makes sure the method handlers are setup.
+        require 'gruf/controllers/health_controller'
+        # if we're already bound to the services array (say someone explicitly passes the health check in, skip)
+        return services if services.include?(::Grpc::Health::V1::Health::Service)
+
+        # otherwise, manually add the grpc service
+        services << ::Grpc::Health::V1::Health::Service
+        services
+      end
+
+      ##
+      # Determine how we load services (initializer -> ARGV -> Gruf.services)
+      #
+      # @return [Array<Class>]
+      #
+      def determine_services(services = [])
+        # first check initializer arguments
+        return services if services.any?
+
+        # next check CLI arguments
+        services = @options[:services].to_s.split(',').map(&:strip).uniq
+        # finally, if none, use global gruf autoloaded services
+        services = (::Gruf.services || []) unless services.any?
+
+        services
+      end
     end
   end
 end

data/lib/gruf/configuration.rb

@@ -77,6 +77,13 @@ module Gruf
     #   @return [Integer] Internal cache expiry period (in seconds) for the SynchronizedClient
     # @!attribute rpc_server_options
     #   @return [Hash] A hash of RPC options for GRPC server configuration
+    # @!attribute health_check_enabled
+    #   @return [Boolean] If true, will load and register `Gruf::Controllers::HealthController` with the default gRPC
+    #     health check to the loaded gRPC server
+    # @!attribute health_check_hook
+    #   @return [NilClass]
+    #   @return [Proc] If set, will call this in the gRPC health check. It is required to return a
+    #     `::Grpc::Health::V1::HealthCheckResponse` object in this proc to indicate the health of the server.
     VALID_CONFIG_KEYS = {
       root_path: '',
       server_binding_url: '0.0.0.0:9001',
@@ -101,6 +108,8 @@ module Gruf
       use_exception_message: true,
       internal_error_message: 'Internal Server Error',
       event_listener_proc: nil,
+      health_check_enabled: false,
+      health_check_hook: nil,
       synchronized_client_internal_cache_expiry: 60,
       rpc_server_options: {
         pool_size: GRPC::RpcServer::DEFAULT_POOL_SIZE,
@@ -172,8 +181,8 @@ module Gruf
         max_waiting_requests: ::ENV.fetch('GRPC_SERVER_MAX_WAITING_REQUESTS',
                                           GRPC::RpcServer::DEFAULT_MAX_WAITING_REQUESTS).to_i,
         pool_size: ::ENV.fetch('GRPC_SERVER_POOL_SIZE', GRPC::RpcServer::DEFAULT_POOL_SIZE).to_i,
-        pool_keep_alive: ::ENV.fetch('GRPC_SERVER_POOL_KEEP_ALIVE', GRPC::Pool::DEFAULT_KEEP_ALIVE),
-        poll_period: ::ENV.fetch('GRPC_SERVER_POLL_PERIOD', GRPC::RpcServer::DEFAULT_POLL_PERIOD),
+        pool_keep_alive: ::ENV.fetch('GRPC_SERVER_POOL_KEEP_ALIVE', GRPC::Pool::DEFAULT_KEEP_ALIVE).to_i,
+        poll_period: ::ENV.fetch('GRPC_SERVER_POLL_PERIOD', GRPC::RpcServer::DEFAULT_POLL_PERIOD).to_i,
         connect_md_proc: nil,
         server_args: {}
       }
@@ -181,6 +190,7 @@ module Gruf
         interceptors.use(::Gruf::Interceptors::ActiveRecord::ConnectionReset)
         interceptors.use(::Gruf::Interceptors::Instrumentation::OutputMetadataTimer)
       end
+      self.health_check_enabled = ::ENV.fetch('GRUF_HEALTH_CHECK_ENABLED', 0).to_i.positive?
       options
     end
 

data/lib/gruf/controllers/health_controller.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'grpc/health/v1/health_services_pb'
+
+module Gruf
+  module Controllers
+    ##
+    # Dynamic standard grpc health check controller. Can be used as-is, or can use ::Gruf.health_check_hook to
+    # provide custom responses.
+    #
+    class HealthController < Gruf::Controllers::Base
+      bind ::Grpc::Health::V1::Health::Service
+
+      def check
+        health_proc = ::Gruf.health_check_hook
+        return health_proc.call(request, error) if !health_proc.nil? && health_proc.respond_to?(:call)
+
+        ::Grpc::Health::V1::HealthCheckResponse.new(
+          status: ::Grpc::Health::V1::HealthCheckResponse::ServingStatus::SERVING
+        )
+      end
+    end
+  end
+end

data/lib/gruf/controllers/request.rb

@@ -36,6 +36,11 @@ module Gruf
       # @!attribute [r] service
       #   @return [Class] The GRPC service class for this request
       attr_reader :service
+      # @!attribute [r] context
+      #   @return [::ActiveSupport::HashWithIndifferentAccess] An arbitrary hash of key/value entries that are
+      #     accessible for interceptors, that can be used to shared information between interceptors and pass down into
+      #     the controller.
+      attr_reader :context
 
       delegate :metadata, to: :active_call
       delegate :messages, :client_streamer?, :server_streamer?, :bidi_streamer?, :request_response?, to: :type
@@ -72,6 +77,7 @@ module Gruf
         @message = message
         @rpc_desc = rpc_desc
         @type = Type.new(rpc_desc)
+        @context = ::ActiveSupport::HashWithIndifferentAccess.new
       end
 
       ##

data/lib/gruf/version.rb

@@ -16,5 +16,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.15.0'
+  VERSION = '2.16.1'
 end

data/lib/gruf.rb

@@ -17,6 +17,7 @@
 #
 require 'grpc'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/hash_with_indifferent_access'
 require 'active_support/concern'
 require 'active_support/inflector'
 require 'base64'
@@ -27,6 +28,7 @@ loader = ::Zeitwerk::Loader.new
 loader.tag = File.basename(__FILE__, '.rb')
 loader.inflector = ::Zeitwerk::GemInflector.new(__FILE__)
 loader.ignore("#{__dir__}/gruf/integrations/rails/railtie.rb")
+loader.ignore("#{__dir__}/gruf/controllers/health_controller.rb")
 loader.push_dir(__dir__)
 loader.setup
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -341,6 +341,7 @@ files:
 - lib/gruf/configuration.rb
 - lib/gruf/controllers/autoloader.rb
 - lib/gruf/controllers/base.rb
+- lib/gruf/controllers/health_controller.rb
 - lib/gruf/controllers/request.rb
 - lib/gruf/controllers/service_binder.rb
 - lib/gruf/error.rb
@@ -395,7 +396,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3.2'
@@ -405,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: gRPC Ruby Framework