prometheus-client-mmap 0.21.0-x86_64-linux-musl → 1.2.1-x86_64-linux-musl

data/ext/fast_mmaped_file_rs/src/raw_entry.rs

@@ -6,7 +6,7 @@ use crate::util::CheckedOps;
 use crate::Result;
 
 /// The logic to save a `MetricsEntry`, or parse one from a byte slice.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 pub struct RawEntry<'a> {
     bytes: &'a [u8],
     encoded_len: usize,

data/ext/fast_mmaped_file_rs/src/testhelper.rs

@@ -73,7 +73,7 @@ pub fn entries_to_db(entries: &[&'static str], values: &[f64], header: Option<u3
     };
 
     out.extend(used.to_ne_bytes());
-    out.extend(&[0x0u8; 4]); // Padding.
+    out.extend([0x0u8; 4]); // Padding.
     out.extend(entry_bytes);
 
     out

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

@@ -26,49 +26,16 @@ module Prometheus
             Helper::MetricsRepresentation.to_text(metrics)
           end
 
-          def marshal_multiprocess(path = Prometheus::Client.configuration.multiprocess_files_dir, use_rust: false)
+          def marshal_multiprocess(path = Prometheus::Client.configuration.multiprocess_files_dir)
             file_list = Dir.glob(File.join(path, '*.db')).sort
               .map {|f| Helper::PlainFile.new(f) }
               .map {|f| [f.filepath, f.multiprocess_mode.to_sym, f.type.to_sym, f.pid] }
 
-            if use_rust && rust_impl_available?
               FastMmapedFileRs.to_metrics(file_list.to_a)
-            else
-              FastMmapedFile.to_metrics(file_list.to_a)
-            end
-          end
-
-          def rust_impl_available?
-            return @rust_available unless @rust_available.nil?
-
-            check_for_rust
           end
 
           private
 
-          def load_rust_extension
-            begin
-              ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION)
-              require_relative "../../../#{ruby_version}/fast_mmaped_file_rs"
-            rescue LoadError
-              require 'fast_mmaped_file_rs'
-            end
-          end
-
-          def check_for_rust
-            # This will be evaluated on each invocation even with `||=` if
-            # `@rust_available` if false. Running a `require` statement is slow,
-            # so the `rust_impl_available?` method memoizes the result, external
-            # callers can only trigger this method a single time.
-            @rust_available = begin
-              load_rust_extension
-              true
-            rescue LoadError
-              Prometheus::Client.logger.info('FastMmapedFileRs unavailable')
-              false
-            end
-          end
-
           def load_metrics(path)
             metrics = {}
             Dir.glob(File.join(path, '*.db')).sort.each do |f|

data/lib/prometheus/client/helper/mmaped_file.rb

@@ -4,15 +4,15 @@ require 'prometheus/client/helper/file_locker'
 # load precompiled extension if available
 begin
   ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION)
-  require_relative "../../../#{ruby_version}/fast_mmaped_file"
+  require_relative "../../../#{ruby_version}/fast_mmaped_file_rs"
 rescue LoadError
-  require 'fast_mmaped_file'
+  require 'fast_mmaped_file_rs'
 end
 
 module Prometheus
   module Client
     module Helper
-      class MmapedFile < FastMmapedFile
+      class MmapedFile < FastMmapedFileRs
         include EntryParser
 
         attr_reader :filepath, :size

data/lib/prometheus/client/label_set_validator.rb

@@ -5,8 +5,7 @@ module Prometheus
     # LabelSetValidator ensures that all used label sets comply with the
     # Prometheus specification.
     class LabelSetValidator
-      # TODO: we might allow setting :instance in the future
-      RESERVED_LABELS = [:job, :instance].freeze
+      RESERVED_LABELS = [].freeze
 
       class LabelSetError < StandardError; end
       class InvalidLabelSetError < LabelSetError; end

data/lib/prometheus/client/support/puma.rb

