gruf-prometheus 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b018ce9929aeaa6b875fc871eb2e9f0fc6a6316d597cb0ad3a68f0d70abcd002
-  data.tar.gz: d83eac2d76d9a8fe1759693c1d3ad9914db1b41b91fe76e78b03181716dd863d
+  metadata.gz: faf2407a0d57a111725037bef23e55ca38ec318ef0307f06f729042dcaab9561
+  data.tar.gz: 561ee316f087f56e485d1ea3debd3c34df3764100babfce3576cfc8e64a19a3a
 SHA512:
-  metadata.gz: 3acba1c39dacafabff26244560105cb91365b2d80d716a3e295bfd4ea29fb07b409623b40331abcb4e1630c721e1272fa2458133e65428ffee050c726c388012
-  data.tar.gz: a328a8c17151ab89e72e441b51946c521238c05a5921c7b68a70b865f06503f4e724cb3d1da2dc9729864775cef34410ba715ae1365f8470c5af556da191374f
+  metadata.gz: 4425dcd1a8861c7f6fefbf27b4cbebe782a9ef246b5819e469944c2ff032a1aef75eac4bd75d0ff5b8b7bfa3de09ad7a7a5062f34d207b713cfe07573b1b3c63
+  data.tar.gz: 18e6cf9983f630798fb73f564fcd50a2f6b3a3852ffe07e93d755f4f73775880373fd82e17f282a487c80877a35f33477b5cf6397754fd16f630ff3bebbed829

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Changelog for the gruf-prometheus gem.
 
 ### Pending Release
 
+### 1.1.0
+
+- Refactor collector/type collector to utilize new base abstractions
+- Bump bc-prometheus-ruby dependency
+
 ### 1.0.2
 
 - Bump bc-prometheus-ruby dependency

data/gruf-prometheus.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '>= 0.12'
 
   spec.add_runtime_dependency 'gruf', '>= 2.7'
-  spec.add_runtime_dependency 'bc-prometheus-ruby', '~> 0.1.5'
+  spec.add_runtime_dependency 'bc-prometheus-ruby', '~> 0.2'
 end

data/lib/gruf/prometheus.rb

@@ -27,8 +27,8 @@ require 'bigcommerce/prometheus'
 
 require_relative 'prometheus/version'
 require_relative 'prometheus/configuration'
-require_relative 'prometheus/collectors/grpc'
-require_relative 'prometheus/type_collectors/grpc'
+require_relative 'prometheus/collector'
+require_relative 'prometheus/type_collector'
 require_relative 'prometheus/hook'
 
 module Gruf

data/lib/gruf/prometheus/collector.rb

@@ -0,0 +1,60 @@
+# 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
+    ##
+    # Prometheus instrumentor for gRPC servers
+    #
+    class Collector < Bigcommerce::Prometheus::Collectors::Base
+      def type
+        'grpc'
+      end
+
+      def collect(metrics = {})
+        metrics[:type] = 'grpc'
+        rpc_server = grpc_server
+        return metrics unless rpc_server
+
+        rpc_server.instance_variable_get(:@run_mutex).synchronize do
+          collect_server_metrics(rpc_server, metrics)
+        end
+        metrics
+      end
+
+      ##
+      # @param [GRPC::RpcServer] rpc_server
+      # @param [Hash] metrics
+      #
+      def collect_server_metrics(rpc_server, metrics)
+        pool = rpc_server.instance_variable_get(:@pool)
+        metrics[:pool_jobs_waiting_total] = pool.jobs_waiting.to_i
+        metrics[:pool_ready_workers_total] = pool.instance_variable_get(:@ready_workers).size
+        metrics[:pool_workers_total] = pool.instance_variable_get(:@workers)&.size
+        metrics[:pool_initial_size] = rpc_server.instance_variable_get(:@pool_size).to_i
+        metrics[:poll_period] = rpc_server.instance_variable_get(:@poll_period).to_i
+      end
+
+      ##
+      # @return [GRPC::RpcServer]
+      #
+      def grpc_server
+        @options.fetch(:server, nil)&.server
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/hook.rb

@@ -28,7 +28,7 @@ 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::TypeCollectors::Grpc.new)
+        prometheus_server.add_type_collector(::Gruf::Prometheus::TypeCollector.new)
         prometheus_server.add_type_collector(::PrometheusExporter::Server::ActiveRecordCollector.new)
         prometheus_server.start
         sleep 2 unless ENV['RACK_ENV'] == 'test' # wait for server to come online
@@ -58,8 +58,10 @@ module Gruf
           client: ::Bigcommerce::Prometheus.client,
           frequency: ::Gruf::Prometheus.collection_frequency
         )
