prometheus-client-mmap 0.7.0.beta33 → 0.7.0.beta34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7956684dd9781b3ca54566d1822574a9efaba7
-  data.tar.gz: b1673743af7ef8d4cbe1f1fa40d2da9560ed4f98
+  metadata.gz: 1225b344f2939116817abcefbfe4483e38c7087c
+  data.tar.gz: 4fe5ade968d6d4df62d7ab7b9801ee8b1c80aa50
 SHA512:
-  metadata.gz: 20ca0cf0603f45196a403348f8db23f5fb2b1d64fa0855c966e3448908eec3254b492670d219faa4f1040ab3f5c674a00eb34621729a38c34378641257c02e1f
-  data.tar.gz: c35c741b2a573826d3ac3096c14cf8e92a475f894bab7097404340161f37010e8703866424253ab2cb06871658105a9a7ba53136350ef07ce23c8e54f849d1b4
+  metadata.gz: f3afd81bf5703647413b61a0762882bc3796325a51fa0db271620d6b0c1d70bbcba0d5191c9acf740e2d856539982a04bdcc253c4f4c1ecb969e9affca7dcb73
+  data.tar.gz: f083690e3b0e19f3968576c64d7f31e71ffa982b90f29edfb5e8ce6b738f2e97a5345f6dfc2f23ed98dd6a04b0d06f6015fb377b519bd760d1bf9cc3b796ca7a

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -69,7 +69,7 @@ void save_entry(mm_ipc *i_mm, uint32_t offset, VALUE key, VALUE value){
 }
 
 inline uint32_t load_used(mm_ipc *i_mm){
-    uint32_t used=0;
+    uint32_t used = 0;
     memcpy(&used, (char *)i_mm->t->addr, sizeof(uint32_t));
 
     if (used == 0){

data/lib/prometheus/client/helper/entry_parser.rb

@@ -35,17 +35,24 @@ module Prometheus
           size < MINIMUM_SIZE || used.zero?
         end
 
-        def entries
+        def entries(ignore_errors = false)
           return Enumerator.new {} if empty?
 
           Enumerator.new do |yielder|
             used_ = used # cache used to avoid unnecessary unpack operations
 
             pos = START_POSITION # used + padding offset
-            while pos < used_
+            while pos < used_ && pos < size && pos > 0
               data = slice(pos..-1)
-              encoded_len, first_encoded_bytes = data.unpack('ll')
-              if encoded_len.zero? || first_encoded_bytes.zero? # do not parse empty data
+              unless data
+                raise ParsingError, "data slice is nil at pos #{pos}" unless ignore_errors
+                pos += 8
+                next
+              end
+
+              encoded_len, first_encoded_bytes = data.unpack('LL')
+              if encoded_len.nil? || encoded_len.zero? || first_encoded_bytes.nil? || first_encoded_bytes.zero?
+                # do not parse empty data
                 pos += 8
                 next
               end
@@ -54,21 +61,24 @@ module Prometheus
               value_offset = 4 + encoded_len + padding_len
               pos += value_offset
 
-              yielder.yield data, encoded_len, value_offset, pos
-
+              if value_offset > 0 && (pos + 8) < size # if positions are safe
+                yielder.yield data, encoded_len, value_offset, pos
+              else
+                raise ParsingError, "data slice is nil at pos #{pos}" unless ignore_errors
+              end
               pos += 8
             end
           end
         end
 
         def parsed_entries(ignore_errors = false)
-          result = entries.map do |data, encoded_len, value_offset, _|
+          result = entries(ignore_errors).map do |data, encoded_len, value_offset, _|
             begin
               encoded, value = data.unpack(format('@4A%d@%dd', encoded_len, value_offset))
               [encoded, value]
             rescue ArgumentError => e
               Prometheus::Client.logger.debug("Error processing data: #{bin_to_hex(data[0, 7])} len: #{encoded_len} value_offset: #{value_offset}")
-              raise ParsingError(e) unless ignore_errors
+              raise ParsingError, e unless ignore_errors
             end
           end
 
@@ -80,6 +90,8 @@ module Prometheus
           parsed_entries(ignore_errors).each do |key, value|
             begin
               metric_name, name, labelnames, labelvalues = JsonParser.load(key)
+              labelnames = [] unless labelnames
+              labelvalues = [] unless labelvalues
               metric = metrics.fetch(metric_name,
                                      metric_name: metric_name,
                                      help: 'Multiprocess metric',

data/lib/prometheus/client/simple_value.rb

@@ -4,7 +4,7 @@ require 'mmap'
 module Prometheus
   module Client
     class SimpleValue
-      def initialize(type, metric_name, name, labels, *args)
+      def initialize(type, metric_name, name, _labels, *_args)
         @value = 0.0
       end
 

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta33'.freeze
+    VERSION = '0.7.0.beta34'.freeze
   end
 end

data/lib/prometheus.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Prometheus is a generic time-series collection and computation server.
 module Prometheus
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta33
+  version: 0.7.0.beta34
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2
@@ -31,6 +31,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.9
+- !ruby/object:Gem::Dependency
+  name: fuzzbert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a