bc-prometheus-ruby 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f508f25c190541cb70c122a43df4a1080d806c90c9d40bfcd783dfa8ed98f3b0
-  data.tar.gz: ce143665ff9e84032601aa8a592c22c374f0939a6b3bd708a8fc8b4d38c47eff
+  metadata.gz: 6b7632ea975f9fc41399d9a24624eeeadafc08065aff14ab7825713d0aa21757
+  data.tar.gz: daf8ffa859833893d9ab6d70ca06605820c77e47b42382317b5ad7ee2aab65bc
 SHA512:
-  metadata.gz: 44464c27e557945ff3f1dfbcf130565a1bf88678d252cbfdf882ecdd9753afb35cf20052a16fe15f25e7e396d63fd6d0139f2b13daf550be78864cccb2bbc778
-  data.tar.gz: c8392da5b98df9d071af54220d5223a99cd3cb0c52c61bb410c2c88db16143c99621eb62810ce7aa5a7c82d96e2c57d28faf02f061b5e1bde700f2f255642b4f
+  metadata.gz: 980d28e7517b613fe7296709638c27d4ef69e93533d7ff81701771651d9dbaac11e23dd08eb22a59edea4d804fb21903c888c5f2f46159fddd9c2b4942097fd4
+  data.tar.gz: 367ea000ef4cff7ad04da3fe3701eb890f565a2c259b10e624cf48caa62c9d1c91d3d00f3161702f86dacce4cc38ccf3411faf92881e2dcb984afab7d1a3e634

data/CHANGELOG.md

@@ -1,47 +1,53 @@
 Changelog for the bc-prometheus-ruby gem.
 
-h3. Pending Release
+### Pending Release
 
-h3. 0.1.5
+### 0.2.0
+
+- Add the ability to pass custom collectors and type collectors to the web instrumenter
+- Add base collector and type collector classes for ease of development of custom integrations
+- Change railtie to after initialization to allow for customization
+
+### 0.1.5
 
 - Fix issue where puma collector was not being registered on the server
 
-h3. 0.1.4
+### 0.1.4
 
 - Handle circumstances when before_fork_callbacks is called outside of the web process
 
-h3. 0.1.3
+### 0.1.3
 
 - Move to bigcommerce fork of multitrap to handle IGNORE clauses more cleanly
 
-h3. 0.1.1
+### 0.1.1
 
 - Add multitrap to more cleanly handle trap signals
 - Use proc in signal handlers for consistent trap handling
 
-h3. 0.1.0
+### 0.1.0
 
 - Replace WEBrick server from PrometheusExporter with Thin server implementation to reduce memory leakage
 - Utilize NET::HTTP instead of direct sockets to prevent bad socket errors
 
-h3. 0.0.5
+### 0.0.5
 
 - Add resque instrumentation
 
-h3. 0.0.4
+### 0.0.4
 
 - Properly handle SIGINT/SIGTERM to shutdown prometheus exporter
 - Add process names to log output for easier debugging
 
-h3. 0.0.3
+### 0.0.3
 
 - Add hutch instrumentor for hutch / rmq support
 
-h3. 0.0.2
+### 0.0.2
 
 - Better support for older Rails / Puma versions
 - Adds basic support for non-Rails applications
 
-h3. 0.0.1
+### 0.0.1
 
 - Initial public release

data/lib/bigcommerce/prometheus.rb

@@ -30,7 +30,9 @@ require_relative 'prometheus/configuration'
 require_relative 'prometheus/server'
 require_relative 'prometheus/client'
 
+require_relative 'prometheus/collectors/base'
 require_relative 'prometheus/collectors/resque'
+require_relative 'prometheus/type_collectors/base'
 require_relative 'prometheus/type_collectors/resque'
 
 require_relative 'prometheus/instrumentors/web'

data/lib/bigcommerce/prometheus/collectors/base.rb

