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

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.22.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 1.2.1
 platform: x86_64-linux-musl
 authors:
 - Tobias Schmidt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2024-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -19,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
@@ -81,42 +109,56 @@ 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
@@ -127,28 +169,11 @@ 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
@@ -158,18 +183,13 @@ files:
 - ext/fast_mmaped_file_rs/src/map.rs
 - ext/fast_mmaped_file_rs/src/mmap.rs
 - ext/fast_mmaped_file_rs/src/mmap/inner.rs
-- ext/fast_mmaped_file_rs/src/parser.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
@@ -195,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
@@ -230,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

data/ext/fast_mmaped_file/file_parsing.c

@@ -1,195 +0,0 @@
-#include "file_parsing.h"
-
-#include <hashmap.h>
-#include <jsmn.h>
-
-#include "file_format.h"
-#include "globals.h"
-#include "utils.h"
-
-HASHMAP_FUNCS_CREATE(entry, const entry_t, entry_t)
-
-typedef int (*compare_fn)(const void *a, const void *b);
-
-static size_t hashmap_hash_entry(const entry_t *entry) { return hashmap_hash_string(entry->json); }
-
-static int hashmap_compare_entry(const entry_t *a, const entry_t *b) {
-    if (a->json_size != b->json_size) {
-        return -1;
-    }
-
-    if (is_pid_significant(a) && (rb_str_equal(a->pid, b->pid) == Qfalse)) {
-        return -1;
-    }
-
-    return strncmp(a->json, b->json, a->json_size);
-}
-
-static void entry_free(entry_t *entry) {
-    free(entry->json);
-    free(entry);
-}
-
-static inline double min(double a, double b) { return a < b ? a : b; }
-
-static inline double max(double a, double b) { return a > b ? a : b; }
-
-static void merge_entry(entry_t *found, const entry_t *entry) {
-    if (entry->type == sym_gauge) {
-        if (entry->multiprocess_mode == sym_min) {
-            found->value = min(found->value, entry->value);
-        } else if (entry->multiprocess_mode == sym_max) {
-            found->value = max(found->value, entry->value);
-        } else if (entry->multiprocess_mode == sym_livesum) {
-            found->value += entry->value;
-        } else {
-            found->value = entry->value;
-        }
-    } else {
-        found->value += entry->value;
-    }
-}
-
-void merge_or_store(struct hashmap *map, entry_t *entry) {
-    entry_t *found = entry_hashmap_get(map, entry);
-    if (found) {
-        merge_entry(found, entry);
-        entry_free(entry);
-    } else {
-        entry_hashmap_put(map, entry, entry);  // use the hashmap like hashset actually
-    }
-}
-
-entry_t *entry_new(buffer_t *source, uint32_t pos, uint32_t encoded_len, file_t *file_info) {
-    entry_t *entry = calloc(1, sizeof(entry_t));
-    if (entry == NULL) {
-        return NULL;
-    }
-
-    entry->json = malloc(encoded_len + 1);
-    if (entry->json == NULL) {
-        free(entry);
-        return NULL;
-    }
-
-    memcpy(entry->json, source->buffer + pos, encoded_len);
-    entry->json[encoded_len] = '\0';
-    entry->json_size = encoded_len;
-
-    entry->pid = file_info->pid;
-    entry->multiprocess_mode = file_info->multiprocess_mode;
-    entry->type = file_info->type;
-
-    char *value_ptr = source->buffer + pos + encoded_len + padding_length(encoded_len);
-    memcpy(&(entry->value), value_ptr, sizeof(double));
-
-    return entry;
-}
-
-static int add_parsed_name(entry_t *entry) {
-    jsmn_parser parser;
-    jsmn_init(&parser);
-
-    jsmntok_t tokens[2];
-    memset(&tokens, 0, sizeof(tokens));
-
-    jsmn_parse(&parser, entry->json, entry->json_size, tokens, 2);
-    jsmntok_t *name_token = &tokens[1];
-
-    if (name_token->start < name_token->end && name_token->start > 0) {
-        entry->name = entry->json + name_token->start;
-        entry->name_len = name_token->end - name_token->start;
-        return 1;
-    }
-    return 0;
-}
-
-static int entry_lexical_comparator(const entry_t **a, const entry_t **b) {
-    size_t size_a = (*a)->json_size;
-    size_t size_b = (*b)->json_size;
-    size_t min_length = size_a < size_b ? size_a : size_b;
-
-    return strncmp((*a)->json, (*b)->json, min_length);
-}
-
-void hashmap_setup(struct hashmap *map) {
-    hashmap_init(map, (size_t(*)(const void *))hashmap_hash_entry,
-                 (int (*)(const void *, const void *))hashmap_compare_entry, 1000);
-    hashmap_set_key_alloc_funcs(map, NULL, (void (*)(void *))entry_free);
-}
-
-int process_buffer(file_t *file_info, buffer_t *source, struct hashmap *map) {
-    if (source->size < START_POSITION) {
-        // nothing to read
-        return 1;
-    }
-    uint32_t used;
-    memcpy(&used, source->buffer, sizeof(uint32_t));
-
-    if (used > source->size) {
-        save_exception(prom_eParsingError, "source file %s corrupted, used %u > file size %u", file_info->path, used,
-                       source->size);
-        return 0;
-    }
-
-    uint32_t pos = START_POSITION;
-    while (pos + sizeof(uint32_t) < used) {
-        uint32_t encoded_len;
-        memcpy(&encoded_len, source->buffer + pos, sizeof(uint32_t));
-        pos += sizeof(uint32_t);
-
-        uint32_t value_offset = encoded_len + padding_length(encoded_len);
-
-        if (pos + value_offset + sizeof(double) > used) {
-            save_exception(prom_eParsingError, "source file %s corrupted, used %u < stored data length %u",
-                           file_info->path, used, pos + value_offset + sizeof(double));
-            return 0;
-        }
-
-        entry_t *entry = entry_new(source, pos, encoded_len, file_info);
-        if (entry == NULL) {
-            save_exception(rb_eNoMemError, "Failed creating metrics entry");
-            return 0;
-        }
-
-        merge_or_store(map, entry);
-
-        pos += value_offset + sizeof(double);
-    }
-    return 1;
-}
-
-int sort_map_entries(const struct hashmap *map, entry_t ***sorted_entries) {
-    size_t num = hashmap_size(map);
-
-    entry_t **list = calloc(num, sizeof(entry_t *));
-
-    if (list == NULL) {
-        save_exception(rb_eNoMemError, "Couldn't allocate for %zu memory", num * sizeof(entry_t *));
-        return 0;
-    }
-
-    size_t cnt = 0;
-    struct hashmap_iter *iter;
-    for (iter = hashmap_iter(map); iter; iter = hashmap_iter_next(map, iter)) {
-        entry_t *entry = (entry_t *)entry_hashmap_iter_get_key(iter);
-        if (add_parsed_name(entry)) {
-            list[cnt] = entry;
-            cnt++;
-        }
-    }
-    if (cnt != num) {
-        save_exception(rb_eRuntimeError, "Processed entries %zu != map entries %zu", cnt, num);
-        free(list);
-        return 0;
-    }
-
-    qsort(list, cnt, sizeof(entry_t *), (compare_fn)&entry_lexical_comparator);
-    *sorted_entries = list;
-    return 1;
-}
-
-int is_pid_significant(const entry_t *e) {
-    ID mp = e->multiprocess_mode;
-    return e->type == sym_gauge && !(mp == sym_min || mp == sym_max || mp == sym_livesum);
-}

data/ext/fast_mmaped_file/file_parsing.h

@@ -1,27 +0,0 @@
-#ifndef FILE_PARSING_H
-#define FILE_PARSING_H
-#include <file_reading.h>
-#include <hashmap.h>
-#include <ruby.h>
-
-typedef struct {
-    char *json;
-    size_t json_size;
-    char *name;
-    size_t name_len;
-
-    ID multiprocess_mode;
-    ID type;
-    VALUE pid;
-
-    double value;
-} entry_t;
-
-void hashmap_setup(struct hashmap *map);
-
-int process_buffer(file_t *file_info, buffer_t *source, struct hashmap *map);
-int sort_map_entries(const struct hashmap *map, entry_t ***sorted_entries);
-
-int is_pid_significant(const entry_t *e);
-
-#endif