@@ -0,0 +1,44 @@
+module Prometheus
+  module Client
+    module Support
+      module Puma
+        extend self
+
+        def worker_pid_provider
+          wid = worker_id
+          if wid = worker_id
+            wid
+          else
+            "process_id_#{Process.pid}"
+          end
+        end
+
+        private
+
+        def object_based_worker_id
+          return unless defined?(::Puma::Cluster::Worker)
+
+          workers = ObjectSpace.each_object(::Puma::Cluster::Worker)
+          return if workers.nil?
+
+          workers_first = workers.first
+          workers_first.index unless workers_first.nil?
+        end
+
+        def program_name
+          $PROGRAM_NAME
+        end
+
+        def worker_id
+          if matchdata = program_name.match(/puma.*cluster worker ([0-9]+):/)
+            "puma_#{matchdata[1]}"
+          elsif object_worker_id = object_based_worker_id
+            "puma_#{object_worker_id}"
+          elsif program_name.include?('puma')
+            'puma_master'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.21.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 1.2.1
 platform: x86_64-linux-musl
 authors:
 - Tobias Schmidt
 - Paweł Chojnacki
+- Stan Hu
+- Will Chandler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2024-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -17,14 +19,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.86
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.86
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuzzbert
   requirement: !ruby/object:Gem::Requirement
@@ -79,72 +109,71 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: '1.7'
 description: 
 email:
 - ts@soundcloud.com
 - pawel@gitlab.com
+- stanhu@gmail.com
+- wchandler@gitlab.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".tool-versions"
 - README.md
-- ext/fast_mmaped_file/extconf.rb
-- ext/fast_mmaped_file/fast_mmaped_file.c
-- ext/fast_mmaped_file/file_format.c
-- ext/fast_mmaped_file/file_format.h
-- ext/fast_mmaped_file/file_parsing.c
-- ext/fast_mmaped_file/file_parsing.h
-- ext/fast_mmaped_file/file_reading.c
-- ext/fast_mmaped_file/file_reading.h
-- ext/fast_mmaped_file/globals.h
-- ext/fast_mmaped_file/mmap.c
-- ext/fast_mmaped_file/mmap.h
-- ext/fast_mmaped_file/rendering.c
-- ext/fast_mmaped_file/rendering.h
-- ext/fast_mmaped_file/utils.c
-- ext/fast_mmaped_file/utils.h
-- ext/fast_mmaped_file/value_access.c
-- ext/fast_mmaped_file/value_access.h
-- ext/fast_mmaped_file_rs/.cargo/config.toml
-- ext/fast_mmaped_file_rs/Cargo.lock
 - ext/fast_mmaped_file_rs/Cargo.toml
 - ext/fast_mmaped_file_rs/README.md
+- ext/fast_mmaped_file_rs/build.rs
 - ext/fast_mmaped_file_rs/extconf.rb
 - ext/fast_mmaped_file_rs/src/error.rs
 - ext/fast_mmaped_file_rs/src/file_entry.rs
@@ -153,18 +182,14 @@ files:
 - ext/fast_mmaped_file_rs/src/macros.rs
 - ext/fast_mmaped_file_rs/src/map.rs
 - ext/fast_mmaped_file_rs/src/mmap.rs
-- ext/fast_mmaped_file_rs/src/parser.rs
+- ext/fast_mmaped_file_rs/src/mmap/inner.rs
 - ext/fast_mmaped_file_rs/src/raw_entry.rs
 - ext/fast_mmaped_file_rs/src/testhelper.rs
 - ext/fast_mmaped_file_rs/src/util.rs
-- lib/2.7/fast_mmaped_file.so
-- lib/2.7/fast_mmaped_file_rs.so
-- lib/3.0/fast_mmaped_file.so
-- lib/3.0/fast_mmaped_file_rs.so
-- lib/3.1/fast_mmaped_file.so
 - lib/3.1/fast_mmaped_file_rs.so
-- lib/3.2/fast_mmaped_file.so
 - lib/3.2/fast_mmaped_file_rs.so