@@ -0,0 +1,91 @@
+# 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 Bigcommerce
+  module Prometheus
+    module Collectors
+      ##
+      # Base class for collectors
+      #
+      class Base
+        ##
+        # Start the collector
+        #
+        def self.start(*args, &block)
+          process_collector = new(*args, &block)
+
+          stop if @thread
+
+          @thread = Thread.new do
+            Kernel.loop do
+              process_collector.run
+            end
+          end
+        end
+
+        ##
+        # Stop the collector
+        #
+        def self.stop
+          t = @thread
+          return unless t
+
+          t.kill
+          @thread = nil
+        end
+
+        ##
+        # @param [PrometheusExporter::Client] client
+        # @param [String] type
+        # @param [Integer] frequency
+        # @param [Hash] options
+        #
+        def initialize(client: nil, type: nil, frequency: nil, options: nil)
+          @client = client || PrometheusExporter::Client.default
+          @type = type || self.class.to_s.downcase.gsub('::', '_').gsub('collector', '')
+          @frequency = frequency || 15
+          @options = options || {}
+          @logger = Bigcommerce::Prometheus.logger
+        end
+
+        ##
+        # Run the collector and send stats
+        #
+        def run
+          metrics = { type: @type }
+          metrics = collect(metrics)
+          @logger.debug "[bigcommerce-prometheus] Pushing #{@type} metrics to type collector: #{metrics.inspect}"
+          @client.send_json(metrics)
+        rescue StandardError => e
+          @logger.error("Prometheus Exporter Failed To Collect #{@type} Stats #{e}")
+        ensure
+          sleep @frequency
+        end
+
+        ##
+        # Collect metrics. This should be overridden in derivative collectors
+        #
+        # @param [Hash] metrics
+        # @return [Hash]
+        #
+        def collect(metrics = {})
+          metrics
+        end
+      end
+    end
+  end
+end

data/lib/bigcommerce/prometheus/collectors/resque.rb

@@ -22,54 +22,21 @@ module Bigcommerce
       # Collect metrics to push to the server type collector
       #
       class Resque
-        include Bigcommerce::Prometheus::Loggable
-
-        ##
-        # @param [Bigcommerce::Prometheus::Client] client
-        # @param [Integer] frequency
-        #
-        def initialize(client:, frequency: nil)
-          @client = client || Bigcommerce::Prometheus.client
-          @frequency = frequency || 15
-        end
-
         ##
-        # Start the collector
+        # @param [Hash] metrics
+        # @return [Hash]
         #
-        def self.start(client: nil, frequency: nil)
-          collector = new(client: client, frequency: frequency)
-          Thread.new do
-            loop do
-              collector.run
-            end
-          end
-        end
-
-        def run
-          metric = collect
-          logger.debug "[bigcommerce-prometheus] Pushing resque metrics to type collector: #{metric.inspect}"
-          @client.send_json metric
-        rescue StandardError => e
-          logger.error "[bigcommerce-prometheus] Failed to collect resque prometheus stats: #{e.message}"
-        ensure
-          sleep @frequency
-        end
-
-        private
-
-        def collect
+        def collect(metrics = {})
           info = ::Resque.info
 
-          metric = {}
-          metric[:type] = 'resque'
-          metric[:environment] = info[:environment].to_s
-          metric[:workers_total] = info[:workers].to_i
-          metric[:jobs_failed_total] = info[:failed].to_i
-          metric[:jobs_pending_total] = info[:pending].to_i
-          metric[:jobs_processed_total] = info[:processed].to_i
-          metric[:queues_total] = info[:queues].to_i
-          metric[:queues] = queue_sizes
-          metric
+          metrics[:environment] = info[:environment].to_s
+          metrics[:workers_total] = info[:workers].to_i
+          metrics[:jobs_failed_total] = info[:failed].to_i
+          metrics[:jobs_pending_total] = info[:pending].to_i
+          metrics[:jobs_processed_total] = info[:processed].to_i
+          metrics[:queues_total] = info[:queues].to_i
+          metrics[:queues] = queue_sizes
+          metrics
         end
 
         def queue_sizes

data/lib/bigcommerce/prometheus/configuration.rb

@@ -34,7 +34,9 @@ module Bigcommerce
         server_host: '0.0.0.0',
         server_port: PrometheusExporter::DEFAULT_PORT,
         server_timeout: PrometheusExporter::DEFAULT_TIMEOUT,
-        server_prefix: PrometheusExporter::DEFAULT_PREFIX
+        server_prefix: PrometheusExporter::DEFAULT_PREFIX,
+        web_collectors: [],
+        web_type_collectors: []
       }.freeze
 
       attr_accessor *VALID_CONFIG_KEYS.keys
