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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96f1eb09651c421cf23add6ac51950a38a76615273028adb445e81dc9b41b70
-  data.tar.gz: 7d64d5d5c46e651baf548b7ad37ffdf99e12369d58e4031ed7f6543d4281ca02
+  metadata.gz: be821ad9a35fc316970961619d14342baa8166ff6143e21e30e527e0dc1bd325
+  data.tar.gz: bf6583e5e6b45cc96ffa9424abe5707e3f17ba5782ba6e42c89a994e8233a0f6
 SHA512:
-  metadata.gz: 9422cab62cef0935c81166448c75e2b60cee2fde06db72c541851d7243604e63fc922da97d0590e8f3b42f24658d9bef9703833fdec896684cae0653e4427a90
-  data.tar.gz: 3d0d1a685727206b6813201163c5e2d29bfd5f1757bcb2962b0b753b79088ffcba21dd0735dee7c5eaa4e27494261e8ff20696c111a585f1926ebad4c80167ac
+  metadata.gz: ff408a86bebf88bc757850dc69c3faf9b56dc8d556f0c837d350496ee37810390e5cf6f0b319785e3c9a79968f67467b1fd2a5213c07468a907bd5eae907363c
+  data.tar.gz: df5a509d431e8d7a9ca03f984400cfd3d0705d3322f9f2a336653f6956a828135b75efb99aa3817398c1f559bf4722d2580a5608b598f1d8312b24d97d18098c

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

@@ -133,7 +133,8 @@ module Prometheus
             end
 
             # Aggregate all the different values for each label_set
-            stores_data.each_with_object({}) do |(label_set, values), acc|
+            aggregate_hash = Hash.new { |hash, key| hash[key] = 0.0 }
+            stores_data.each_with_object(aggregate_hash) do |(label_set, values), acc|
               acc[label_set] = aggregate_values(values)
             end
           end
@@ -153,7 +154,12 @@ module Prometheus
           end
 
           def internal_store
-            @internal_store ||= FileMappedDict.new(filemap_filename)
+            if @store_opened_by_pid != process_id
+              @store_opened_by_pid = process_id
+              @internal_store = FileMappedDict.new(filemap_filename)
+            else
+              @internal_store
+            end
           end
 
           # Filename for this metric's PStore (one per process)

data/lib/prometheus/client/label_set_validator.rb

@@ -18,7 +18,6 @@ module Prometheus
       def initialize(expected_labels:, reserved_labels: [])
         @expected_labels = expected_labels.sort
         @reserved_labels = BASE_RESERVED_LABELS + reserved_labels
-        @validated = {}
       end
 
       def validate_symbols!(labels)
@@ -34,17 +33,17 @@ module Prometheus
       end
 
       def validate_labelset!(labelset)
-        return labelset if @validated.key?(labelset.hash)
-
-        validate_symbols!(labelset)
-
-        unless keys_match?(labelset)
-          raise InvalidLabelSetError, "labels must have the same signature " \
-                                      "(keys given: #{labelset.keys.sort} vs." \
-                                      " keys expected: #{expected_labels}"
+        begin
+          return labelset if keys_match?(labelset)
+        rescue ArgumentError
+          # If labelset contains keys that are a mixture of strings and symbols, this will
+          # raise when trying to sort them, but the error should be the same:
+          # InvalidLabelSetError
         end
 
-        @validated[labelset.hash] = labelset
+        raise InvalidLabelSetError, "labels must have the same signature " \
+                                    "(keys given: #{labelset.keys} vs." \
+                                    " keys expected: #{expected_labels}"
       end
 
       private

data/lib/prometheus/client/metric.rb

@@ -27,7 +27,7 @@ module Prometheus
 
         @name = name
         @docstring = docstring
-        @preset_labels = preset_labels
+        @preset_labels = stringify_values(preset_labels)
 
         @store = Prometheus::Client.config.data_store.for_metric(
           name,
@@ -85,8 +85,16 @@ module Prometheus
       def label_set_for(labels)
         # We've already validated, and there's nothing to merge. Save some cycles
         return preset_labels if @all_labels_preset && labels.empty?
+        labels = stringify_values(labels)
         @validator.validate_labelset!(preset_labels.merge(labels))
       end
+
+      def stringify_values(labels)
+        stringified = {}
+        labels.each { |k,v| stringified[k] = v.to_s }
+
+        stringified
+      end
     end
   end
 end

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.10.0-alpha.2'
+    VERSION = '0.10.0'
   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.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Ben Kochie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -84,12 +84,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a