gruf-prometheus 1.3.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9125b43ec8d517f1bf324d3d3400f182638f95d74aff3c15aaebdd165ac373da
-  data.tar.gz: 25a42e807dd8271ee51b1bf034bdffd604d942a2e4ce431942d7b5442a9aa641
+  metadata.gz: e4d188e003e056aad2639d57d67d87455f6ee1e579191337a94f8d8234f630c0
+  data.tar.gz: 92ebeb27934e4d4966663a70e2c6d4f32ac35571958f582fae1d332d0c390a12
 SHA512:
-  metadata.gz: 208c6b8581538e752a792e27677dc28ce6da9169805d823a890848f636588556d526a6bbb0879beda0605133cde09b090226f3f2da85c81867753a090fe2f852
-  data.tar.gz: 16278ab75bb295ed885aec4f4d641fc4841db3ecb63782b5bc608db22fe56f7ede66d6ecea3f564ec730b563499053129d73c346531dd0fc2ff70a4716a0a7d4
+  metadata.gz: 9c2973b859cffa4a72ef328fec5013c4977a28a21eef80098f9abe010b7c2766f771e924ce52342def4a917088cfe686ddc622aa26224cf832b0245718ea152a
+  data.tar.gz: 339f3d05134b151167c7af0f59685a669ac5d967d950ddd4e12129712e942664328c518795aaa482d5873377cd5267ddf74e4ae47d9becf75ad418c3502977f0

data/CHANGELOG.md

@@ -2,6 +2,22 @@ Changelog for the gruf-prometheus gem.
 
 ### Pending Release
 
+### 2.2.0
+
+- Add Ruby 3.1 support
+- Drop support for Ruby 2.6
+- Add CircleCI test suite for Ruby 3.1
+
+### 2.1.0
+
+- Add Ruby 3 support
+
+### 2.0.0
+
+- Add server interceptor for measuring counters/histograms for server metrics
+- Add client interceptor for measuring counters/histograms for client metrics
+- Bump Rubocop to 1.1, remove development dependency on null_logger
+
 ### 1.3.0
 
 - Drop Ruby < 2.6 support

data/README.md

@@ -1,8 +1,8 @@
 # gruf-prometheus - Prometheus support for gruf
 
