prometheus-client 0.4.2 → 0.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjQwNjBmMGRjMjYwMzJmOWVlMDRkNDJiNWM0MTQzYTkwNGE5MWVlZA==
-  data.tar.gz: !binary |-
-    MzEyNGViYThkNTViN2RlZTllYTE4MDE1OTQwNDBiMjdhZDQ4MmViNA==
+SHA1:
+  metadata.gz: 525f1dcd2ca63486f95a2d2fd44b7f047625edc3
+  data.tar.gz: 0480ce9fd716c715553e8c1a0877345f2124b563
 SHA512:
-  metadata.gz: !binary |-
-    MTBlMDI5NWY3M2UxODgxOTM2MTdiMWM1ODJhZDQxYzRmMGE4NTY2NTBmNWM1
-    ZjczYTQxZTk0ODNlYjk5YmQ3MDJjMzE0MDU1NTljOGU1ODBlYmY5YjRjOTYy
-    MmJlZTY4YWEyMjczMzQwNjVlMWEzZDNlM2VhZTIwZWYyYjY4MGM=
-  data.tar.gz: !binary |-
-    YWY2ZWRmOTcwZDE0YTdiOTI3MTRlMzE0MDVmNzU3M2RkMjlmYWMyN2E1OGQx
-    MjJlMTk4ZTg3OTQ3YzQyZTE0Nzg4NTEzYjk0ZDI3MDc5OTU5NWQyMjcyOTNk
-    MDg1MjcyNTllNmZjMzM5N2MxMGI5OWFiODUyNjA4MGYzMGNiMDA=
+  metadata.gz: 362f0157652258f5270dc815434d7ef4768e4842a68a5a344e9dcff41ee494fadcab29d0c15c5764310bfa8d9b1655e27a829a7c62782505ea3c6f611402796e
+  data.tar.gz: 548905e7ec71056de3e6a622073bf0fc342f6dca7a6d9c0c783411c35ab7f306aa87f71aecab7fc128a4dfd232f62dcb72dca0682a3421451d162844dab66960

data/README.md

@@ -1,7 +1,7 @@
 # Prometheus Ruby Client
 
 A suite of instrumentation metric primitives for Ruby that can be exposed
-through a JSON web services interface. Intended to be used together with a
+through a HTTP interface. Intended to be used together with a
 [Prometheus server][1].
 
 [![Gem Version][4]](http://badge.fury.io/rb/prometheus-client)
@@ -38,6 +38,9 @@ There are two [Rack][2] middlewares available, one to expose a metrics HTTP
 endpoint to be scraped by a prometheus server ([Exporter][9]) and one to trace all HTTP
 requests ([Collector][10]).
 
+It's highly recommended to enable gzip compression for the metrics endpoint,
+for example by including the `Rack::Deflater` middleware.
+
 ```ruby
 # config.ru
 
@@ -45,9 +48,11 @@ require 'rack'
 require 'prometheus/client/rack/collector'
 require 'prometheus/client/rack/exporter'
 
+use Rack::Deflater, if: ->(env, status, headers, body) { body.any? && body[0].length > 512 }
 use Prometheus::Client::Rack::Collector
 use Prometheus::Client::Rack::Exporter
-run lambda { |env| [200, {'Content-Type' => 'text/html'}, ['OK']] }
+
+run ->(env) { [200, {'Content-Type' => 'text/html'}, ['OK']] }
 ```
 
 Start the server and have a look at the metrics endpoint:

data/lib/prometheus/client/counter.rb

@@ -11,14 +11,12 @@ module Prometheus
       end
 
       def increment(labels = {}, by = 1)
+        fail ArgumentError, 'increment must be a non-negative number' if by < 0
+
         label_set = label_set_for(labels)
         synchronize { @values[label_set] += by }
       end
 
-      def decrement(labels = {}, by = 1)
-        increment(labels, -by)
-      end
-
       private
 
       def default

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

@@ -14,12 +14,7 @@ module Prometheus
         def initialize(app, options = {}, &label_builder)
           @app = app
           @registry = options[:registry] || Client.registry
-          @label_builder = label_builder || proc do |env|
-            {
-              method: env['REQUEST_METHOD'].downcase,
-              path:   env['PATH_INFO'].to_s,
-            }
-          end
+          @label_builder = label_builder || DEFAULT_LABEL_BUILDER
 
           init_request_metrics
           init_exception_metrics
@@ -31,17 +26,24 @@ module Prometheus
 
         protected
 
+        DEFAULT_LABEL_BUILDER = proc do |env|
+          {
+            method: env['REQUEST_METHOD'].downcase,
+            host:   env['HTTP_HOST'].to_s,
+            path:   env['PATH_INFO'].to_s,
+          }
+        end
+
         def init_request_metrics
           @requests = @registry.counter(
             :http_requests_total,
             'A counter of the total number of HTTP requests made.')
           @requests_duration = @registry.counter(
-            :http_request_durations_total_microseconds,
-            'The total amount of time spent answering HTTP requests ' \
-            '(microseconds).')
+            :http_request_duration_total_seconds,
+            'The total amount of time spent answering HTTP requests.')
           @durations = @registry.summary(
-            :http_request_durations_microseconds,
-            'A histogram of the response latency (microseconds).')
+            :http_request_duration_seconds,
+            'A histogram of the response latency.')
         end
 
         def init_exception_metrics
