prometheus-client 0.10.0.pre.alpha.1 → 0.10.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58aea5e1eb91b3b53326f8c183c65187d5fcd6d87fc908c107f73d65257809aa
-  data.tar.gz: 8d78ea6b70ebc78ed1deba5229b5e2f8b608b11511d8a4278be794dadf945284
+  metadata.gz: e96f1eb09651c421cf23add6ac51950a38a76615273028adb445e81dc9b41b70
+  data.tar.gz: 7d64d5d5c46e651baf548b7ad37ffdf99e12369d58e4031ed7f6543d4281ca02
 SHA512:
-  metadata.gz: 07573f45a2555b063ad4987bd26640bfe7388f98e3f1d11e1b21c65ecf7a853aa372c32326fe944ae656efb9d6837171039ee465712f67dc50513c0f62c0baed
-  data.tar.gz: ee75b0ad0b4b2664d3d54bb3bcb29f6fe26d4e6b3801c70db37148343c73cc53b769125ad8fb56ad820d24355a2c862fe3e70832961ee7486a2b748357d205cb
+  metadata.gz: 9422cab62cef0935c81166448c75e2b60cee2fde06db72c541851d7243604e63fc922da97d0590e8f3b42f24658d9bef9703833fdec896684cae0653e4427a90
+  data.tar.gz: 3d0d1a685727206b6813201163c5e2d29bfd5f1757bcb2962b0b753b79088ffcba21dd0735dee7c5eaa4e27494261e8ff20696c111a585f1926ebad4c80167ac

data/README.md