-[![CircleCI](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/master.svg?style=svg)](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/master)  [![Gem Version](https://badge.fury.io/rb/gruf-prometheus.svg)](https://badge.fury.io/rb/gruf-prometheus) [![Documentation](https://inch-ci.org/github/bigcommerce/gruf-prometheus.svg?branch=master)](https://inch-ci.org/github/bigcommerce/gruf-prometheus?branch=master)
+[![CircleCI](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/main.svg?style=svg)](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/main)  [![Gem Version](https://badge.fury.io/rb/gruf-prometheus.svg)](https://badge.fury.io/rb/gruf-prometheus) [![Documentation](https://inch-ci.org/github/bigcommerce/gruf-prometheus.svg?branch=main)](https://inch-ci.org/github/bigcommerce/gruf-prometheus?branch=main)
 
-Adds Prometheus support for [gruf](https://github.com/bigcommerce/gruf) 2.7.0+.
+Adds Prometheus support for [gruf](https://github.com/bigcommerce/gruf) 2.7.0+. Supports Ruby 2.7-3.1.
 
 ## Installation
 
@@ -24,18 +24,118 @@ Then `bundle exec gruf` and you'll automatically have prometheus metrics for you
 
 The gruf server will by default run on port 9394, and can be scraped at `/metrics`.
 
+## Integrations
+
+### System Metrics
+
+The gem comes with general system metrics out of the box that illustrate server health/statistics:
+
+|Name|Type|Description|
+|---|---|---|
+|ruby_grpc_pool_jobs_waiting_total|gauge|Number of jobs in the gRPC thread pool that are actively waiting|
+|ruby_grpc_pool_ready_workers_total|gauge|The amount of non-busy workers in the thread pool|
+|ruby_grpc_pool_workers_total|gauge|Number of workers in the gRPC thread pool|
+|ruby_grpc_pool_initial_size|gauge|Initial size of the gRPC thread pool|
+|ruby_grpc_poll_period|gauge|Polling period for the gRPC thread pool|
+
+### Server Metrics
+
+Furthermore, the server interceptor measures general counts (and optionally, latencies), and can be setup via:
+
+```ruby
+::Gruf.interceptors.use(::Gruf::Prometheus::Server::Interceptor)
+```
+
+This will output the following metrics:
+
+|Name|Type|Description|
+|---|---|---|
+|ruby_grpc_server_started_total|counter|Total number of RPCs started on the server|
+|ruby_grpc_server_handled_total|counter|Total number of RPCs completed on the server, regardless of success or failure|
+|ruby_grpc_server_handled_latency_seconds|histogram|Histogram of response latency of RPCs handled by the server, in seconds|
+
+Note that the histogram is disabled by default - you'll have to turn it on either through the `server_measure_latency`
+configuration yielded in `Gruf::Prometheus.configure`, or through the `PROMETHEUS_SERVER_MEASURE_LATENCY` environment
+variable. Also, the `measure_latency: true` option can be passed as a second argument to `Gruf.interceptors.use` to 
+configure this directly in the interceptor.
+
+The precedence order for this is, from first to last, with last taking precedence:
+1) `measure_latency: true` passed into the interceptor 
+2) `Gruf::Prometheus.configure` explicit setting globally
+3) `PROMETHEUS_SERVER_MEASURE_LATENCY` ENV var globally. This is the only value set by default - to `false` - and will
+   be the default unless other methods are invoked.
+
+### Client Metrics
+
+gruf-prometheus can also measure gruf client timings, via the interceptor:
+
+```ruby
+Gruf::Client.new(
+  service: MyService,
+  client_options: {
+    interceptors: [Gruf::Prometheus::Client::Interceptor.new]
+  }
+)
+``` 
+
+|Name|Type|Description|
+|---|---|---|
+|ruby_grpc_client_started_total|counter|Total number of RPCs started by the client|
+|ruby_grpc_client_completed|counter|Total number of RPCs completed by the client, regardless of success or failure|
+|ruby_grpc_client_completed_latency_seconds|histogram|Histogram of response latency of RPCs completed by the client, in seconds|
+
+Note that the histogram is disabled by default - you'll have to turn it on either through the `client_measure_latency`
+configuration yielded in `Gruf::Prometheus.configure`, or through the `PROMETHEUS_CLIENT_MEASURE_LATENCY` environment
+variable. Optionally, you can pass in `measure_latency: true` into the Interceptor directly as an option argument in the 
+initializer. 
+
+The precedence order for this is, from first to last, with last taking precedence:
+1) `measure_latency: true` passed into the interceptor 
+2) `Gruf::Prometheus.configure` explicit setting globally
+3) `PROMETHEUS_CLIENT_MEASURE_LATENCY` ENV var globally. This is the only value set by default - to `false` - and will
+   be the default unless other methods are invoked. 
+
+### Running the Client Interceptor in Non-gRPC Processes
+
+One caveat is that you _must_ have the appropriate Type Collector setup in whatever process you are running in. If
+you are already doing this in a gruf gRPC service that is using the hook provided by this gem above, no further 
+configuration is needed. Otherwise, in whatever bc-prometheus-ruby configuration you have setup, you'll need to ensure
+the type collector is loaded: 
+
+```ruby
+# prometheus_server is whatever `::Bigcommerce::Prometheus::Server` instance you are using in the current process
+# Often hooks into these are exposed as configuration options, e.g. `web_collectors`, `resque_collectors`, etc
+prometheus_server.add_type_collector(::Gruf::Prometheus::Client::TypeCollector.new)  
+```
+
+Note that you don't need to do this for the `Gruf::Prometheus::Client::Collector`, as it is an on-demand collector
+that does not run in a threaded loop.  
+
+See [bc-prometheus-ruby](https://github.com/bigcommerce/bc-prometheus-ruby#custom-server-integrations)'s documentation
+on custom server integrations for more information.
+
 ## Configuration
 
-You can further configure via bc-prometheus-ruby with:
+You can further configure `Gruf::Prometheus` globally using the block syntax:
+
+```ruby
+Gruf::Prometheus.configure do |config|
+  # config here
+end
+```
+
+where the options available are:
+
+| Option | Description | Default | ENV Name |
+| ------ | ----------- | ------- | -------- |
+| process_label | The label to use for metric prefixing | grpc | PROMETHEUS_PROCESS_LABEL |
+| process_name | Label to use for process name in logging | grpc | PROMETHEUS_PROCESS_NAME | 	
+| collection_frequency | The period in seconds in which to collect metrics | 30 | PROMETHEUS_COLLECTION_FREQUENCY |
+| collectors | Any collectors you would like to start with the server. Passed as a hash of collector class => options | {} | |
+| type_collectors | Any type collectors you would like to start with the server. Passed as an array of collector objects | [] | |
+| server_measure_latency| Whether or not to measure latency as a histogram for servers | 0 | PROMETHEUS_SERVER_MEASURE_LATENCY |
+| client_measure_latency| Whether or not to measure latency as a histogram for clients | 0 | PROMETHEUS_CLIENT_MEASURE_LATENCY |
 
-| Option | Description | Default |
-| ------ | ----------- | ------- |
-| process_label | The label to use for metric prefixing | grpc |
-| process_name | Label to use for process name in logging | grpc | 	
-| collection_frequency | The period in seconds in which to collect metrics | 30 |
-| collectors | Any collectors you would like to start with the server. Passed as a hash of collector class => options | {} |
-| type_collectors | Any type collectors you would like to start with the server. Passed as an array of collector objects | [] |
-        
 ## License
 
 Copyright (c) 2019-present, BigCommerce Pty. Ltd. All rights reserved 

data/gruf-prometheus.gemspec

@@ -15,7 +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.
 #
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'gruf/prometheus/version'
 
 Gem::Specification.new do |spec|
@@ -31,17 +31,21 @@ Gem::Specification.new do |spec|
 
   spec.files         = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'gruf-prometheus.gemspec']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6'
