prometheus-client-mmap 0.7.0.beta11 → 0.7.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a1732cd0b1d06b876c82eac1ee2e2b43f461d0
-  data.tar.gz: 1720a2b8f8b5d81dc817876f6cbce85a0f76f838
+  metadata.gz: d37ca4308c9dbdb10a22066b37df88b7e456cfb3
+  data.tar.gz: a27b2e124d343da9bb5b8f639894cd84f846334a
 SHA512:
-  metadata.gz: fa2cacd9b3b5f63fe7022a9d848c7e02f2a76959787ae4be62ead6031a1bc05060aeb0169e58b3a8bc9aa1e4afce8e59181ed4bf41e8350b05ff417c8cbea6e3
-  data.tar.gz: 2573ac9665891684612a9768bbb9b8c7f1c2e6c05d15c573c4f5377da1482a3a678953e9d3e1dc47d015b75cdbd3ef7a9eb144989287ca5e38fad3ef2dddfa1d
+  metadata.gz: 8fba7137a3ea1f5fa1ea375bb1999d85b1765a6c73adb69ef77a0f6f2d77db4f1ac057a37de600baf8b6abe355aaac97ee4db88e4ccf82aa81b4b14f4d845df9
+  data.tar.gz: e785931142ce33b5485b6dcb6742adaedc238235fd1c92e5117cfd3d483945912b9a721719a91ad6b013f4a8038dcb20c1a10e3bfe5fb47fff20115168055f9f

data/README.md

