gruf 2.13.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fdf24359533f0c174160c022698b4c3dff0358700a340f470abf68149619380
-  data.tar.gz: f5a07f92989697f5ca2625f21ab150dad8b0e9c848ace26833e11541bf83f2e8
+  metadata.gz: feddcb49d9325078dfb0d7367f5e82dfea0d46a82e56784b10484c873ab375a5
+  data.tar.gz: b4614f08c2b6d8f62edfc1f34be0dffc7af4825b680e49aaf5c6160315314d32
 SHA512:
-  metadata.gz: 1108582d41b071f520d393e9c4946fe90fe88c93cc26dbbb7c6980b580c586d27ddb69fee0b5ff7a89e2accd4aabd25f39635f0b04833a41eb369ce0b98bf6c0
-  data.tar.gz: 8082bb3b4f30ed4d45d7928fc7c34aaa2b13204d3adca682d9fab51641a72dac3692227edfe789062b2ef1b3e0b78b8cdb495e97c9cfe952bf59a9ee0370f408
+  metadata.gz: 3e67b5fdaf175a0c8b839532d6024415f12c1fdbd91f44fdec5cfa1ac0d7c33e821b740a192f251664f6ff09ef5dc96d903c480a474d2f53d4b876189023550c
+  data.tar.gz: 4061112bf7ea91180fb5ea16d5d135cc3a1a7dab7d94ba479d462f3acca3aa183373f64eb5d8e7d9ad0442a457ed5b25e806e407f27c9d3c6ee0658d153b654c

data/CHANGELOG.md