-
-  spec.add_development_dependency 'rake', '>= 10.0'
-  spec.add_development_dependency 'rspec', '>= 3.8'
-  spec.add_development_dependency 'rspec_junit_formatter', '>= 0.4'
-  spec.add_development_dependency 'bundler-audit', '>= 0.6'
-  spec.add_development_dependency 'rubocop', '>= 0.68'
-  spec.add_development_dependency 'simplecov', '>= 0.16'
-  spec.add_development_dependency 'null-logger', '>= 0.1'
-  spec.add_development_dependency 'pry', '>= 0.12'
+  spec.required_ruby_version = '>= 2.7', '< 4'
 
+  # Runtime dependencies
+  spec.add_runtime_dependency 'bc-prometheus-ruby', '>= 0.5.1'
   spec.add_runtime_dependency 'gruf', '>= 2.7'
-  spec.add_runtime_dependency 'bc-prometheus-ruby', '~> 0.3'
+
+  # Development dependencies
+  spec.add_development_dependency 'bundler-audit', '>= 0.6'
+  spec.add_development_dependency 'pry', '>= 0.13'
+  spec.add_development_dependency 'rake', '>= 13.0'
+  spec.add_development_dependency 'rspec', '>= 3.10'
+  spec.add_development_dependency 'rspec_junit_formatter', '>= 0.4'
+  spec.add_development_dependency 'rubocop', '>= 1.1'
+  spec.add_development_dependency 'rubocop-packaging', '~> 0.5'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.8'
+  spec.add_development_dependency 'rubocop-thread_safety', '~> 0.3'
+  spec.add_development_dependency 'simplecov', '>= 0.19'
 end