@@ -1,14 +1,16 @@
-# Prometheus Ruby Client
+# Prometheus Ruby Mmap Client
+
+This Prometheus library is fork of [Prometheus Ruby Client](https://github.com/prometheus/client_ruby)
+that uses mmap'ed files to share metrics from multiple processes.
+This allows efficient metrics processing for Ruby web apps running in multiprocess setups like Unicorn.
 
 A suite of instrumentation metric primitives for Ruby that can be exposed
 through a HTTP interface. Intended to be used together with a
 [Prometheus server][1].
 
-[![Gem Version][4]](http://badge.fury.io/rb/prometheus-client)
-[![Build Status][3]](http://travis-ci.org/prometheus/client_ruby)
+[![Gem Version][4]](http://badge.fury.io/rb/prometheus-client-mmap)
+[![Build Status][3]](https://gitlab.com/gitlab-org/prometheus-client-mmap/commits/master)
 [![Dependency Status][5]](https://gemnasium.com/prometheus/client_ruby)
-[![Code Climate][6]](https://codeclimate.com/github/prometheus/client_ruby)
-[![Coverage Status][7]](https://coveralls.io/r/prometheus/client_ruby)
 
 ## Usage
 
@@ -173,11 +175,8 @@ rake
 
 [1]: https://github.com/prometheus/prometheus
 [2]: http://rack.github.io/
-[3]: https://secure.travis-ci.org/prometheus/client_ruby.png?branch=master
+[3]: https://gitlab.com/gitlab-org/prometheus-client-mmap/badges/master/pipeline.svg
 [4]: https://badge.fury.io/rb/prometheus-client.svg
-[5]: https://gemnasium.com/prometheus/client_ruby.svg
-[6]: https://codeclimate.com/github/prometheus/client_ruby.png
-[7]: https://coveralls.io/repos/prometheus/client_ruby/badge.png?branch=master
 [8]: https://github.com/prometheus/pushgateway
 [9]: lib/prometheus/client/rack/exporter.rb
 [10]: lib/prometheus/client/rack/collector.rb

data/lib/prometheus/client/formats/text.rb

@@ -5,96 +5,95 @@ module Prometheus
     module Formats
       # Text format is human readable mainly used for manual inspection.
       module Text
-        MEDIA_TYPE   = 'text/plain'.freeze
-        VERSION      = '0.0.4'.freeze
+        MEDIA_TYPE = 'text/plain'.freeze
+        VERSION = '0.0.4'.freeze
         CONTENT_TYPE = "#{MEDIA_TYPE}; version=#{VERSION}".freeze
 
         METRIC_LINE = '%s%s %s'.freeze
-        TYPE_LINE   = '# TYPE %s %s'.freeze
-        HELP_LINE   = '# HELP %s %s'.freeze
+        TYPE_LINE = '# TYPE %s %s'.freeze
+        HELP_LINE = '# HELP %s %s'.freeze
 
-        LABEL     = '%s="%s"'.freeze
+        LABEL = '%s="%s"'.freeze
         SEPARATOR = ','.freeze
         DELIMITER = "\n".freeze
 
-        REGEX   = { doc: /[\n\\]/, label: /[\n\\"]/ }.freeze
+        REGEX = { doc: /[\n\\]/, label: /[\n\\"]/ }.freeze
         REPLACE = { "\n" => '\n', '\\' => '\\\\', '"' => '\"' }.freeze
 
-        def self.marshal(registry)
-          lines = []
-
-          registry.metrics.each do |metric|
-            lines << format(TYPE_LINE, metric.name, metric.type)
-            lines << format(HELP_LINE, metric.name, escape(metric.docstring))
-
-            metric.values.each do |label_set, value|
-              representation(metric, label_set, value) { |l| lines << l }
+        class << self
+          def marshal(registry)
+            lines = []
+
+            registry.metrics.each do |metric|
+              lines << format(HELP_LINE, metric.name, escape(metric.docstring))
+              lines << format(TYPE_LINE, metric.name, metric.type)
+              metric.values.each do |label_set, value|
+                representation(metric, label_set, value) { |l| lines << l }
+              end
             end
+
+            # there must be a trailing delimiter
+            (lines << nil).join(DELIMITER)
           end
 
-          # there must be a trailing delimiter
-          (lines << nil).join(DELIMITER)
-        end
+          def marshal_multiprocess(path = Prometheus::Client.configuration.multiprocess_files_dir)
+            metrics = load_metrics(path)
 
-        def self.marshal_multiprocess(path = Prometheus::Client.configuration.multiprocess_files_dir)
-          metrics = load_metrics(path)
+            lines = []
+            merge_metrics(metrics).each do |name, metric|
+              lines << format(HELP_LINE, name, escape(metric[:help]))
+              lines << format(TYPE_LINE, name, metric[:type])
 
-          metrics.each_value do |metric|
-            samples = {}
-            buckets = {}
-            metric[:samples].each do |name, labels, value|
-              case metric[:type]
-              when :gauge
-                without_pid = labels.select{ |l| l[0] != 'pid' }
-                case metric[:multiprocess_mode]
-                when 'min'
-                  s = samples.fetch([name, without_pid], value)
-                  samples[[name, without_pid]] = [s, value].min
-                when 'max'
-                  s = samples.fetch([name, without_pid], value)
-                  samples[[name, without_pid]] = [s, value].max
-                when 'livesum'
-                  s = samples.fetch([name, without_pid], 0.0)
-                  samples[[name, without_pid]] = s + value
-                else # all/liveall
-                  samples[[name, labels]] = value
-                end
-              else
-                # Counter, Histogram and Summary.
-                without_pid = labels.select{ |l| l[0] != 'pid' }
-                s = samples.fetch([name, without_pid], 0.0)
-                samples[[name, without_pid]] = s + value
+              metric[:samples].each do |metric_name, labels, value|
+                lines << metric(metric_name, format_labels(labels), value)
               end
+            end
+            (lines << nil).join(DELIMITER)
+          end
 
-              metric[:samples] = samples.map do |name_labels, value|
-                name, labels = name_labels
+          private
+
+          def merge_metrics(metrics)
+            metrics.each_value do |metric|
+              metric[:samples] = merge_samples(metric[:samples], metric[:type], metric[:multiprocess_mode]).map do |(name, labels), value|
                 [name, labels.to_h, value]
               end
             end
           end
 
-          output = ''
-          metrics.each do |name, metric|
-            output += "# HELP #{name} #{metric[:help]}\n"
-            output += "# TYPE #{name} #{metric[:type].to_s}\n"
-            metric[:samples].each do |metric_name, labels, value|
-              if !labels.empty?
-                labelstr = '{' + labels.sort.map { |k, v| "#{k}=\"#{v}\"" }.join(',') + '}'
-              else
-                labelstr = ''
+          def merge_samples(raw_samples, metric_type, multiprocess_mode)
+            samples = {}
+            raw_samples.each do |name, labels, value|
+              without_pid = labels.reject { |l| l[0] == 'pid' }
+
+              case metric_type
+                when :gauge
+                  case multiprocess_mode
+                    when 'min'
+                      s = samples.fetch([name, without_pid], value)
+                      samples[[name, without_pid]] = [s, value].min
+                    when 'max'
+                      s = samples.fetch([name, without_pid], value)
+                      samples[[name, without_pid]] = [s, value].max
+                    when 'livesum'
+                      s = samples.fetch([name, without_pid], 0.0)
+                      samples[[name, without_pid]] = s + value
+                    else # all/liveall
+                      samples[[name, labels]] = value
+                  end
+                else
+                  # Counter, Histogram and Summary.
+                  s = samples.fetch([name, without_pid], 0.0)
+                  samples[[name, without_pid]] = s + value
               end
-              output += "#{metric_name}#{labelstr} #{value}\n"
             end
-          end
-          output
-        end
 
-        class << self
-          private
+            samples
+          end
 
           def load_metrics(path)
             metrics = {}
-            Dir.glob(File.join(path, '*.db')).each do |f|
+            Dir.glob(File.join(path, '*.db')).sort.each do |f|
               parts = File.basename(f, '.db').split('_')
               type = parts[0].to_sym
               d = MmapedDict.new(f)
@@ -133,36 +132,36 @@ module Prometheus
             elsif metric.type == :histogram
               histogram(metric.name, set, value, &block)
             else
-              yield metric(metric.name, labels(set), value.get)
+              yield metric(metric.name, format_labels(set), value.get)
             end
           end
 
           def summary(name, set, value)
-            value.each do |q, v|
-              yield metric(name, labels(set.merge(quantile: q)), v.get)
+            value.get.each do |q, v|
+              yield metric(name, format_labels(set.merge(quantile: q)), v)
             end
 
-            l = labels(set)
-            yield metric("#{name}_sum", l, value.sum.get)
-            yield metric("#{name}_count", l, value.total.get)
+            l = format_labels(set)
+            yield metric("#{name}_sum", l, value.get.sum)
+            yield metric("#{name}_count", l, value.get.total)
           end
 
           def histogram(name, set, value)
-            value.each do |q, v|
-              yield metric(name, labels(set.merge(le: q)), v.get)
+            value.get.each do |q, v|
+              yield metric(name, format_labels(set.merge(le: q)), v)
             end
-            yield metric(name, labels(set.merge(le: '+Inf')), value.total.get)
+            yield metric(name, format_labels(set.merge(le: '+Inf')), value.get.total)
 
-            l = labels(set)
-            yield metric("#{name}_sum", l, value.sum.get)
-            yield metric("#{name}_count", l, value.total.get)
+            l = format_labels(set)
+            yield metric("#{name}_sum", l, value.get.sum)
+            yield metric("#{name}_count", l, value.get.total)
           end
 
           def metric(name, labels, value)
             format(METRIC_LINE, name, labels, value)
           end
 
-          def labels(set)
+          def format_labels(set)
             return if set.empty?
 
             strings = set.each_with_object([]) do |(key, value), memo|

data/lib/prometheus/client/metric.rb

@@ -4,7 +4,6 @@ require 'prometheus/client/uses_value_type'
 
 module Prometheus
   module Client
-    # Metric
     class Metric
       include UsesValueType
       attr_reader :name, :docstring, :base_labels

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta11'
+    VERSION = '0.7.0.beta12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta11
+  version: 0.7.0.beta12
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2