prometheus-client-mmap 0.10.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1ee3b09ba34253c97cbc24ea1423e5a9974e679fd4a0d63c596aae583440bd
-  data.tar.gz: 2e2712829e334fb9d4a52658247f0e3a33b553ef40c7b9d67e008ff66d035661
+  metadata.gz: 5bf5a74fabdf7eb344213edc641c57dab7c97bcaad23f5ba45883837f01c9d27
+  data.tar.gz: 9c86ca31dd3e32812a8ce97c13d1f3674f59169b50f0f46b762bf295b8ed33c0
 SHA512:
-  metadata.gz: aa63176edd44f14614d1546fc9d3c467177e061182dc36594c3c23bcb074a6470e7b441bd36a72538ad41866d00741c7afd580a2131500eb72954e3c3458f084
-  data.tar.gz: 8962a9d8d7df151b4645234291fb1a2f75f1caf9a99a9d5d755c7078cbb5705850864084cd0af5330dd2b346a5d2451000035a5e88798d5391bc06f37e26bab2
+  metadata.gz: e3f14c13416a92d5dc621f1d10ad3a5477dd7ee8169613bbf68b5281490c6f8d44af6ac8964c25aaa5847f938196936e0008d655a5bfbad2503295961a05b41a
+  data.tar.gz: f119065ea9ac2bef25cdc1ae92ba784cf0486c32639b47874db815fde359166900ce67adf35d7e003a66d0993fe913afbbfc6fa1f0b7abed48a60a346d5ea52e

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -1,20 +1,17 @@
 #include <errno.h>
+#include <hashmap.h>
+#include <jsmn.h>
 #include <ruby.h>
 #include <ruby/intern.h>
-
 #include <sys/mman.h>
 
-#include <hashmap.h>
-#include <jsmn.h>
-
-#include "globals.h"
-#include "utils.h"
-#include "value_access.h"
-
 #include "file_parsing.h"
 #include "file_reading.h"
+#include "globals.h"
 #include "mmap.h"
 #include "rendering.h"
+#include "utils.h"
+#include "value_access.h"
 
 VALUE MMAPED_FILE = Qnil;
 

data/ext/fast_mmaped_file/file_parsing.c

@@ -1,9 +1,9 @@
+#include "file_parsing.h"
+
 #include <hashmap.h>
 #include <jsmn.h>
-#include <ruby.h>
 
 #include "file_format.h"
-#include "file_parsing.h"
 #include "globals.h"
 #include "utils.h"
 

data/ext/fast_mmaped_file/file_parsing.h

@@ -2,6 +2,7 @@
 #define FILE_PARSING_H
 #include <file_reading.h>
 #include <hashmap.h>
+#include <ruby.h>
 
 typedef struct {
     char *json;

data/ext/fast_mmaped_file/file_reading.c

@@ -1,8 +1,8 @@
+#include "file_reading.h"
+
 #include <errno.h>
 #include <fcntl.h>
-#include <ruby.h>
 
-#include "file_reading.h"
 #include "utils.h"
 
 static int file_open(file_t *source, const char *filepath) {

data/ext/fast_mmaped_file/mmap.c

@@ -1,11 +1,11 @@
+#include "mmap.h"
+
 #include <errno.h>
 #include <fcntl.h>
-#include <ruby.h>
 #include <ruby/util.h>
 #include <sys/mman.h>
 
 #include "file_format.h"
-#include "mmap.h"
 #include "utils.h"
 
 #if 0
@@ -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;
@@ -257,7 +246,7 @@ VALUE mm_init(VALUE obj, VALUE fname) {
 
     if (reserve_mmap_file_bytes(fd, reserve_size) != 0) {
         close(fd);
-        rb_raise(rb_eIOError, "Can't reserve %zu bytes for memory-mapped file", reserve_size);
+        rb_raise(rb_eIOError, "Can't reserve %zu bytes for memory-mapped file in %s", reserve_size, path);
     }
 
     addr = mmap(0, size, pmode, vscope, fd, offset);
@@ -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/ext/fast_mmaped_file/rendering.c

@@ -1,9 +1,10 @@
+#include "rendering.h"
+
 #include <float.h>
 #include <jsmn.h>
 
 #include "file_parsing.h"
 #include "globals.h"
-#include "rendering.h"
 #include "utils.h"
 
 #ifndef DBL_DECIMAL_DIG

data/ext/fast_mmaped_file/utils.c

@@ -1,8 +1,7 @@
-#include <errno.h>
-#include <ruby.h>
-
 #include "utils.h"
 
+#include <errno.h>
+
 static void rb_save_exception(VALUE exception, VALUE message) {
     VALUE current_thread = rb_thread_current();
 

data/ext/fast_mmaped_file/utils.h

@@ -1,5 +1,6 @@
 #ifndef UNUSED_H
 #define UNUSED_H
+#include <ruby.h>
 
 #ifdef UNUSED
 #elif defined(__GNUC__)

data/ext/fast_mmaped_file/value_access.c

@@ -1,15 +1,13 @@
-#include <ruby.h>
-#include <ruby/intern.h>
+#include "value_access.h"
 
 #include <errno.h>
 #include <fcntl.h>
+#include <ruby/intern.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
 #include "file_format.h"
 #include "mmap.h"
-#include "value_access.h"
-
 #include "utils.h"
 
 static void close_file(mm_ipc *i_mm) {

data/ext/fast_mmaped_file/value_access.h

@@ -1,5 +1,6 @@
 #ifndef VALUE_ACCESS_H
 #define VALUE_ACCESS_H
+#include <ruby.h>
 
 VALUE method_load_used(VALUE self);
 

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_dict.rb

@@ -57,6 +57,10 @@ module Prometheus
         Prometheus::Client.logger.warn("munmap raised error #{e}")
       end
 
+      def inspect
+        "#<#{self.class}:0x#{(object_id << 1).to_s(16)}>"
+      end
+
       private
 
       def init_value(key)

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.10.0'.freeze
+    VERSION = '0.14.0'.freeze
   end
 end

metadata

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