data/lib/gruf/prometheus/client/collector.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Client
+      ##
+      # Prometheus instrumentor for gRPC clients
+      #
+      class Collector < Bigcommerce::Prometheus::Collectors::Base
+        RESPONSE_CODE_OK = 'OK'
+
+        ##
+        # @param [Gruf::Outbound::RequestContext] request_context
+        #
+        def started_total(request_context:)
+          push(
+            grpc_client_started_total: 1,
+            custom_labels: custom_labels(request_context: request_context)
+          )
+        end
+
+        ##
+        # @param [Gruf::Controller::RequestContext] request_context
+        # @param [Gruf::Interceptors::Timer::Result] result
+        #
+        def completed(request_context:, result:)
+          push(
+            grpc_client_completed: 1,
+            custom_labels: custom_labels(request_context: request_context, result: result)
+          )
+        end
+
+        ##
+        # @param [Gruf::Outbound::RequestContext] request_context
+        # @param [Gruf::Interceptors::Timer::Result] result
+        #
+        def completed_latency_seconds(request_context:, result:)
+          push(
+            grpc_client_completed_latency_seconds: result.elapsed.to_f,
+            custom_labels: custom_labels(request_context: request_context, result: result)
+          )
+        end
+
+        private
+
+        ##
+        # @param [Gruf::Outbound::RequestContext] request_context
+        # @param [Gruf::Interceptors::Timer::Result|NilClass] result
+        # @return [Hash]
+        #
+        def custom_labels(request_context:, result: nil)
+          labels = {
+            grpc_service: format_service_name(request_context.method.to_s),
+            grpc_method: request_context.method_name,
+            grpc_type: determine_type(request_context)
+          }
+          if result
+            labels[:grpc_code] = result.successful? ? RESPONSE_CODE_OK : result.message_class_name.split('::').last
+          end
+          labels
+        end
+
+        ##
+        # Format the service name as `path.to.Service` (from `/path.to.Service/MethodName`)
+        #
+        # @param [String] name
+        # @return [String]
+        #
+        def format_service_name(name)
+          name.split('/').reject(&:empty?).first
+        end
+
+        ##
+        # @param [Gruf::Outbound::RequestContext] request_context
+        # @return [String]
+        #
+        def determine_type(request_context)
+          case request_context.type.to_sym
+          when :client_streamer
+            Gruf::Prometheus::RequestTypes::CLIENT_STREAM
+          when :server_streamer
+            Gruf::Prometheus::RequestTypes::SERVER_STREAM
+          when :bidi_streamer
+            Gruf::Prometheus::RequestTypes::BIDI_STREAM
+          else
+            Gruf::Prometheus::RequestTypes::UNARY
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/client/interceptor.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Client
+      ##
+      # Server interceptor for measuring counter/timers for gRPC inbound requests
+      #
+      class Interceptor < ::Gruf::Interceptors::ClientInterceptor
+        ##
+        # Intercept the call and send metrics
+        #
+        def call(request_context:, &block)
+          result = ::Gruf::Interceptors::Timer.time(&block)
+
+          send_metrics(request_context: request_context, result: result)
+
+          raise result.message unless result.successful?
+
+          result.message
+        end
+
+        private
+
+        ##
+        # @param [Gruf::Outbound::RequestContext] request_context
+        # @param [Gruf::Interceptors::Timer::Result] result
+        #
+        def send_metrics(request_context:, result:)
+          prometheus_collector.started_total(request_context: request_context)
+          prometheus_collector.completed(request_context: request_context, result: result)
+          prometheus_collector.completed_latency_seconds(request_context: request_context, result: result) if measure_latency?
+        rescue StandardError => e
+          # we don't want this to affect actual RPC execution, so just log an error and move on
+          Gruf.logger.error "Failed registering metric to prometheus type collector: #{e.message} - #{e.class.name}"
+        end
+
+        ##
+        # @return [::Gruf::Prometheus::Client::Collector]
+        #
+        def prometheus_collector
+          @prometheus_collector ||= ::Gruf::Prometheus::Client::Collector.new(type: 'grpc_client')
+        end
+
+        ##
+        # @return [Boolean]
+        #
+        def measure_latency?
+          @measure_latency ||= @options.fetch(:measure_latency, ::Gruf::Prometheus.client_measure_latency)
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/client/type_collector.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Client
+      ##
+      # Type Collector for grpc client metrics
+      #
+      class TypeCollector < Bigcommerce::Prometheus::TypeCollectors::Base
+        def type
+          'grpc_client'
+        end
+
+        private
+
+        ##
+        # Initialize the collector
+        #
+        def build_metrics
+          metrics = {
+            grpc_client_started_total: PrometheusExporter::Metric::Counter.new('grpc_client_started_total', 'Total number of RPCs started by the client'),
+            grpc_client_completed: PrometheusExporter::Metric::Counter.new('grpc_client_completed', 'Total number of RPCs completed by the client, regardless of success or failure')
+          }
+          metrics[:grpc_client_completed_latency_seconds] = PrometheusExporter::Metric::Histogram.new('grpc_client_completed_latency_seconds', 'Histogram of response latency of RPCs completed by the client, in seconds') if measure_latency?
+          metrics
+        end
+
+        ##
+        # Collect the object into the buffer
+        #
+        def collect_metrics(data: {}, labels: {})
+          metric(:grpc_client_started_total)&.observe(data['grpc_client_started_total'].to_i, labels)
+          metric(:grpc_client_completed)&.observe(data['grpc_client_completed'].to_i, labels)
+          metric(:grpc_client_completed_latency_seconds)&.observe(data['grpc_client_completed_latency_seconds'].to_f, labels) if measure_latency?
+        end
+
+        ##
+        # @return [Boolean]
+        #
+        def measure_latency?
+          @measure_latency ||= ::Gruf::Prometheus.client_measure_latency
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/configuration.rb