@@ -168,8 +168,8 @@ summary.observe(Benchmark.realtime { service.call() }, labels: { service: 'datab
 
 # retrieve the current sum and total values
 summary_value = summary.get(labels: { service: 'database' })
-summary_value.sum # => 123.45
-summary_value.count # => 100
+summary_value['sum'] # => 123.45
+summary_value['count'] # => 100
 ```
 
 ## Labels
@@ -256,6 +256,15 @@ class MyComponent
 end
 ```
 
+### Reserved labels
+
+The following labels are reserved by the client library, and attempting to use them in a
+metric definition will result in a
+`Prometheus::Client::LabelSetValidator::ReservedLabelError` being raised:
+
+  - `:job`
+  - `:instance`
+  - `:pid`
 
 ## Data Stores
 
@@ -362,7 +371,8 @@ summing the values of each process.
 
 For Gauges, however, this may not be the right thing to do, depending on what they're 
 measuring. You might want to take the maximum or minimum value observed in any process,
-rather than the sum of all of them.
+rather than the sum of all of them. You may also want to export each process's individual
+value.
 
 In those cases, you should use the `store_settings` parameter when registering the 
 metric, to specify an `:aggregation` setting. 

data/lib/prometheus/client/data_stores/direct_file_store.rb

@@ -1,4 +1,3 @@
-require 'concurrent'
 require 'fileutils'
 require "cgi"
 
@@ -26,8 +25,9 @@ module Prometheus
 
       class DirectFileStore
         class InvalidStoreSettingsError < StandardError; end
-        AGGREGATION_MODES = [MAX = :max, MIN = :min, SUM = :sum]
+        AGGREGATION_MODES = [MAX = :max, MIN = :min, SUM = :sum, ALL = :all]
         DEFAULT_METRIC_SETTINGS = { aggregation: SUM }
+        DEFAULT_GAUGE_SETTINGS = { aggregation: ALL }
 
         def initialize(dir:)
           @store_settings = { dir: dir }
@@ -35,7 +35,12 @@ module Prometheus
         end
 
         def for_metric(metric_name, metric_type:, metric_settings: {})
-          settings = DEFAULT_METRIC_SETTINGS.merge(metric_settings)
+          default_settings = DEFAULT_METRIC_SETTINGS
+          if metric_type == :gauge
+            default_settings = DEFAULT_GAUGE_SETTINGS
+          end
+
+          settings = default_settings.merge(metric_settings)
           validate_metric_settings(settings)
 
           MetricStore.new(metric_name: metric_name,
@@ -66,7 +71,7 @@ module Prometheus
             @store_settings = store_settings
             @values_aggregation_mode = metric_settings[:aggregation]
 
-            @rwlock = Concurrent::ReentrantReadWriteLock.new
+            @lock = Monitor.new
           end
 
           # Synchronize is used to do a multi-process Mutex, when incrementing multiple
@@ -136,10 +141,14 @@ module Prometheus
           private
 
           def in_process_sync
-            @rwlock.with_write_lock { yield }
+            @lock.synchronize { yield }
           end
 
           def store_key(labels)
+            if @values_aggregation_mode == ALL
+              labels[:pid] = process_id
+            end
+
             labels.map{|k,v| "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}"}.join('&')
           end
 
@@ -168,6 +177,8 @@ module Prometheus
               values.max
             elsif @values_aggregation_mode == MIN
               values.min
+            elsif @values_aggregation_mode == ALL
+              values.first
             else
               raise InvalidStoreSettingsError,
                     "Invalid Aggregation Mode: #{ @values_aggregation_mode }"

data/lib/prometheus/client/data_stores/single_threaded.rb

@@ -1,5 +1,3 @@
-require 'concurrent'
-
 module Prometheus
   module Client
     module DataStores

data/lib/prometheus/client/data_stores/synchronized.rb

@@ -1,5 +1,3 @@
-require 'concurrent'
-
 module Prometheus
   module Client
     module DataStores
@@ -27,11 +25,11 @@ module Prometheus
         class MetricStore
           def initialize
             @internal_store = Hash.new { |hash, key| hash[key] = 0.0 }
-            @rwlock = Concurrent::ReentrantReadWriteLock.new
+            @lock = Monitor.new
           end
 
           def synchronize
-            @rwlock.with_write_lock { yield }
+            @lock.synchronize { yield }
           end
 
           def set(labels:, val:)

data/lib/prometheus/client/label_set_validator.rb

@@ -6,7 +6,7 @@ module Prometheus
     # Prometheus specification.
     class LabelSetValidator
       # TODO: we might allow setting :instance in the future
-      BASE_RESERVED_LABELS = [:job, :instance].freeze
+      BASE_RESERVED_LABELS = [:job, :instance, :pid].freeze
 
       class LabelSetError < StandardError; end
       class InvalidLabelSetError < LabelSetError; end

data/lib/prometheus/client/registry.rb

@@ -42,7 +42,7 @@ module Prometheus
                              docstring: docstring,
                              labels: labels,
                              preset_labels: preset_labels,
-                             store_settings: {}))
+                             store_settings: store_settings))
       end
 
       def summary(name, docstring:, labels: [], preset_labels: {}, store_settings: {})
@@ -50,7 +50,7 @@ module Prometheus
                              docstring: docstring,
                              labels: labels,
                              preset_labels: preset_labels,
-                             store_settings: {}))
+                             store_settings: store_settings))
       end
 
       def gauge(name, docstring:, labels: [], preset_labels: {}, store_settings: {})
@@ -58,7 +58,7 @@ module Prometheus
                            docstring: docstring,
                            labels: labels,
                            preset_labels: preset_labels,
-                           store_settings: {}))
+                           store_settings: store_settings))
       end
 
       def histogram(name, docstring:, labels: [], preset_labels: {},
@@ -69,7 +69,7 @@ module Prometheus
                                labels: labels,
                                preset_labels: preset_labels,
                                buckets: buckets,
-                               store_settings: {}))
+                               store_settings: store_settings))
       end
 
       def exist?(name)

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.10.0-alpha.1'
+    VERSION = '0.10.0-alpha.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre.alpha.1
+  version: 0.10.0.pre.alpha.2
 platform: ruby
 authors:
 - Ben Kochie
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="