+- lib/3.3/fast_mmaped_file_rs.so
+- lib/3.4/fast_mmaped_file_rs.so
 - lib/prometheus.rb
 - lib/prometheus/client.rb
 - lib/prometheus/client/configuration.rb
@@ -190,29 +215,10 @@ files:
 - lib/prometheus/client/registry.rb
 - lib/prometheus/client/simple_value.rb
 - lib/prometheus/client/summary.rb
+- lib/prometheus/client/support/puma.rb
 - lib/prometheus/client/support/unicorn.rb
 - lib/prometheus/client/uses_value_type.rb
 - lib/prometheus/client/version.rb
-- vendor/c/hashmap/.gitignore
-- vendor/c/hashmap/LICENSE
-- vendor/c/hashmap/README.md
-- vendor/c/hashmap/_config.yml
-- vendor/c/hashmap/src/hashmap.c
-- vendor/c/hashmap/src/hashmap.h
-- vendor/c/hashmap/test/Makefile
-- vendor/c/hashmap/test/hashmap_test.c
-- vendor/c/jsmn/.travis.yml
-- vendor/c/jsmn/LICENSE
-- vendor/c/jsmn/Makefile
-- vendor/c/jsmn/README.md
-- vendor/c/jsmn/example/jsondump.c
-- vendor/c/jsmn/example/simple.c
-- vendor/c/jsmn/jsmn.c
-- vendor/c/jsmn/jsmn.h
-- vendor/c/jsmn/library.json
-- vendor/c/jsmn/test/test.h
-- vendor/c/jsmn/test/tests.c
-- vendor/c/jsmn/test/testutil.h
 homepage: https://gitlab.com/gitlab-org/prometheus-client-mmap
 licenses:
 - Apache-2.0
@@ -225,19 +231,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.dev
+      version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
-summary: A suite of instrumentation metric primitivesthat can be exposed through a
-  web services interface.
+summary: A suite of instrumentation metric primitives that can be exposed through
+  a web services interface.
 test_files: []

data/ext/fast_mmaped_file/extconf.rb

