prometheus-client-mmap 0.7.0.beta4 → 0.7.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa93d5ecbbd6bffa4c6491d4f34b9e08b055f94
-  data.tar.gz: 45e486c61d7047a5d7c9137c9629084af2ed825f
+  metadata.gz: 70cad9d30fe8702c5d934cc6303fcfd657e1c4ec
+  data.tar.gz: 11f7e6cac114e68260ea67a4aab5be3fa43b6259
 SHA512:
-  metadata.gz: 335972a8520b2479e60c8662db64d66500d6417cc6c75a0e042cf040b6771c677fb138fe53fd3eb25093cbec193e0651c3a648de571cc68e3392a9b1b2c1a973
-  data.tar.gz: '009d53e808adca363218b3cc399346895ba345504cbdea7d1ea2d9ab15005138816eff226322665abd034748ada8d03bd7215c6cdacb9ede94ca2c9d795884f1'
+  metadata.gz: 3c4347575300007df7c7dc03718f419fdbc1f49748433a4a10a74a3015efc7ee96f910a5fba27c333bb72f917dd00b22b3e8ba4ba6d4d2c46a6420a4c00f3c6c
+  data.tar.gz: a85b5b8f6a62232822f6759b6282f377e67e573318cb461fa850eaa4d783a9fd2140bb5e5cb99b3fd2861d2a9b7e8c8eeddfe3839b686c1779512caa695f2923

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

@@ -38,7 +38,7 @@ module Prometheus
           (lines << nil).join(DELIMITER)
         end
 
-        def self.marshal_multiprocess(path=ENV['prometheus_multiproc_dir'])
+        def self.marshal_multiprocess(path=Prometheus::Client::Multiprocdir)
           metrics = {}
           Dir.glob(File.join(path, "*.db")).each do |f|
             parts = File.basename(f).split("_")

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

@@ -62,11 +62,8 @@ module Prometheus
         end
 
         def respond_with(format)
-          if ENV.has_key?('prometheus_multiproc_dir')
-            response = format.marshal_multiprocess
-          else
-            response = format.marshal(@registry)
-          end
+          # For now we're only supporting mmapped ValueClass.
+          response = format.marshal_multiprocess
           [
             200,
             { 'Content-Type' => format::CONTENT_TYPE },

data/lib/prometheus/client/summary.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 
-require 'quantile'
 require 'prometheus/client/metric'
 
 module Prometheus
@@ -17,23 +16,11 @@ module Prometheus
         def initialize(type, name, labels)
           @sum = ValueClass.new(type, name, "#{name}_sum", labels)
           @total = ValueClass.new(type, name, "#{name}_count", labels)
-          @estimator = Quantile::Estimator.new
-          @estimator.invariants.each do |invariant|
-            self[invariant.quantile] = ValueClass.new(type, name, "#{name}_summary", labels.merge({:quantile => invariant.quantile}))
-          end
         end
 
         def observe(value)
           @sum.increment(value)
           @total.increment()
-          # TODO: The quantile info is innaccurate as it only contains
-          #       observations per-process.  What needs to happen is for
-          #       observations to be read into the estimator and then reported.
-          #       Alternatively it could be done in the exporter.
-          @estimator.observe(value)
-          @estimator.invariants.each do |invariant|
-            self[invariant.quantile].set(@estimator.query(invariant.quantile))
-          end
         end
       end
 

data/lib/prometheus/client/valuetype.rb

@@ -42,7 +42,7 @@ module Prometheus
 
         @@files_lock.synchronize do
           if !@@files.has_key?(file_prefix)
-            filename = File.join(ENV['prometheus_multiproc_dir'], "#{file_prefix}_#{@@pid}.db")
+            filename = File.join(Prometheus::Client::Multiprocdir, "#{file_prefix}_#{@@pid}.db")
             @@files[file_prefix] = MmapedDict.new(filename)
           end
         end
@@ -90,9 +90,12 @@ module Prometheus
     # and as that may be in some arbitrary library the user/admin has
     # no control over we use an enviroment variable.
     if ENV.has_key?('prometheus_multiproc_dir')
+      Multiprocdir = ENV['prometheus_multiproc_dir']
       ValueClass = MmapedValue
     else
-      ValueClass = SimpleValue
+      # Only support mmap values for now.
+      Multiprocdir = '/var/run/gitlab/unicorn'
+      ValueClass = MmapedValue
     end
   end
 end
@@ -201,4 +204,4 @@ class MmapedDict
     end
     values
   end
-end
+end

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta4'
+    VERSION = '0.7.0.beta5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta4
+  version: 0.7.0.beta5
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.6
-- !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: 
 email:
 - ts@soundcloud.com
@@ -62,7 +48,7 @@ files:
 - lib/prometheus/client/valuetype.rb
 - lib/prometheus/client/version.rb
 - lib/prometheus/client/version.rb.orig
-homepage: https://github.com/pchojnacki/client_ruby
+homepage: https://gitlab.com/gitlab-org/prometheus-client-mmap
 licenses:
 - Apache 2.0
 metadata: {}