-        ::Gruf::Prometheus::Collectors::Grpc.start(
-          server: server,
+        ::Gruf::Prometheus::Collector.start(
+          options: {
+            server: server
+          },
           client: ::Bigcommerce::Prometheus.client,
           frequency: ::Gruf::Prometheus.collection_frequency
         )
@@ -70,7 +72,7 @@ module Gruf
       #
       def stop_collectors
         ::PrometheusExporter::Instrumentation::Process.stop
-        ::Gruf::Prometheus::Collectors::Grpc.stop
+        ::Gruf::Prometheus::Collector.stop
       end
 
       ##

data/lib/gruf/prometheus/type_collector.rb

@@ -0,0 +1,57 @@
+# 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
+    ##
+    # Type Collector for prometheus and grpc instrumentation
+    #
+    class TypeCollector < Bigcommerce::Prometheus::TypeCollectors::Base
+      def type
+        'grpc'
+      end
+
+      private
+
+      ##
+      # Initialize the collector
+      #
+      def build_metrics
+        {
+          pool_jobs_waiting_total: PrometheusExporter::Metric::Gauge.new('grpc_pool_jobs_waiting_total', 'Number jobs in the gRPC thread pool that are actively waiting'),
+          pool_ready_workers_total: PrometheusExporter::Metric::Gauge.new('grpc_pool_ready_workers_total', 'The amount of non-busy workers in the thread pool'),
+          pool_workers_total: PrometheusExporter::Metric::Gauge.new('grpc_pool_workers_total', 'Number of workers in the gRPC thread pool'),
+          pool_initial_size: PrometheusExporter::Metric::Gauge.new('grpc_pool_initial_size', 'Initial size of the gRPC thread pool'),
+          poll_period: PrometheusExporter::Metric::Gauge.new('grpc_poll_period', 'Polling period for the gRPC thread pool'),
+          thread_pool_exhausted: PrometheusExporter::Metric::Counter.new('grpc_thread_pool_exhausted', 'Times the gRPC thread pool has been exhausted')
+        }
+      end
+
+      ##
+      # Collect the object into the buffer
+      #
+      def collect_metrics(data: {}, labels: {})
+        metric(:pool_jobs_waiting_total)&.observe(data['pool_jobs_waiting_total'].to_i, labels)
+        metric(:pool_ready_workers_total)&.observe(data['pool_ready_workers_total'].to_i, labels)
+        metric(:pool_workers_total)&.observe(data['pool_workers_total'].to_i, labels)
+        metric(:pool_initial_size)&.observe(data['pool_initial_size'].to_i, labels)
+        metric(:poll_period)&.observe(data['poll_period'].to_i, labels)
+        metric(:thread_pool_exhausted)&.observe(data['thread_pool_exhausted'].to_i, labels)
+      end
+    end
+  end
+end

data/lib/gruf/prometheus/version.rb

@@ -17,6 +17,6 @@
 #
 module Gruf
   module Prometheus
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0.2'
 description: Prometheus support for gruf
 email:
 - shaun.mccormick@bigcommerce.com
@@ -162,10 +162,10 @@ files:
 - README.md
 - gruf-prometheus.gemspec
 - lib/gruf/prometheus.rb
-- lib/gruf/prometheus/collectors/grpc.rb
+- lib/gruf/prometheus/collector.rb
 - lib/gruf/prometheus/configuration.rb
 - lib/gruf/prometheus/hook.rb
-- lib/gruf/prometheus/type_collectors/grpc.rb
+- lib/gruf/prometheus/type_collector.rb
 - lib/gruf/prometheus/version.rb
 homepage: https://github.com/bigcommerce/gruf-prometheus
 licenses:

data/lib/gruf/prometheus/collectors/grpc.rb

@@ -1,111 +0,0 @@
-# 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 Collectors
-      ##
-      # Prometheus instrumentor for gRPC servers
-      #
-      class Grpc
-        include Gruf::Loggable
-
-        ##
-        # @param [Gruf::Server] server
-        # @param [Gruf::Prometheus::Client] client
-        # @param [Integer] frequency
-        #
-        def initialize(server:, client:, frequency: nil)
-          @server = server
-          @client = client
-          @frequency = frequency || 15
-        end
-
-        ##
-        # Start the collector
-        #
-        # @param [Gruf::Server] server
-        # @param [Gruf::Prometheus::Client] client
-        # @param [Integer] frequency
-        #
-        def self.start(server:, client: nil, frequency: nil)
-          stop if @thread
-
-          client ||= Bigcommerce::Prometheus::Client.instance
-          collector = new(server: server, client: client, frequency: frequency)
-          @thread = Thread.new do
-            loop do
-              collector.run
-            end
-          end
-        end
-
-        ##
-        # Stop the collector
-        #
-        def self.stop
-          t = @thread
-          return unless t
-
-          t.kill
-          @thread = nil
-        end
-
-        def run
-          metric = collect
-          logger.debug "[gruf-prometheus] Pushing gruf metrics to type collector: #{metric.inspect}"
-          @client.send_json metric
-        rescue StandardError => e
-          logger.error "[gruf-prometheus] Failed to collect gruf-prometheus stats: #{e.message}"
-        ensure
-          sleep @frequency
-        end
-
-        private
-
-        def collect
-          metric = {}
-          metric[:type] = 'grpc'
-          rpc_server = @server.server
-          rpc_server.instance_variable_get(:@run_mutex).synchronize do
-            collect_server_metrics(rpc_server, metric)
-          end
-          metric
-        end
-
-        ##
-        # @param [GRPC::RpcServer] rpc_server
-        #
-        def collect_server_metrics(rpc_server, metric)
-          pool = rpc_server.instance_variable_get(:@pool)
-          metric[:pool_jobs_waiting_total] = pool.jobs_waiting.to_i
-          metric[:pool_ready_workers_total] = pool.instance_variable_get(:@ready_workers).size
-          metric[:pool_workers_total] = pool.instance_variable_get(:@workers)&.size
-          metric[:pool_initial_size] = rpc_server.instance_variable_get(:@pool_size).to_i
-          metric[:poll_period] = rpc_server.instance_variable_get(:@poll_period).to_i
-        end
-
-        ##
-        # @return [GRPC::RpcServer]
-        #
-        def grpc_server
-          @server.server
-        end
-      end
-    end
-  end
-end

data/lib/gruf/prometheus/type_collectors/grpc.rb

@@ -1,80 +0,0 @@
-# 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 TypeCollectors
-      ##
-      # Type Collector for prometheus and grpc instrumentation
-      #
-      class Grpc < PrometheusExporter::Server::TypeCollector
-        ##
-        # Initialize the collector
-        #
-        def initialize
-          @pool_jobs_waiting_total = PrometheusExporter::Metric::Gauge.new('grpc_pool_jobs_waiting_total', 'Number jobs in the gRPC thread pool that are actively waiting')
-          @pool_ready_workers_total = PrometheusExporter::Metric::Gauge.new('grpc_pool_ready_workers_total', 'The amount of non-busy workers in the thread pool')
-          @pool_workers_total = PrometheusExporter::Metric::Gauge.new('grpc_pool_workers_total', 'Number of workers in the gRPC thread pool')
-          @pool_initial_size = PrometheusExporter::Metric::Gauge.new('grpc_pool_initial_size', 'Initial size of the gRPC thread pool')
-          @poll_period = PrometheusExporter::Metric::Gauge.new('grpc_poll_period', 'Polling period for the gRPC thread pool')
-          @thread_pool_exhausted = PrometheusExporter::Metric::Counter.new('grpc_thread_pool_exhausted', 'Times the gRPC thread pool has been exhausted')
-        end
-
-        ##
-        # @return [String]
-        #
-        def type
-          'grpc'
-        end
-
-        ##
-        # @return [Array]
-        #
-        def metrics
-          return [] unless @pool_jobs_waiting_total
-
-          [
-            @pool_jobs_waiting_total,
-            @pool_ready_workers_total,
-            @pool_workers_total,
-            @pool_initial_size,
-            @poll_period,
-            @thread_pool_exhausted
-          ]
-        end
-
-        ##
-        # Collect the object into the buffer
-        #
-        def collect(obj)
-          default_labels = {}
-          default_labels['environment'] = obj['environment'] if obj['environment']
-
-          custom_labels = obj['custom_labels'] || {}
-          labels = custom_labels.nil? ? default_labels : default_labels.merge(custom_labels)
-
-          @pool_jobs_waiting_total.observe(obj['pool_jobs_waiting_total'].to_i, labels)
-          @pool_ready_workers_total.observe(obj['pool_ready_workers_total'].to_i, labels)
-          @pool_workers_total.observe(obj['pool_workers_total'].to_i, labels)
-          @pool_initial_size.observe(obj['pool_initial_size'].to_i, labels)
-          @poll_period.observe(obj['poll_period'].to_i, labels)
-          @thread_pool_exhausted.observe(obj['thread_pool_exhausted'].to_i, labels)
-        end
-      end
-    end
-  end
-end