@@ -1,30 +0,0 @@
-require 'mkmf'
-require 'fileutils'
-
-$CFLAGS << ' -std=c99 -D_POSIX_C_SOURCE=200809L -Wall -Wextra'
-
-if enable_config('fail-on-warning')
-  $CFLAGS << ' -Werror'
-end
-
-if enable_config('debug')
-  $CFLAGS << ' -O0 -g'
-end
-
-if enable_config('address-sanitizer')
-  $CFLAGS << ' -O -fsanitize=address -fno-omit-frame-pointer -g'
-end
-
-CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
-
-cwd = File.expand_path(File.dirname(__FILE__))
-vendor_dir = File.join(cwd, '../../vendor/c')
-src_dir = File.join(cwd, '../../ext/fast_mmaped_file')
-
-src_files = %W[#{vendor_dir}/jsmn/jsmn.c #{vendor_dir}/hashmap/src/hashmap.c]
-FileUtils.cp(src_files, src_dir)
-
-$INCFLAGS << " -I#{vendor_dir}/jsmn -I#{vendor_dir}/hashmap/src"
-
-dir_config('fast_mmaped_file')
-create_makefile('fast_mmaped_file')

data/ext/fast_mmaped_file/fast_mmaped_file.c

@@ -1,122 +0,0 @@
-#include <errno.h>
-#include <hashmap.h>
-#include <jsmn.h>
-#include <ruby.h>
-#include <ruby/intern.h>
-#include <sys/mman.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;
-
-ID sym_min;
-ID sym_max;
-ID sym_livesum;
-ID sym_gauge;
-ID sym_pid;
-ID sym_samples;
-
-VALUE prom_eParsingError;
-
-int aggregate_files(struct hashmap *map, VALUE list_of_files) {
-    buffer_t reading_buffer;
-    memset(&reading_buffer, 0, sizeof(buffer_t));
-
-    for (int i = 0; i < RARRAY_LEN(list_of_files); i++) {
-        VALUE params = RARRAY_PTR(list_of_files)[i];
-        file_t file;
-
-        if (!file_open_from_params(&file, params)) {
-            buffer_dispose(&reading_buffer);
-            return 0;
-        }
-
-        if (!read_from_file(&file, &reading_buffer)) {
-            buffer_dispose(&reading_buffer);
-            file_close(&file);
-            return 0;
-        }
-
-        if (!process_buffer(&file, &reading_buffer, map)) {
-            buffer_dispose(&reading_buffer);
-            file_close(&file);
-            return 0;
-        }
-
-        if (!file_close(&file)) {
-            buffer_dispose(&reading_buffer);
-            return 0;
-        }
-    }
-
-    buffer_dispose(&reading_buffer);
-    return 1;
-}
-
-VALUE method_to_metrics(VALUE UNUSED(self), VALUE file_list) {
-    struct hashmap map;
-    hashmap_setup(&map);
-
-    if (!aggregate_files(&map, file_list)) {  // all entries in map are now copies that need to be disposed
-        hashmap_destroy(&map);
-        raise_last_exception();
-        return Qnil;
-    }
-
-    entry_t **sorted_entries;
-
-    if (!sort_map_entries(&map, &sorted_entries)) {
-        hashmap_destroy(&map);
-
-        raise_last_exception();
-        return Qnil;
-    }
-
-    VALUE rv = rb_str_new("", 0);
-    if (!entries_to_string(rv, sorted_entries, hashmap_size(&map))) {
-        free(sorted_entries);
-        hashmap_destroy(&map);
-
-        raise_last_exception();
-        return Qnil;
-    }
-
-    RB_GC_GUARD(file_list);  // ensure file list is not GCed before this point
-    free(sorted_entries);
-    hashmap_destroy(&map);
-    return rv;
-}
-
-void Init_fast_mmaped_file() {
-    sym_gauge = rb_intern("gauge");
-    sym_min = rb_intern("min");
-    sym_max = rb_intern("max");
-    sym_livesum = rb_intern("livesum");
-    sym_pid = rb_intern("pid");
-    sym_samples = rb_intern("samples");
-
-    prom_eParsingError = rb_define_class("PrometheusParsingError", rb_eRuntimeError);
-
-    MMAPED_FILE = rb_define_class("FastMmapedFile", rb_cObject);
-    rb_define_const(MMAPED_FILE, "MAP_SHARED", INT2FIX(MAP_SHARED));
-
-    rb_define_singleton_method(MMAPED_FILE, "to_metrics", method_to_metrics, 1);
-
-    rb_define_alloc_func(MMAPED_FILE, mm_s_alloc);
-    rb_define_singleton_method(MMAPED_FILE, "new", mm_s_new, -1);
-    rb_define_method(MMAPED_FILE, "initialize", mm_init, 1);
-    rb_define_method(MMAPED_FILE, "slice", mm_aref_m, -1);
-    rb_define_method(MMAPED_FILE, "sync", mm_msync, -1);
-    rb_define_method(MMAPED_FILE, "munmap", mm_unmap, 0);
-
-    rb_define_method(MMAPED_FILE, "used", method_load_used, 0);
-    rb_define_method(MMAPED_FILE, "used=", method_save_used, 1);
-    rb_define_method(MMAPED_FILE, "fetch_entry", method_fetch_entry, 3);
-    rb_define_method(MMAPED_FILE, "upsert_entry", method_upsert_entry, 3);
-}

data/ext/fast_mmaped_file/file_format.c

@@ -1,5 +0,0 @@
-#include "file_format.h"
-
-inline uint32_t padding_length(uint32_t key_length) {
-    return 8 - (sizeof(uint32_t) + key_length) % 8;  // padding | 8 byte aligned
-}

data/ext/fast_mmaped_file/file_format.h

@@ -1,11 +0,0 @@
-#ifndef FILE_FORMAT_H
-#define FILE_FORMAT_H
-
-#include <stdint.h>
-
-#define START_POSITION 8
-#define INITIAL_SIZE (2 * sizeof(int32_t))
-
-uint32_t padding_length(uint32_t key_length);
-
-#endif