@@ -2,11 +2,59 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.17.0
+
+* [#179] Add Ruby 3.2 support
+* [#178] Introduce read-write lock for code reloading; cover controller class resolution with code reloading.
+* [#180] Support multiple databases connection reset in `Gruf::Interceptors::ActiveRecord::ConnectionReset`.
+
+### 2.16.2
+
+* [#175] Fix code reload thread-safety. Calls to `Zeitwerk::Loader#setup` are now made in a thread-safe manner.
+
+### 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
+- Use zeitwerk for autoloading
+- Update gem metadata
+- Update `Gruf:Configuration#environment` to use `ENV.fetch`
+
+### 2.14.1
+
+- Fix issue where the server object hits thread contention in certain race conditions
+
+### 2.14.0
+
+- Set default client host to 0.0.0.0:9001 (same as default server host)
+- Add support for Ruby 3.1
+
 ### 2.13.1
 
-- Fix issue with race condition in server starts where servers may fail to bind connections and never reach  
+- Fix issue with race condition in server starts where servers may fail to bind connections and never reach
   serving state (fixes #147)
- 
+
 ### 2.13.0
 
 - Remove server mutex handling in deference to core grpc signal handling
@@ -18,7 +66,7 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### 2.11.0
 
-- Restrict grpc gem to <= 1.41.0 due to regressions in grpc 1.42.x 
+- Restrict grpc gem to <= 1.41.0 due to regressions in grpc 1.42.x
 - Fallback to stdout logger at INFO if no logger is setup
 - Better handling of namespace collisions with Rails
 - Add `GRPC_SERVER_HOST` and `GRPC_SERVER_PORT` for ENV configuration of the server host+port
@@ -58,7 +106,7 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### 2.8.0
 
-- Pass the controller request object into the request logging formatters [#92]  
+- Pass the controller request object into the request logging formatters [#92]
 
 ### 2.7.1
 
@@ -71,12 +119,12 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 ### 2.6.1
 
 - Add frozen_string_literal: true to files, update rubocop to 0.68
-  
+
 ### 2.6.0
 
 - Drop Ruby 2.2 support
-- Abstract gruf controller's send to make it usable in filters 
-- Adjusts configuration reset into a Railtie for Rails systems to ensure proper OOE 
+- Abstract gruf controller's send to make it usable in filters
+- Adjusts configuration reset into a Railtie for Rails systems to ensure proper OOE
 - Bump rubocop to 0.64, address violations, update activesupport/concurrent-ruby dependencies to have a min version
 
 ### 2.5.2

data/README.md

@@ -17,7 +17,7 @@ up fast and efficiently at scale. Some of its features include:
   still preserving gRPC BadStatus codes
 * Server and client execution timings in responses
 
-gruf currently has active support for gRPC 1.10.x+. gruf is compatible and tested with Ruby 2.2-3.0.
+gruf currently has active support for gRPC 1.10.x+. gruf is compatible and tested with Ruby 2.6-3.2.
 gruf is also not [Rails](https://github.com/rails/rails)-specific, and can be used in any Ruby framework
 (such as [Grape](https://github.com/ruby-grape/grape) or [dry-rb](https://dry-rb.org/), for instance).
 

data/gruf.gemspec

@@ -15,8 +15,7 @@
 # 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.
 #
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-require 'gruf/version'
+require_relative 'lib/gruf/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gruf'
@@ -33,17 +32,19 @@ Gem::Specification.new do |spec|
   spec.executables << 'gruf'
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6', '< 3.1'
+  spec.required_ruby_version = '>= 2.7', '< 3.3'
 
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata = {
+    'bug_tracker_uri' => 'https://github.com/bigcommerce/gruf/issues',
+    'changelog_uri' => 'https://github.com/bigcommerce/gruf/CHANGELOG.md',
+    'homepage_uri' => 'https://github.com/bigcommerce/gruf',
+    'rubygems_mfa_required' => 'true',
+    'source_code_uri' => 'https://github.com/bigcommerce/gruf',
+    'wiki_uri' => 'https://github.com/bigcommerce/gruf/wiki'
+  }
 
   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'
@@ -64,4 +65,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json', '>= 2.3'
   spec.add_runtime_dependency 'slop', '>= 4.6'
   spec.add_runtime_dependency 'thwait', '>= 0.1'
+  spec.add_runtime_dependency 'zeitwerk', '>= 2'
 end

data/lib/gruf/autoloaders.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2022-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.
+#
+module Gruf
+  ##
+  # Module for accessing Gruf zeitwerk-based autoloaders
+  #
+  module Autoloaders
+    class << self
+      include Enumerable
+
+      ##
+      # Initialize the autoloaders with a given controllers path
+      #
+      # @param [String] controllers_path The path to Gruf Controllers
+      #
+      def load!(controllers_path:)
+        controllers(controllers_path: controllers_path)
+      end
+
+      ##
+      # Enumerate across the managed set of autoloaders
+      #
+      def each
+        yield controllers
+      end
+
+      ##
+      # Reload all files managed by the autoloader
+      #
+      def reload
+        each(&:reload)
+      end
+
+      ##
+      # Lazily instantiate and memoize the Gruf Controllers autoloader in a thread-safe manner
+      #
+      # @return [::Gruf::Controllers::Autoloader]
+      #
+      # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
+      def controllers(controllers_path: nil)
+        controllers_mutex do
+          @controllers ||= ::Gruf::Controllers::Autoloader.new(path: controllers_path || ::Gruf.controllers_path)
+        end
+      end
+      # rubocop:enable ThreadSafety/InstanceVariableInClassMethod
+
+      ##
+      # Handle mutations to the controllers autoloader in a thread-safe manner
+      #
+      # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
+      def controllers_mutex(&block)
+        @controllers_mutex ||= begin
+          require 'monitor'
+          Monitor.new
+        end
+        @controllers_mutex.synchronize(&block)
+      end
+      # rubocop:enable ThreadSafety/InstanceVariableInClassMethod
+    end
+  end
+end

data/lib/gruf/cli/executor.rb

@@ -23,8 +23,14 @@ module Gruf
     # Handles execution of the gruf binstub, along with command-line arguments
     #
     class Executor
+      class NoServicesBoundError < StandardError; end
+
       ##
       # @param [Hash|ARGV]
+      # @param [::Gruf::Server|NilClass] server
+      # @param [Array<Class>|NilClass] services
+      # @param [Gruf::Hooks::Executor|NilClass] hook_executor
+      # @param [Logger|NilClass] logger
       #
       def initialize(
         args = ARGV,
@@ -35,7 +41,7 @@ module Gruf
       )
         @args = args
         setup! # ensure we set some defaults from CLI here so we can allow configuration
-        @services = services || Gruf.services
+        @services = services.is_a?(Array) ? services : []
         @hook_executor = hook_executor || Gruf::Hooks::Executor.new(hooks: Gruf.hooks&.prepare)
         @server = server || Gruf::Server.new(Gruf.server_options)
         @logger = logger || Gruf.logger || ::Logger.new($stderr)
@@ -46,8 +52,11 @@ module Gruf
       #
       def run
         exception = nil
+
+        # 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
@@ -67,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
 
       ##
@@ -89,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
@@ -97,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/client/error.rb

@@ -37,33 +37,5 @@ module Gruf
         super
       end
     end
-
-    ##
-    # See https://github.com/grpc/grpc-go/blob/master/codes/codes.go for a detailed summary of each error type
-    #
-    module Errors
-      class Base < Gruf::Client::Error; end
-      class Error < Base; end
-      class Validation < Base; end
-
-      class Ok < Base; end
-
-      class InvalidArgument < Validation; end
-      class NotFound < Validation; end
-      class AlreadyExists < Validation; end
-      class OutOfRange < Validation; end
-
-      class Cancelled < Error; end
-      class DataLoss < Error; end
-      class DeadlineExceeded < Error; end
-      class FailedPrecondition < Error; end
-      class Internal < Error; end
-      class PermissionDenied < Error; end
-      class ResourceExhausted < Error; end
-      class Unauthenticated < Error; end
-      class Unavailable < Error; end
-      class Unimplemented < Error; end
-      class Unknown < Error; end
-    end
   end
 end

data/lib/gruf/client/errors.rb

@@ -0,0 +1,48 @@
+# 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.
+#
+module Gruf
+  class Client < SimpleDelegator
+    ##
+    # See https://github.com/grpc/grpc-go/blob/master/codes/codes.go for a detailed summary of each error type
+    #
+    module Errors
+      class Base < Gruf::Client::Error; end
+      class Error < Base; end
+      class Validation < Base; end
+
+      class Ok < Base; end
+
+      class InvalidArgument < Validation; end
+      class NotFound < Validation; end
+      class AlreadyExists < Validation; end
+      class OutOfRange < Validation; end
+
+      class Cancelled < Error; end
+      class DataLoss < Error; end
+      class DeadlineExceeded < Error; end
+      class FailedPrecondition < Error; end
+      class Internal < Error; end
+      class PermissionDenied < Error; end
+      class ResourceExhausted < Error; end
+      class Unauthenticated < Error; end
+      class Unavailable < Error; end
+      class Unimplemented < Error; end
+      class Unknown < Error; end
+    end
+  end
+end

data/lib/gruf/client.rb

@@ -15,9 +15,6 @@
 # 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_relative 'client/error'
-require_relative 'client/error_factory'
-
 module Gruf
   ##
   # Abstracts out the calling interface for interacting with gRPC clients. Streamlines calling and provides

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',
@@ -84,7 +91,7 @@ module Gruf
       interceptors: nil,
       hooks: nil,
       default_channel_credentials: nil,
-      default_client_host: '',
+      default_client_host: '0.0.0.0:9001',
       use_ssl: false,
       ssl_crt_file: '',
       ssl_key_file: '',
@@ -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,
@@ -165,14 +174,15 @@ module Gruf
       determine_loggers
       self.ssl_crt_file = "#{root_path}config/ssl/#{environment}.crt"
       self.ssl_key_file = "#{root_path}config/ssl/#{environment}.key"
-      self.controllers_path = root_path.to_s.empty? ? 'app/rpc' : "#{root_path}/app/rpc"
+      cp = ::ENV.fetch('GRUF_CONTROLLERS_PATH', 'app/rpc').to_s
+      self.controllers_path = root_path.to_s.empty? ? cp : "#{root_path}/#{cp}"
       self.backtrace_on_error = ::ENV.fetch('GRPC_BACKTRACE_ON_ERROR', 0).to_i.positive?
       self.rpc_server_options = {
         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: {}
       }
@@ -180,9 +190,17 @@ 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
 
+    ##
+    # @return [Boolean]
+    #
+    def development?
+      environment == 'development'
+    end
+
     private
 
     ##
@@ -194,7 +212,7 @@ module Gruf
       if defined?(::Rails)
         ::Rails.env.to_s
       else
-        (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development').to_s
+        ENV.fetch('RACK_ENV') { ENV.fetch('RAILS_ENV', 'development') }.to_s
       end
     end
 

data/lib/gruf/controllers/autoloader.rb

@@ -0,0 +1,96 @@
+# 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 'concurrent/atomic/read_write_lock'
+
+module Gruf
+  module Controllers
+    ##
+    # Handles autoloading of Gruf controllers in the application path. This allows for code reloading on Gruf
+    # controllers.
+    #
+    class Autoloader
+      include ::Gruf::Loggable
+
+      # @!attribute [r] path
+      #   @return [String] The path for this autoloader
+      attr_reader :path
+
+      ##
+      # @param [String] path
+      # @param [Boolean] reloading
+      # @param [String] tag
+      #
+      def initialize(path:, reloading: nil, tag: nil)
+        super()
+        @path = path
+        @loader = ::Zeitwerk::Loader.new
+        @loader.tag = tag || 'gruf-controllers'
+        @setup = false
+        @reloading_enabled = reloading || ::Gruf.development?
+        setup!
+      end
+
+      ##
+      # Reload all files managed by the autoloader, if reloading is enabled
+      #
+      def reload
+        return unless @reloading_enabled
+
+        reload_lock.with_write_lock do
+          @loader.reload
+        end
+      end
+
+      def with_fresh_controller(controller_name)
+        return yield(controller_name.constantize) unless @reloading_enabled
+
+        ::Gruf::Autoloaders.reload
+        reload_lock.with_read_lock do
+          yield(controller_name.constantize)
+        end
+      end
+
+      private
+
+      ##
+      # @return [Boolean]
+      #
+      def setup!
+        return true if @setup
+
+        return false unless File.directory?(@path)
+
+        @loader.enable_reloading if @reloading_enabled
+        @loader.ignore("#{@path}/**/*_pb.rb")
+        @loader.push_dir(@path)
+        @loader.setup
+        # always eager load RPC files, so that the service binder can bind the Gruf::Controller instantiation
+        # to the gRPC Service classes
+        @loader.eager_load
+        @setup = true
+      end
+
+      ##
+      # Handle thread-safe access to the loader
+      #
+      def reload_lock
+        @reload_lock ||= Concurrent::ReadWriteLock.new
+      end
+    end
+  end
+end

data/lib/gruf/controllers/base.rb

@@ -15,9 +15,6 @@
 # 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_relative 'request'
-require_relative 'service_binder'
-
 module Gruf
   module Controllers
     ##
@@ -67,11 +64,12 @@ module Gruf
       #
       def self.bind(service)
         service_class = service.name.constantize
-        Gruf.services << service_class
+        ::Gruf.logger.debug "[gruf] Binding #{service_class} to #{name}"
+        ::Gruf.services << service_class
         # rubocop:disable ThreadSafety/InstanceVariableInClassMethod
         @bound_service = service_class
         # rubocop:enable ThreadSafety/InstanceVariableInClassMethod
-        ServiceBinder.new(service_class).bind!(self)
+        ServiceBinder.bind!(service: service_class, controller: self)
       end
 
       ##