@@ -53,7 +55,7 @@ module Prometheus
         def trace(env)
           start = Time.now
           yield.tap do |response|
-            duration = ((Time.now - start) * 1_000_000).to_i
+            duration = (Time.now - start).to_f
             record(labels(env, response), duration)
           end
         rescue => exception

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

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 require 'prometheus/client'
-require 'prometheus/client/formats/json'
 require 'prometheus/client/formats/text'
 
 module Prometheus
@@ -12,8 +11,8 @@ module Prometheus
       class Exporter
         attr_reader :app, :registry, :path
 
-        FORMATS  = [Formats::Text, Formats::JSON]
-        FALLBACK = Formats::JSON
+        FORMATS  = [Formats::Text]
+        FALLBACK = Formats::Text
 
         def initialize(app, options = {})
           @app = app

data/lib/prometheus/client/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: 
@@ -34,16 +34,15 @@ files:
 - README.md
 - lib/prometheus.rb
 - lib/prometheus/client.rb
-- lib/prometheus/client/registry.rb
-- lib/prometheus/client/rack/collector.rb
-- lib/prometheus/client/rack/exporter.rb
+- lib/prometheus/client/counter.rb
+- lib/prometheus/client/formats/text.rb
 - lib/prometheus/client/gauge.rb
 - lib/prometheus/client/label_set_validator.rb
-- lib/prometheus/client/formats/json.rb
-- lib/prometheus/client/formats/text.rb
-- lib/prometheus/client/push.rb
 - lib/prometheus/client/metric.rb
-- lib/prometheus/client/counter.rb
+- lib/prometheus/client/push.rb
+- lib/prometheus/client/rack/collector.rb
+- lib/prometheus/client/rack/exporter.rb
+- lib/prometheus/client/registry.rb
 - lib/prometheus/client/summary.rb
 - lib/prometheus/client/version.rb
 homepage: https://github.com/prometheus/client_ruby
@@ -56,17 +55,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a

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

@@ -1,33 +0,0 @@
-# encoding: UTF-8
-
-require 'json'
-
-module Prometheus
-  module Client
-    module Formats
-      # JSON format is a deprecated, human-readable format to expose the state
-      # of a given registry.
-      module JSON
-        MEDIA_TYPE   = 'application/json'
-        SCHEMA       = 'prometheus/telemetry'
-        VERSION      = '0.0.2'
-        CONTENT_TYPE = %(#{MEDIA_TYPE}; schema="#{SCHEMA}"; version=#{VERSION})
-
-        MAPPING = { summary: :histogram }
-
-        def self.marshal(registry)
-          registry.metrics.map do |metric|
-            {
-              baseLabels: metric.base_labels.merge(__name__: metric.name),
-              docstring:  metric.docstring,
-              metric: {
-                type:  MAPPING[metric.type] || metric.type,
-                value: metric.values.map { |l, v| { labels: l, value: v } },
-              },
-            }
-          end.to_json
-        end
-      end
-    end
-  end
-end