prometheus-client-mmap 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fec107115b6e90ebfbc109f0603bb44ca7d7165e637a2e6448ce463ab54c3c7
-  data.tar.gz: 9e9e0382069f57aebe0fb35508a1b82a8e1c61b4b228be573807241b2a434fb8
+  metadata.gz: 77dda8e211c5981651a160500f0332b886e124935e969136abe4fd234ae311e1
+  data.tar.gz: 4ba3176b93611a3bcf63b0aed029408a5f22f33ca16635d05c9c244e33b0bfaa
 SHA512:
-  metadata.gz: 6747ece05958e5b65a92e7305e8edb167e7ffafa84d5f0b24ccc56e8c8977add781f7c88eab1ecca117ae88bb0bbd7150273307f0c5314f33249246cef317dbf
-  data.tar.gz: 7454daa53c15a7cf57e359ebec87dda164609ad43620ebf8a72e287cac4113caba08de8ca3ba2d1efdcf1c0a05f2bdbfb7c2b524d8eb27e63444844f06469ed5
+  metadata.gz: 75cbb10eed65af805c4cccda2e91783ec0ce0987150881ecc763d8de07ea3af150eb20bc41fbaf414dc66d4341141d163cf83514f7f4c913aaf1fdb0efc99dad
+  data.tar.gz: d4b2e4e7a3a78a315cb490a5d07125eaeb2782c6e7c0cb1cbfa0ff302d44ca343b752a29912d3f46b2acc7a6999d84ffe5ee3903d2004a501c2d4dac62f93846

data/lib/prometheus/client/gauge.rb

@@ -31,6 +31,10 @@ module Prometheus
       def increment(labels, value)
         @values[label_set_for(labels)].increment(value)
       end
+
+      def decrement(labels, value)
+        @values[label_set_for(labels)].decrement(value)
+      end
     end
   end
 end

data/lib/prometheus/client/mmaped_value.rb

@@ -36,6 +36,10 @@ module Prometheus
         end
       end
 
+      def decrement(amount = 1)
+        increment(-amount)
+      end
+
       def set(value)
         @mutex.synchronize do
           initialize_file if pid_changed?

data/lib/prometheus/client/push.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
+require 'thread'
 require 'net/http'
 require 'uri'
+require 'erb'
 
 require 'prometheus/client'
 require 'prometheus/client/formats/text'
@@ -13,31 +15,45 @@ module Prometheus
     # Pushgateway.
     class Push
       DEFAULT_GATEWAY = 'http://localhost:9091'.freeze
-      PATH            = '/metrics/jobs/%s'.freeze
-      INSTANCE_PATH   = '/metrics/jobs/%s/instances/%s'.freeze
-      HEADER          = { 'Content-Type' => Formats::Text::CONTENT_TYPE }.freeze
+      PATH            = '/metrics/job/%s'.freeze
+      INSTANCE_PATH   = '/metrics/job/%s/instance/%s'.freeze
+      SUPPORTED_SCHEMES = %w(http https).freeze
 
       attr_reader :job, :instance, :gateway, :path
 
-      def initialize(job, instance = nil, gateway = nil)
+      def initialize(job:, instance: nil, gateway: DEFAULT_GATEWAY, **kwargs)
+        raise ArgumentError, "job cannot be nil" if job.nil?
+        raise ArgumentError, "job cannot be empty" if job.empty?
+
+        @mutex = Mutex.new
         @job = job
         @instance = instance
         @gateway = gateway || DEFAULT_GATEWAY
-        @uri = parse(@gateway)
         @path = build_path(job, instance)
+        @uri = parse("#{@gateway}#{@path}")
+
         @http = Net::HTTP.new(@uri.host, @uri.port)
+        @http.use_ssl = (@uri.scheme == 'https')
+        @http.open_timeout = kwargs[:open_timeout] if kwargs[:open_timeout]
+        @http.read_timeout = kwargs[:read_timeout] if kwargs[:read_timeout]
       end
 
       def add(registry)
-        request('POST', registry)
+        synchronize do
+          request(Net::HTTP::Post, registry)
+        end
       end
 
       def replace(registry)
-        request('PUT', registry)
+        synchronize do
+          request(Net::HTTP::Put, registry)
+        end
       end
 
       def delete
-        @http.send_request('DELETE', path)
+        synchronize do
+          request(Net::HTTP::Delete)
+        end
       end
 
       private
@@ -45,27 +61,34 @@ module Prometheus
       def parse(url)
         uri = URI.parse(url)
 
-        if uri.scheme == 'http'
-          uri
-        else
+        unless SUPPORTED_SCHEMES.include?(uri.scheme)
           raise ArgumentError, 'only HTTP gateway URLs are supported currently.'
         end
+
+        uri
       rescue URI::InvalidURIError => e
         raise ArgumentError, "#{url} is not a valid URL: #{e}"
       end
 
       def build_path(job, instance)
-        if instance
-          format(INSTANCE_PATH, URI.escape(job), URI.escape(instance))
+        if instance && !instance.empty?
+          format(INSTANCE_PATH, ERB::Util::url_encode(job), ERB::Util::url_encode(instance))
         else
-          format(PATH, URI.escape(job))
+          format(PATH, ERB::Util::url_encode(job))
         end
       end
 
-      def request(method, registry)
-        data = Formats::Text.marshal(registry)
+      def request(req_class, registry = nil)
+        req = req_class.new(@uri)
+        req.content_type = Formats::Text::CONTENT_TYPE
+        req.basic_auth(@uri.user, @uri.password) if @uri.user
+        req.body = Formats::Text.marshal(registry) if registry
+
+        @http.request(req)
+      end
 
-        @http.send_request(method, path, data, HEADER)
+      def synchronize
+        @mutex.synchronize { yield }
       end
     end
   end

data/lib/prometheus/client/simple_value.rb

@@ -15,6 +15,10 @@ module Prometheus
         @value += by
       end
 
+      def decrement(by = 1)
+        @value -= by
+      end
+
       def get
         @value
       end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.12.0'.freeze
+    VERSION = '0.13.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzbert
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a