gruf-prometheus 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf2407a0d57a111725037bef23e55ca38ec318ef0307f06f729042dcaab9561
-  data.tar.gz: 561ee316f087f56e485d1ea3debd3c34df3764100babfce3576cfc8e64a19a3a
+  metadata.gz: df1faaee21e1065478281be50074bd940e032f504dec8d6a96c6782924333351
+  data.tar.gz: '08156327334040cfbcc2edde0f54ad8b99a9832922facdee4edf7ec8940d821e'
 SHA512:
-  metadata.gz: 4425dcd1a8861c7f6fefbf27b4cbebe782a9ef246b5819e469944c2ff032a1aef75eac4bd75d0ff5b8b7bfa3de09ad7a7a5062f34d207b713cfe07573b1b3c63
-  data.tar.gz: 18e6cf9983f630798fb73f564fcd50a2f6b3a3852ffe07e93d755f4f73775880373fd82e17f282a487c80877a35f33477b5cf6397754fd16f630ff3bebbed829
+  metadata.gz: d5b9b609394f12d2f2380088bd61c1fcba5ae6fcc6ff638c9d8f059deec9994e1f8776b8adf642604a74c03a71312a76959cbf3bbb2f0814f9403a1d3dd80b41
+  data.tar.gz: e502778428e5e923180a8de75d252d7e9a470c38fe37fff65e26a9d9e183910de4209271a6ec2de2e441b892c52e70a1912a413d042872efd7fe768f62580732

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog for the gruf-prometheus gem.
 
 ### Pending Release
 
+### 1.2.0
+
+- Add the ability to have custom collectors and type collectors
+
 ### 1.1.0
 
 - Refactor collector/type collector to utilize new base abstractions

data/README.md

@@ -33,6 +33,8 @@ You can further configure via bc-prometheus-ruby with:
 | 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
 

data/lib/gruf/prometheus/collector.rb

@@ -21,10 +21,6 @@ module Gruf
     # 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

data/lib/gruf/prometheus/configuration.rb

@@ -24,7 +24,9 @@ module Gruf
       VALID_CONFIG_KEYS = {
         process_label: 'grpc',
         process_name: 'grpc',
-        collection_frequency: 30
+        collection_frequency: 30,
+        type_collectors: [],
+        collectors: []
       }.freeze
 
       attr_accessor *VALID_CONFIG_KEYS.keys

data/lib/gruf/prometheus/hook.rb

@@ -30,6 +30,9 @@ module Gruf
         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(::PrometheusExporter::Server::ActiveRecordCollector.new)
+        custom_type_collectors.each do |tc|
+          prometheus_server.add_type_collector(tc)
+        end
         prometheus_server.start
         sleep 2 unless ENV['RACK_ENV'] == 'test' # wait for server to come online
         start_collectors(server: server)
@@ -62,9 +65,13 @@ module Gruf
           options: {
             server: server
           },
+          type: 'grpc',
           client: ::Bigcommerce::Prometheus.client,
           frequency: ::Gruf::Prometheus.collection_frequency
         )
+        custom_collectors.each do |collector, arguments|
+          collector.start(arguments)
+        end
       end
 
       ##
@@ -87,6 +94,20 @@ module Gruf
           logger: logger
         )
       end
+
+      ##
+      # @return [Array<Bigcommerce::Prometheus::TypeCollectors::Base>]
+      #
+      def custom_type_collectors
+        @options.fetch(:type_collectors, [])
+      end
+
+      ##
+      # @return [Array<Bigcommerce::Prometheus::Collectors::Base>]
+      #
+      def custom_collectors
+        @options.fetch(:collectors, [])
+      end
     end
   end
 end

data/lib/gruf/prometheus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake