prometheus-client-mmap 0.7.0.beta17 → 0.7.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a830232952d5753fc160f570cc962602f35b219b
-  data.tar.gz: 33183db099150ced78e22ff071cbde0730a1f993
+  metadata.gz: 125465cb67bfcdcce578b05e2533264d5a6f16bf
+  data.tar.gz: 8251ad819a49074395451366c33ed4e2e28c7efd
 SHA512:
-  metadata.gz: f2f6b8fba44ce2760d0dd44a271718024b622cb21387590316c2de0590b895d4ce120c86b2e98ada39ceb2e3c3eb7fccacc96ceeb867ab21de4364e5db92faaa
-  data.tar.gz: c024e67d7f75e52a45b00791a481bb2ee5f99aa5f4b52b73b27f4e57ee54ae25cae35e3f6c6ebab84ceb4da0532cbddf921f551f18e5161489e483659e8df70c
+  metadata.gz: e1e6d918da65e60683c55306e74869a5b166ed21a8ba0b0512b11d9f1c817d625541300d06668e294bb99cdf5b3a6feacb24e990e6bf97249c1eadcb7d65fdf0
+  data.tar.gz: 50f9b80b2f9d2861e18105c6037cac59e8b282aaed402f571d4a75cbc43b2a1221b7c9ac1f6e8eadadefa189b502e4bc3697bd3c1fee6abbfcc98e6ac2f3a698

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

@@ -29,14 +29,10 @@ module Prometheus
           end
 
           def ensure_process_exclusive_file(file_prefix = 'mmaped_file')
-            path = nil
-            filename_number = 0
-            until path && Helper::MmapedFile.lock_to_process(path)
-              filename = "#{file_prefix}_#{Prometheus::Client.pid}-#{filename_number}.db"
-              path = File.join(Prometheus::Client.configuration.multiprocess_files_dir, filename)
-              filename_number += 1
-            end
-            path
+            (0..Float::INFINITY).lazy
+              .map { |f_num| "#{file_prefix}_#{Prometheus::Client.pid}-#{f_num}.db" }
+              .map { |filename| File.join(Prometheus::Client.configuration.multiprocess_files_dir, filename) }
+              .find { |path| Helper::MmapedFile.lock_to_process(path) }
           end
 
           def open_process_exclusive_file(file_prefix = 'mmaped_file')
@@ -102,10 +98,6 @@ module Prometheus
           self.pid = 0
         end
 
-        def initial_mmap_file_size
-          Prometheus::Client.configuration.initial_mmap_file_size
-        end
-
         def entries
           return Enumerator.new {} if used.zero?
 
@@ -118,10 +110,11 @@ module Prometheus
               encoded_len, = data.unpack('l')
               padding_len = 8 - (encoded_len + 4) % 8
               value_offset = 4 + encoded_len + padding_len
+              pos += value_offset
 
-              yielder.yield data, encoded_len, value_offset
+              yielder.yield data, encoded_len, value_offset, pos
 
-              pos += value_offset + 8
+              pos += 8
             end
           end
         end
@@ -150,6 +143,10 @@ module Prometheus
 
         private
 
+        def initial_mmap_file_size
+          Prometheus::Client.configuration.initial_mmap_file_size
+        end
+
         def pid_alive?(pid)
           begin
             Process.getpgid(pid)

data/lib/prometheus/client/mmaped_dict.rb

@@ -26,7 +26,7 @@ module Prometheus
         @used = @m.used
 
         @positions = {}
-        read_all_positions.each do |key, _, pos|
+        read_all_positions.each do |key, pos|
           @positions[key] = pos
         end
       rescue StandardError => e
@@ -37,7 +37,7 @@ module Prometheus
       def self.read_all_values(f)
         m = Helper::MmapedFile.open(f)
 
-        m.entries.map do |data, encoded_len, value_offset|
+        m.entries.map do |data, encoded_len, value_offset, _|
           encoded, value = data.unpack(format('@4A%d@%dd', encoded_len, value_offset))
           [encoded, value]
         end
@@ -73,10 +73,6 @@ module Prometheus
         Prometheus::Client.logger.warn("munmap raised error #{e}")
       end
 
-      def initial_mmap_file_size
-        Prometheus::Client.configuration.initial_mmap_file_size
-      end
-
       private
 
       # Initialize a value. Lock must be held by caller.
@@ -89,11 +85,11 @@ module Prometheus
         @positions[key] = @used - 8
       end
 
-      # Yield (key, value, pos). No locking is performed.
+      # Yield (key, pos). No locking is performed.
       def read_all_positions
-        @m.entries.map do |data, encoded_len, value_offset|
+        @m.entries.map do |data, encoded_len, _, absolute_pos|
           encoded, = data.unpack(format('@4A%d', encoded_len))
-          [encoded, value_offset]
+          [encoded, absolute_pos]
         end
       end
     end

data/lib/prometheus/client/support/unicorn.rb

@@ -4,9 +4,8 @@ module Prometheus
       module Unicorn
         def self.worker_pid_provider
           wid = worker_id
-          wid = Process.pid if wid.nil?
           if wid.nil?
-            "process_pid_#{Process.pid}"
+            "process_id_#{Process.pid}"
           else
             "worker_id_#{wid}"
           end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta17'
+    VERSION = '0.7.0.beta18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta17
+  version: 0.7.0.beta18
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2