@@ -89,6 +91,7 @@ module Bigcommerce
 
         self.puma_process_label = ENV.fetch('PROMETHEUS_PUMA_PROCESS_LABEL', 'web').to_s
         self.puma_collection_frequency = ENV.fetch('PROMETHEUS_PUMA_COLLECTION_FREQUENCY', 30).to_i
+        self.web_type_collectors = []
       end
 
       ##

data/lib/bigcommerce/prometheus/instrumentors/web.rb

@@ -31,6 +31,8 @@ module Bigcommerce
           @server_timeout = Bigcommerce::Prometheus.server_timeout
           @server_prefix = Bigcommerce::Prometheus.server_prefix
           @process_name = Bigcommerce::Prometheus.process_name
+          @collectors = Bigcommerce::Prometheus.web_collectors || []
+          @type_collectors = Bigcommerce::Prometheus.web_type_collectors || []
         end
 
         ##
@@ -65,6 +67,9 @@ module Bigcommerce
             server.add_type_collector(PrometheusExporter::Server::ActiveRecordCollector.new)
             server.add_type_collector(PrometheusExporter::Server::WebCollector.new)
             server.add_type_collector(PrometheusExporter::Server::PumaCollector.new)
+            @type_collectors.each do |tc|
+              server.add_type_collector(tc)
+            end
             server.start
           end
         end
@@ -73,6 +78,7 @@ module Bigcommerce
           @app.config.after_fork_callbacks = [] unless @app.config.after_fork_callbacks
           @app.config.after_fork_callbacks << lambda do
             ::Bigcommerce::Prometheus::Integrations::Puma.start
+            @collectors.each(&:start)
           end
         end
 

data/lib/bigcommerce/prometheus/integrations/railtie.rb

@@ -22,7 +22,7 @@ module Bigcommerce
       # Railtie for automatic configuration of Rails environments
       #
       class Railtie < ::Rails::Railtie
-        initializer 'zzz_bigcommerce.prometheus.configure_rails_initialization' do |app|
+        config.after_initialize do |app|
           Bigcommerce::Prometheus::Instrumentors::Web.new(app: app).start
         end
       end

data/lib/bigcommerce/prometheus/type_collectors/base.rb

@@ -0,0 +1,85 @@
+# 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 Bigcommerce
+  module Prometheus
+    module TypeCollectors
+      ##
+      # Base type collector class
+      #
+      class Base < PrometheusExporter::Server::TypeCollector
+        attr_reader :type
+
+        ##
+        # @param [String] type
+        # @param [Hash] default_labels
+        #
+        def initialize(type: nil, default_labels: {})
+          @type = type || self.class.to_s.downcase.gsub('::', '_').gsub('typecollector', '')
+          @default_labels = default_labels || {}
+          @metrics = build_metrics
+        end
+
+        ##
+        # @return [Array]
+        #
+        def metrics
+          return [] unless @metrics.any?
+
+          @metrics.values
+        end
+
+        ##
+        # @param [Symbol] key
+        #
+        def metric(key)
+          @metrics.fetch(key.to_sym, nil)
+        end
+
+        ##
+        # Collect metrics from input data
+        #
+        # @param [Hash] data
+        #
+        def collect(data)
+          custom_labels = data.fetch('custom_labels', nil)
+          labels = custom_labels.nil? ? @default_labels : @default_labels.merge(custom_labels)
+          collect_metrics(data: data, labels: labels)
+        end
+
+        private
+
+        ##
+        # Collect metrics. Implementations of translating metrics to observed calls should happen here.
+        #
+        def collect_metrics(*)
+          raise NotImplementedError, 'Must implement collect_metrics'
+        end
+
+        ##
+        # Build and return all observable metrics. This should be a hash of symbol keys that map to
+        # PrometheusExporter::Metric::Base objects.
+        #
+        # @return [Hash]
+        #
+        def build_metrics
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/bigcommerce/prometheus/type_collectors/resque.rb

@@ -21,59 +21,33 @@ module Bigcommerce
       ##
       # Collect resque data from collectors and parse them into metrics
       #
-      class Resque < PrometheusExporter::Server::TypeCollector
+      class Resque < Bigcommerce::Prometheus::TypeCollectors::Base
         ##
         # Initialize the collector
         #