@@ -26,7 +26,9 @@ module Gruf
         process_name: 'grpc',
         collection_frequency: 30,
         type_collectors: [],
-        collectors: []
+        collectors: [],
+        client_measure_latency: false,
+        server_measure_latency: false
       }.freeze
 
       attr_accessor *VALID_CONFIG_KEYS.keys
@@ -41,13 +43,14 @@ module Gruf
       ##
       # Yield self for ruby-style initialization
       #
-      # @yields [Bigcommerce::Prometheus::Configuration]
-      # @return [Bigcommerce::Prometheus::Configuration]
+      # @yields [Gruf::Prometheus::Configuration]
+      # @return [Gruf::Prometheus::Configuration]
       #
       def configure
         reset unless @configured
         yield self
         @configured = true
+        self
       end
 
       ##
@@ -73,6 +76,8 @@ module Gruf
         self.process_label = ENV.fetch('PROMETHEUS_PROCESS_LABEL', 'grpc').to_s
         self.process_name = ENV.fetch('PROMETHEUS_PROCESS_NAME', 'grpc').to_s
         self.collection_frequency = ENV.fetch('PROMETHEUS_COLLECTION_FREQUENCY', 30).to_i
+        self.server_measure_latency = ENV.fetch('PROMETHEUS_SERVER_MEASURE_LATENCY', 0).to_i.positive?
+        self.client_measure_latency = ENV.fetch('PROMETHEUS_CLIENT_MEASURE_LATENCY', 0).to_i.positive?
       end
 
       ##

data/lib/gruf/prometheus/hook.rb

@@ -29,6 +29,8 @@ module Gruf
       def before_server_start(server:)
         logger.info "[gruf-prometheus][#{::Gruf::Prometheus.process_name}] Starting #{server.class}"
         prometheus_server.add_type_collector(::Gruf::Prometheus::TypeCollector.new)
+        prometheus_server.add_type_collector(::Gruf::Prometheus::Server::TypeCollector.new)
+        prometheus_server.add_type_collector(::Gruf::Prometheus::Client::TypeCollector.new)
         prometheus_server.add_type_collector(::PrometheusExporter::Server::ActiveRecordCollector.new)
         custom_type_collectors.each do |tc|
           prometheus_server.add_type_collector(tc)
@@ -83,7 +85,7 @@ module Gruf
       end
 
       ##
