prometheus-client 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhlZTZiM2NkOGU1ZDUzZWRlMDBkMmQyY2EwMDIxMTg5MjJkZDVhMQ==
+    NjQwNjBmMGRjMjYwMzJmOWVlMDRkNDJiNWM0MTQzYTkwNGE5MWVlZA==
   data.tar.gz: !binary |-
-    ZmZkZjY1YWM0YjM1MThiOTlhODZiZDAyNDE2MjRjZDQ5YmQ1YzAxNQ==
+    MzEyNGViYThkNTViN2RlZTllYTE4MDE1OTQwNDBiMjdhZDQ4MmViNA==
 SHA512:
   metadata.gz: !binary |-
-    Yjk5ODdiMjg2N2JjYWY0YmI0OTYwODg2M2I5ZDRjMWFjOGZmYmMxY2MyM2Q4
-    YjZkODNmNzI3NzUzNWUxOTRkZGNkYWFkM2VmNzdmMjlmMjFlNjNhODMwNjky
-    MjNhNmYzNzMwMDZjMWJkMTFlMTQzNzg0NDZmZGQ0ZTQ4ZmE1YWM=
+    MTBlMDI5NWY3M2UxODgxOTM2MTdiMWM1ODJhZDQxYzRmMGE4NTY2NTBmNWM1
+    ZjczYTQxZTk0ODNlYjk5YmQ3MDJjMzE0MDU1NTljOGU1ODBlYmY5YjRjOTYy
+    MmJlZTY4YWEyMjczMzQwNjVlMWEzZDNlM2VhZTIwZWYyYjY4MGM=
   data.tar.gz: !binary |-
-    NWVhZDQ0ZDdjMTZiNzc4MDAyNWUzMTU5MzJmYzUyMjBlZDBhMzVlODZhMmY4
-    OTE4ZDc2YTliNjU2YzVkZmI1NzA5YmZjNjA3OTZiMGEwMzBjNTVjNmU2YTJi
-    YmZiMTFjNmYyNGEwNDhlOTljMDZiZTU4ZmFjMzUzMjY2YjMzNjI=
+    YWY2ZWRmOTcwZDE0YTdiOTI3MTRlMzE0MDVmNzU3M2RkMjlmYWMyN2E1OGQx
+    MjJlMTk4ZTg3OTQ3YzQyZTE0Nzg4NTEzYjk0ZDI3MDc5OTU5NWQyMjcyOTNk
+    MDg1MjcyNTllNmZjMzM5N2MxMGI5OWFiODUyNjA4MGYzMGNiMDA=

data/README.md

@@ -35,8 +35,8 @@ http_requests.increment
 ### Rack middleware
 
 There are two [Rack][2] middlewares available, one to expose a metrics HTTP
-endpoint to be scraped by a prometheus server and one to trace all HTTP
-requests.
+endpoint to be scraped by a prometheus server ([Exporter][9]) and one to trace all HTTP
+requests ([Collector][10]).
 
 ```ruby
 # config.ru
@@ -160,3 +160,5 @@ rake
 [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/json.rb

@@ -11,8 +11,7 @@ module Prometheus
         MEDIA_TYPE   = 'application/json'
         SCHEMA       = 'prometheus/telemetry'
         VERSION      = '0.0.2'
-        CONTENT_TYPE = \
-          %Q(#{MEDIA_TYPE}; schema="#{SCHEMA}"; version=#{VERSION})
+        CONTENT_TYPE = %(#{MEDIA_TYPE}; schema="#{SCHEMA}"; version=#{VERSION})
 
         MAPPING = { summary: :histogram }
 

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

@@ -7,7 +7,7 @@ module Prometheus
       module Text
         MEDIA_TYPE   = 'text/plain'
         VERSION      = '0.0.4'
-        CONTENT_TYPE = %Q(#{MEDIA_TYPE}; version=#{VERSION})
+        CONTENT_TYPE = "#{MEDIA_TYPE}; version=#{VERSION}"
 
         METRIC_LINE = '%s%s %s'
         TYPE_LINE   = '# TYPE %s %s'
@@ -55,7 +55,7 @@ module Prometheus
 
           l = labels(set)
           yield metric("#{name}_sum", l, value.sum)
-          yield metric("#{name}_total", l, value.total)
+          yield metric("#{name}_count", l, value.total)
         end
 
         def self.metric(name, labels, value)

data/lib/prometheus/client/label_set_validator.rb

@@ -8,10 +8,10 @@ module Prometheus
       # TODO: we might allow setting :instance in the future
       RESERVED_LABELS = [:job, :instance]
 
-      class LabelSetError        < StandardError; end
+      class LabelSetError < StandardError; end
       class InvalidLabelSetError < LabelSetError; end
-      class InvalidLabelError    < LabelSetError; end
-      class ReservedLabelError   < LabelSetError; end
+      class InvalidLabelError < LabelSetError; end
+      class ReservedLabelError < LabelSetError; end
 
       def initialize
         @validated = {}

data/lib/prometheus/client/metric.rb

@@ -18,7 +18,8 @@ module Prometheus
         validate_docstring(docstring)
         @validator.valid?(base_labels)
 
-        @name, @docstring = name, docstring
+        @name = name
+        @docstring = docstring
         @base_labels = base_labels
       end
 

data/lib/prometheus/client/push.rb

@@ -20,9 +20,10 @@ module Prometheus
       attr_reader :job, :instance, :gateway, :path
 
       def initialize(job, instance = nil, gateway = nil)
-        @job, @instance, @gateway = job, instance, gateway || DEFAULT_GATEWAY
-
-        @uri  = parse(@gateway)
+        @job = job
+        @instance = instance
+        @gateway = gateway || DEFAULT_GATEWAY
+        @uri = parse(@gateway)
         @path = build_path(job, instance)
         @http = Net::HTTP.new(@uri.host, @uri.port)
       end

data/lib/prometheus/client/rack/collector.rb

@@ -6,7 +6,8 @@ module Prometheus
   module Client
     module Rack
       # Collector is a Rack middleware that provides a sample implementation of
-      # a Prometheus HTTP client API.
+      # a HTTP tracer. The default label builder can be modified to export a
+      # different set of labels per recorded metric.
       class Collector
         attr_reader :app, :registry
 
@@ -37,7 +38,7 @@ module Prometheus
           @requests_duration = @registry.counter(
             :http_request_durations_total_microseconds,
             'The total amount of time spent answering HTTP requests ' \
-            '(microseconds).',)
+            '(microseconds).')
           @durations = @registry.summary(
             :http_request_durations_microseconds,
             'A histogram of the response latency (microseconds).')

data/lib/prometheus/client/rack/exporter.rb

@@ -8,8 +8,7 @@ module Prometheus
   module Client
     module Rack
       # Exporter is a Rack middleware that provides a sample implementation of
-      # a HTTP tracer. The default label builder can be modified to export a
-      # differet set of labels per recorded metric.
+      # a Prometheus HTTP client API.
       class Exporter
         attr_reader :app, :registry, :path
 

data/lib/prometheus/client/summary.rb

@@ -13,7 +13,8 @@ module Prometheus
         attr_accessor :sum, :total
 
         def initialize(estimator)
-          @sum, @total = estimator.sum, estimator.observations
+          @sum = estimator.sum
+          @total = estimator.observations
 
           estimator.invariants.each do |invariant|
             self[invariant.quantile] = estimator.query(invariant.quantile)

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantile