prometheus-client-mmap 0.7.0.beta19 → 0.7.0.beta20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010d69c130f93c8618f5bd9daafc5f3df0ccb8fa
-  data.tar.gz: ebea17e5c6d034dde9c0660237482ddae73415c7
+  metadata.gz: 5f3038b491c8c0275542e65d54fdaed12db3d3d4
+  data.tar.gz: 42f7dc3bd93f479970f0c205c2ecb220c4ae8053
 SHA512:
-  metadata.gz: 641ca6e4fb6587f345a340ade98823dd339c2cfc5f2a057d53e8a9f9fdb0f64367c6c51a21b60837cea27bb5d5d8c8fb723c75fcafed9e67d2a22f622d10267a
-  data.tar.gz: 447c4af8a99826c37e4c33059cb4753108ee79afe924e01c882c8c08bbef465b9ecf6c7772eaff63dc4dd48adeea50570cd8d7b14c3203453b4317e06d576765
+  metadata.gz: bbcafb4386700fed0d333cb5a1439e81ea565bd0f1b1ab621d796a696720a28cfef1cb7b5bdacef5d2bd600e68c7b8e2629bab2fa53d2eb7b9449b8df78d3355
+  data.tar.gz: edbd6726495c8e47196de765b297e1868099777bd7770cd440a49834f0084ab49cb996365a4170fcaaa7681a260619c36e1d5cf1550b54df7d28fc35c69becfc

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

@@ -2,17 +2,24 @@ module Prometheus
   module Client
     module Helper
       module EntryParser
+        MINIMUM_SIZE = 8
+        START_POSITION = 8
+
         def used
-          slice(4..7).unpack('l')[0]
+          slice(0..3).unpack('l')[0]
+        end
+
+        def empty?
+          size < MINIMUM_SIZE || used.zero?
         end
 
         def entries
-          return Enumerator.new {} if used.zero?
+          return Enumerator.new {} if empty?
 
           Enumerator.new do |yielder|
             used_ = used # cache used to avoid unnecessary unpack operations
 
-            pos = 12 # pid + used + padding offset
+            pos = START_POSITION # pid + used + padding offset
             while pos < used_
               data = slice(pos..-1)
               encoded_len, = data.unpack('l')

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

@@ -10,7 +10,7 @@ module Prometheus
               @file_locks ||= {}
               return false if @file_locks[filepath]
 
-              file = File.open(filepath, 'w+')
+              file = File.open(filepath, 'ab')
               if file.flock(File::LOCK_NB | File::LOCK_EX)
                 @file_locks[filepath] = file
                 return true

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

@@ -7,26 +7,6 @@ module Prometheus
     module Helper
       class MmapedFile < Mmap
         include EntryParser
-
-        class << self
-          def open(filepath)
-            MmapedFile.new(filepath, 'rw', Mmap::MAP_SHARED)
-          end
-
-          def ensure_exclusive_file(file_prefix = 'mmaped_file')
-            (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::FileLocker.lock_to_process(path) }
-          end
-
-          def open_exclusive_file(file_prefix = 'mmaped_file')
-            filename = Helper::MmapedFile.ensure_exclusive_file(file_prefix)
-            open(filename)
-          end
-        end
-
-        MINIMUM_SIZE = 8
         attr_reader :filepath, :size
 
         def initialize(filepath, mode = 'r', protection = Mmap::MAP_SHARED, options = {})
@@ -41,11 +21,11 @@ module Prometheus
         end
 
         def used=(value)
-          self[4..7] = [value].pack('l')
+          self[0..3] = [value].pack('l')
         end
 
         def add_entry(data, value)
-          self.used = 12 if used.zero?
+          self.used = START_POSITION if used.zero?
 
           # Pad to be 8-byte aligned.
           padded = data + (' ' * (8 - (data.length + 4) % 8))
@@ -71,6 +51,26 @@ module Prometheus
         def initial_mmap_file_size
           Prometheus::Client.configuration.initial_mmap_file_size
         end
+
+        public
+
+        class << self
+          def open(filepath)
+            MmapedFile.new(filepath, 'rw', Mmap::MAP_SHARED)
+          end
+
+          def ensure_exclusive_file(file_prefix = 'mmaped_file')
+            (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::FileLocker.lock_to_process(path) }
+          end
+
+          def open_exclusive_file(file_prefix = 'mmaped_file')
+            filename = Helper::MmapedFile.ensure_exclusive_file(file_prefix)
+            open(filename)
+          end
+        end
       end
     end
   end

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

@@ -13,6 +13,10 @@ module Prometheus
         def slice(*args)
           @data.slice(*args)
         end
+
+        def size
+          @data.length
+        end
       end
     end
   end

data/lib/prometheus/client/mmaped_dict.rb

@@ -15,7 +15,6 @@ module Prometheus
     # size of the next field, a utf-8 encoded string key, padding to an 8 byte
     # alignment, and then a 8 byte float which is the value.
     class MmapedDict
-      MINIMUM_SIZE = 8
       attr_reader :m, :used, :positions
 
       def self.read_all_values(f)

data/lib/prometheus/client/simple_value.rb

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

data/lib/prometheus/client/uses_value_type.rb

@@ -12,6 +12,7 @@ module Prometheus
         value_class.new(type, metric_name, name, labels, *args)
       rescue StandardError => e
         Prometheus::Client.logger.info("error #{e} while creating instance of #{value_class} defaulting to SimpleValue")
+        Prometheus::Client.logger.debug("error #{e} backtrace #{e.backtrace.join("\n")}")
         Prometheus::Client::SimpleValue.new(type, metric_name, name, labels)
       end
     end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta19'
+    VERSION = '0.7.0.beta20'
   end
 end

metadata

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