-      # @return [Gruf::Prometheus::Server]
+      # @return [Bigcommerce::Prometheus::Server]
       #
       def prometheus_server
         @prometheus_server ||= ::Bigcommerce::Prometheus::Server.new(
@@ -99,14 +101,14 @@ module Gruf
       # @return [Array<Bigcommerce::Prometheus::TypeCollectors::Base>]
       #
       def custom_type_collectors
-        @options.fetch(:type_collectors, [])
+        @options.fetch(:type_collectors, []) || []
       end
 
       ##
       # @return [Array<Bigcommerce::Prometheus::Collectors::Base>]
       #
       def custom_collectors
-        @options.fetch(:collectors, [])
+        @options.fetch(:collectors, []) || []
       end
     end
   end

data/lib/gruf/prometheus/request_types.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module RequestTypes
+      UNARY = 'UNARY'
+      CLIENT_STREAM = 'CLIENT_STREAM'
+      SERVER_STREAM = 'SERVER_STREAM'
+      BIDI_STREAM = 'BIDI_STREAM'
+    end
+  end
+end

data/lib/gruf/prometheus/server/collector.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Server
+      ##
+      # Prometheus instrumentor for gRPC servers
+      #
+      class Collector < Bigcommerce::Prometheus::Collectors::Base
+        RESPONSE_CODE_OK = 'OK'
+
+        ##
+        # @param [Gruf::Controller::Request] request
+        #
+        def started_total(request:)
+          push(
+            grpc_server_started_total: 1,
+            custom_labels: custom_labels(request: request)
+          )
+        end
+
+        ##
+        # @param [Gruf::Controller::Request] request
+        # @param [Gruf::Interceptors::Timer::Result] result:party
+        #
+        def handled_total(request:, result:)
+          push(
+            grpc_server_handled_total: 1,
+            custom_labels: custom_labels(request: request, result: result)
+          )
+        end
+
+        ##
+        # @param [Gruf::Controller::Request] request
+        # @param [Gruf::Interceptors::Timer::Result] result
+        #
+        def handled_latency_seconds(request:, result:)
+          push(
+            grpc_server_handled_latency_seconds: result.elapsed.to_f,
+            custom_labels: custom_labels(request: request, result: result)
+          )
+        end
+
+        private
+
+        ##
+        # @param [Gruf::Controller::Request] request
+        # @param [Gruf::Interceptors::Timer::Result|NilClass] result
+        # @return [Hash]
+        #
+        def custom_labels(request:, result: nil)
+          labels = {
+            grpc_service: format_grpc_service_name(request.service.name.to_s),
+            grpc_method: format_grpc_method_name(request.method_key.to_s),
+            grpc_type: determine_type(request)
+          }
+          if result
+            labels[:grpc_code] = result.successful? ? RESPONSE_CODE_OK : result.message_class_name.split('::').last
+          end
+          labels
+        end
+
+        ##
+        # Format the service name as `path.to.Service` (from Path::To::Service)
+        #
+        # @param [String] name
+        # @return [String]
+        #
+        def format_grpc_service_name(name)
+          parts = name.split('::')
+          return '' unless parts.any?
+
+          svc = parts.pop.to_s
+          parts.map!(&:downcase)
+          parts << svc
+          parts.join('.')
+        end
+
+        ##
+        # Format the method name as `MethodName` (from method_name)
+        #
+        # @param [String] name
+        # @return [String]
+        #
+        def format_grpc_method_name(name)
+          name.split('_').map(&:capitalize).join
+        end
+
+        ##
+        # @param [Gruf::Controller::Request] request
+        # @return [String]
+        #
+        def determine_type(request)
+          if request.client_streamer?
+            Gruf::Prometheus::RequestTypes::CLIENT_STREAM
+          elsif request.server_streamer?
+            Gruf::Prometheus::RequestTypes::SERVER_STREAM
+          elsif request.bidi_streamer?
+            Gruf::Prometheus::RequestTypes::BIDI_STREAM
+          else
+            Gruf::Prometheus::RequestTypes::UNARY
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/server/interceptor.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Server
+      ##
+      # Server interceptor for measuring counter/timers for gRPC inbound requests
+      #
+      class Interceptor < ::Gruf::Interceptors::ServerInterceptor
+        ##
+        # Intercept the call and send metrics
+        #
+        def call(&block)
+          result = ::Gruf::Interceptors::Timer.time(&block)
+
+          send_metrics(result)
+
+          raise result.message unless result.successful?
+
+          result.message
+        end
+
+        private
+
+        ##
+        # @param [Gruf::Interceptors::Timer::Result] result
+        #
+        def send_metrics(result)
+          prometheus_collector.started_total(request: request)
+          prometheus_collector.handled_total(request: request, result: result)
+          prometheus_collector.handled_latency_seconds(request: request, result: result) if measure_latency?
+        rescue StandardError => e
+          # we don't want this to affect actual RPC execution, so just log an error and move on
+          Gruf.logger.error "Failed registering metric to prometheus type collector: #{e.message} - #{e.class.name}"
+        end
+
+        ##
+        # @return [::Gruf::Prometheus::Server::Collector]
+        #
+        def prometheus_collector
+          @prometheus_collector ||= ::Gruf::Prometheus::Server::Collector.new(type: 'grpc_server')
+        end
+
+        ##
+        # @return [Boolean]
+        #
+        def measure_latency?
+          unless @measure_latency
+            v = @options.fetch(:measure_latency, ::Gruf::Prometheus.server_measure_latency)
+            @measure_latency = v.nil? ? false : v
+          end
+          @measure_latency
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/server/type_collector.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-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 Prometheus
+    module Server
+      ##
+      # Type Collector for grpc server metrics
+      #
+      class TypeCollector < Bigcommerce::Prometheus::TypeCollectors::Base
+        def type
+          'grpc_server'
+        end
+
+        private
+
+        ##
+        # Initialize the collector
+        #
+        def build_metrics
+          metrics = {
+            grpc_server_started_total: PrometheusExporter::Metric::Counter.new('grpc_server_started_total', 'Total number of RPCs started on the server'),
+            grpc_server_handled_total: PrometheusExporter::Metric::Counter.new('grpc_server_handled_total', 'Total number of RPCs completed on the server, regardless of success or failure')
+          }
+          metrics[:grpc_server_handled_latency_seconds] = PrometheusExporter::Metric::Histogram.new('grpc_server_handled_latency_seconds', 'Histogram of response latency of RPCs handled by the server, in seconds') if measure_latency?
+          metrics
+        end
+
+        ##
+        # Collect the object into the buffer
+        #
+        def collect_metrics(data: {}, labels: {})
+          metric(:grpc_server_started_total)&.observe(data['grpc_server_started_total'].to_i, labels)
+          metric(:grpc_server_handled_total)&.observe(data['grpc_server_handled_total'].to_i, labels)
+          metric(:grpc_server_handled_latency_seconds)&.observe(data['grpc_server_handled_latency_seconds'].to_f, labels) if measure_latency?
+        end
+
+        ##
+        # @return [Boolean]
+        #
+        def measure_latency?
+          @measure_latency ||= ::Gruf::Prometheus.server_measure_latency
+        end
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/version.rb

@@ -17,6 +17,6 @@
 #
 module Gruf
   module Prometheus
-    VERSION = '1.3.0'
+    VERSION = '2.2.0'
   end
 end

data/lib/gruf/prometheus.rb

@@ -27,6 +27,13 @@ require 'bigcommerce/prometheus'
 
 require_relative 'prometheus/version'
 require_relative 'prometheus/configuration'
+require_relative 'prometheus/request_types'
+require_relative 'prometheus/server/collector'
+require_relative 'prometheus/server/interceptor'
+require_relative 'prometheus/server/type_collector'
+require_relative 'prometheus/client/collector'
+require_relative 'prometheus/client/interceptor'
+require_relative 'prometheus/client/type_collector'
 require_relative 'prometheus/collector'
 require_relative 'prometheus/type_collector'
 require_relative 'prometheus/hook'

metadata

@@ -1,155 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: gruf-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bc-prometheus-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 0.5.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: gruf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: null-logger
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: gruf
+  name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
+        version: '0.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: bc-prometheus-ruby
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-thread_safety
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
 description: Prometheus support for gruf
 email:
 - shaun.mccormick@bigcommerce.com
@@ -162,9 +190,16 @@ files:
 - README.md
 - gruf-prometheus.gemspec
 - lib/gruf/prometheus.rb
+- lib/gruf/prometheus/client/collector.rb
+- lib/gruf/prometheus/client/interceptor.rb
+- lib/gruf/prometheus/client/type_collector.rb
 - lib/gruf/prometheus/collector.rb
 - lib/gruf/prometheus/configuration.rb
 - lib/gruf/prometheus/hook.rb
+- lib/gruf/prometheus/request_types.rb
+- lib/gruf/prometheus/server/collector.rb
+- lib/gruf/prometheus/server/interceptor.rb
+- lib/gruf/prometheus/server/type_collector.rb
 - lib/gruf/prometheus/type_collector.rb
 - lib/gruf/prometheus/version.rb
 homepage: https://github.com/bigcommerce/gruf-prometheus
@@ -179,14 +214,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Prometheus support for gruf