-        def initialize
-          @workers_total = PrometheusExporter::Metric::Gauge.new('resque_workers_total', 'Number of active workers')
-          @jobs_failed_total = PrometheusExporter::Metric::Gauge.new('jobs_failed_total', 'Number of failed jobs')
-          @jobs_pending_total = PrometheusExporter::Metric::Gauge.new('jobs_pending_total', 'Number of pending jobs')
-          @jobs_processed_total = PrometheusExporter::Metric::Gauge.new('jobs_processed_total', 'Number of processed jobs')
-          @queues_total = PrometheusExporter::Metric::Gauge.new('queues_total', 'Number of total queues')
-          @queue_sizes = PrometheusExporter::Metric::Gauge.new('queue_sizes', 'Size of each queue')
-        end
-
-        ##
-        # @return [String]
-        #
-        def type
-          'resque'
-        end
-
-        ##
-        # @return [Array]
-        #
-        def metrics
-          return [] unless @workers_total
-
-          [
-            @workers_total,
-            @jobs_failed_total,
-            @jobs_pending_total,
-            @jobs_processed_total,
-            @queues_total,
-            @queue_sizes
-          ]
+        def build_metrics
+          {
+            workers_total: PrometheusExporter::Metric::Gauge.new('resque_workers_total', 'Number of active workers'),
+            jobs_failed_total: PrometheusExporter::Metric::Gauge.new('jobs_failed_total', 'Number of failed jobs'),
+            jobs_pending_total: PrometheusExporter::Metric::Gauge.new('jobs_pending_total', 'Number of pending jobs'),
+            jobs_processed_total: PrometheusExporter::Metric::Gauge.new('jobs_processed_total', 'Number of processed jobs'),
+            queues_total: PrometheusExporter::Metric::Gauge.new('queues_total', 'Number of total queues'),
+            queue_sizes: PrometheusExporter::Metric::Gauge.new('queue_sizes', 'Size of each queue')
+          }
         end
 
         ##
         # Collect resque metrics from input data
         #
-        def collect(obj)
-          default_labels = { environment: obj['environment'] }
-
-          custom_labels = obj['custom_labels']
-          labels = custom_labels.nil? ? default_labels : default_labels.merge(custom_labels)
-
-          @workers_total.observe(obj['workers_total'], labels)
-          @jobs_failed_total.observe(obj['jobs_failed_total'], labels)
-          @jobs_pending_total.observe(obj['jobs_pending_total'], labels)
-          @jobs_processed_total.observe(obj['jobs_processed_total'], labels)
-          @queues_total.observe(obj['queues_total'], labels)
-
-          obj['queues'].each do |name, size|
-            @queue_sizes.observe(size, labels.merge(queue: name))
+        def collect_metrics(data:, labels: {})
+          metric(:workers_total).observe(obj['workers_total'], labels)
+          metric(:jobs_failed_total).observe(obj['jobs_failed_total'], labels)
+          metric(:jobs_pending_total).observe(obj['jobs_pending_total'], labels)
+          metric(:jobs_processed_total).observe(obj['jobs_processed_total'], labels)
+          metric(:queues_total).observe(obj['queues_total'], labels)
+
+          data['queues'].each do |name, size|
+            metric(:queue_sizes).observe(size, labels.merge(queue: name))
           end
         end
       end

data/lib/bigcommerce/prometheus/version.rb

@@ -17,6 +17,6 @@
 #
 module Bigcommerce
   module Prometheus
-    VERSION = '0.1.5'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bc-prometheus-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.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
@@ -177,6 +177,7 @@ files:
 - bc-prometheus-ruby.gemspec
 - lib/bigcommerce/prometheus.rb
 - lib/bigcommerce/prometheus/client.rb
+- lib/bigcommerce/prometheus/collectors/base.rb
 - lib/bigcommerce/prometheus/collectors/resque.rb
 - lib/bigcommerce/prometheus/configuration.rb
 - lib/bigcommerce/prometheus/instrumentors/hutch.rb
@@ -195,6 +196,7 @@ files:
 - lib/bigcommerce/prometheus/servers/thin/rack_app.rb
 - lib/bigcommerce/prometheus/servers/thin/server.rb
 - lib/bigcommerce/prometheus/servers/thin/server_metrics.rb
+- lib/bigcommerce/prometheus/type_collectors/base.rb
 - lib/bigcommerce/prometheus/type_collectors/resque.rb
 - lib/bigcommerce/prometheus/version.rb
 homepage: https://github.com/bigcommerce/bc-prometheus-ruby