prometheus-client-mmap 0.11.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2da1f2b3aafb4f99845a0d57a23b7ddd913cec6cd943ca18657c7743e309053
-  data.tar.gz: 9a757f3213a28d9b21ef0999c1c1f7756ee827dc5303c22d5dd700626010a177
+  metadata.gz: 4a5499ad848cb63f9d28ec70e0c8e625362e3b0d88c39ec99bfb1f8063977225
+  data.tar.gz: 6eb5a5ac105cd8755dbd150e71d8438b29afd91528ecbc8687cb4d2c3f4fdc3d
 SHA512:
-  metadata.gz: 4d1b4457931f0c557debce08e9478bbdc3b933b15aa59df56eac89d65be7091b116b2ebef5fd853b96daa76a61d404b4b9ebf86920b8fccdd4b9a0d92051f66f
-  data.tar.gz: e64a0985943a3bd8460358ab905d9ac387e0b5b829b30ac652707915078d194fae84ab83a700ed6f702d5bae2576f669d983febc5d9479817cc1300926426d98
+  metadata.gz: 8937e83ed07d65c8b77128b12fb9df2e01950381b1f49bfacda43de81d1a087dfa97d646bac096002a4fcd151ecc6080454f1e6d8dd49b5b425b4ab49a0e908c
+  data.tar.gz: 7d63e7dc4965d3cf91efec8abe594c833483f4d2d54869916ba44a8a1b04419ff6eecb453d98f559fd15284c49d0a13d202ca86d2cf1b916933c505e417fe9b8

data/ext/fast_mmaped_file/mmap.c

@@ -42,12 +42,8 @@ static VALUE mm_str(VALUE obj, int modify) {
     GET_MMAP(obj, i_mm, modify & ~MM_ORIGIN);
     if (modify & MM_MODIFY) {
         if (i_mm->t->flag & MM_FROZEN) rb_error_frozen("mmap");
-        if (!OBJ_TAINTED(ret) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify mmap");
     }
     ret = rb_obj_alloc(rb_cString);
-    if (rb_obj_tainted(obj)) {
-        OBJ_TAINT(ret);
-    }
     RSTRING(ret)->as.heap.ptr = i_mm->t->addr;
     RSTRING(ret)->as.heap.aux.capa = i_mm->t->len;
     RSTRING(ret)->as.heap.len = i_mm->t->real;
@@ -216,13 +212,6 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     SafeStringValue(fname);
     path = StringValuePtr(fname);
 
-    {
-        if (rb_safe_level() > 0 && OBJ_TAINTED(fname)) {
-            rb_raise(rb_eSecurityError, "Insecure operation");
-        }
-        rb_secure(1);
-    }
-
     vscope = MAP_SHARED;
     size = 0;
     perm = 0666;
@@ -280,7 +269,6 @@ VALUE mm_init(VALUE obj, VALUE fname) {
     if (smode == O_WRONLY) {
         i_mm->t->flag |= MM_FIXED;
     }
-    OBJ_TAINT(obj);
     return obj;
 }
 

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?
@@ -125,14 +129,10 @@ module Prometheus
 
 
       def rebuild_key
-        labelnames = []
-        labelvalues = []
-        @labels.each do |k, v|
-          labelnames << k
-          labelvalues << v
-        end
+        keys = @labels.keys.sort
+        values = @labels.values_at(*keys)
 
-        [@metric_name, @name, labelnames, labelvalues].to_json
+        [@metric_name, @name, keys, values].to_json
       end
 
       def write_value(key, val)

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.11.0'.freeze
+    VERSION = '0.15.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-08-31 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