prometheus-client-mmap 0.27.0-x86_64-linux → 0.28.1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee8c4488396fd0b4a2edb6f3b102e40032479661de085c2ad6f43d821b04c1c
-  data.tar.gz: 6940f707d2e8841fc7790997c361f21f76c6398647f35f9b74cfc36dc6fa3bca
+  metadata.gz: '014973ac0ab1c0e391251b9a9731687a5f178e91a738901d47331434fc4340fb'
+  data.tar.gz: 2b5c20d70ce59bef31e29bb1779c9c43c0a6428ecbe0099d22e187b27bf0cbf3
 SHA512:
-  metadata.gz: 97fcda1edde30c872a8643eac32836f8ede89e54f9021d98ee54178aa0b90157168de556e6bb9d16e1efa3567eb7003496d444ca97f8a86bf2c0eac4ca298737
-  data.tar.gz: e01af70b1d15e3a5f02137f5250ab746701104ace7e0cca15b1b4732037e1241a59fd9341dbf38ff5fc09fa9a02a87d446a9ff0a619286d7a5e939398aa7f063
+  metadata.gz: d2e5478ac79c584831f078d33fbc3a6bac17602ec54a1fdd64d52b2f6edc05b29fa98916d96a8716c6bcfc8b69975b400c6713ec7fed32a7fff5e0ec2106e22c
+  data.tar.gz: 9295e5754f4eb3c8ce0ff8828142cde72483b89b8751adabcdd6aaaaafa5fc23c19eddc4344a4f10b25320be06004d34a8989b6b51b3e37e19fe052597d73732

data/README.md

@@ -241,8 +241,8 @@ To use the C extension, set the environment variable
 
 ### PID cardinality
 
-In multiprocess setup e.g. running under Unicorn, having worker process restart often can
-lead to performance problems when proccesing metric files. By default each process using
+In multiprocess setup e.g. running under Unicorn or Puma, having worker process restart often
+can lead to performance problems when proccesing metric files. By default each process using
 Prometheus metrics will create a set of files based on that process PID. With high worker
 churn this will lead to creation of thousands of files and in turn will cause very noticable
 slowdown when displaying metrics
@@ -250,14 +250,20 @@ slowdown when displaying metrics
 To reduce this problem, a surrogate process id can be used. Set of all such IDs needs
 have low cardinality, and each process id must be unique among all running process.
 
-For Unicorn a worker id/number can be used to greatly speedup the metrics rendering.
+For Unicorn and Puma a worker id/number can be used to greatly speedup the metrics rendering.
 
-To use it add this line to your `configure` block:
+If you are using Unicorn, add this line to your `configure` block:
 
 ```ruby
   config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider)
 ```
 
+If you are using Puma, add this line to your `configure` block:
+
+```ruby
+  config.pid_provider = Prometheus::Client::Support::Puma.method(:worker_pid_provider)
+```
+
 ## Tools
 
 ### `bin/parse`

data/ext/fast_mmaped_file/mmap.c

@@ -189,12 +189,6 @@ static void mm_free(mm_ipc *i_mm) {
         }
 
         if (i_mm->t->path != (char *)-1) {
-            if (i_mm->t->real < i_mm->t->len && i_mm->t->vscope != MAP_PRIVATE &&
-                truncate(i_mm->t->path, i_mm->t->real) == -1) {
-                free(i_mm->t->path);
-                free(i_mm);
-                rb_raise(rb_eTypeError, "truncate");
-            }
             free(i_mm->t->path);
         }
     }
@@ -414,10 +408,6 @@ VALUE mm_unmap(VALUE obj) {
         }
 
         if (i_mm->t->path != (char *)-1) {
-            if (i_mm->t->real < i_mm->t->len && i_mm->t->vscope != MAP_PRIVATE &&
-                truncate(i_mm->t->path, i_mm->t->real) == -1) {
-                rb_raise(rb_eTypeError, "truncate");
-            }
             free(i_mm->t->path);
         }
 

data/ext/fast_mmaped_file_rs/src/mmap/inner.rs

@@ -224,16 +224,6 @@ impl InnerMmap {
         }
     }
 
-    /// Truncate the mmapped file to the end of the metrics data.
-    pub fn truncate_file(&mut self) -> Result<()> {
-        // CAST: no-op on 64-bit, widening on 32-bit.
-        let trunc_len = self.len as u64;
-
-        self.file
-            .set_len(trunc_len)
-            .map_err(|e| MmapError::legacy(format!("truncate: {e}"), RubyError::Type))
-    }
-
     /// Load the `used` header containing the size of the metrics data written.
     pub fn load_used(&self) -> Result<u32> {
         match read_u32(self.map.as_ref(), 0) {

data/ext/fast_mmaped_file_rs/src/mmap.rs

@@ -225,9 +225,6 @@ impl MmapedFile {
         let rs_self = &*rb_self;
 
         rs_self.inner_mut(|inner| {
-            // truncate file to actual used size
-            inner.truncate_file()?;
-
             // We are about to release the backing mmap for Ruby's String
             // objects. If Ruby attempts to read from them the program will
             // segfault. We update the length of all Strings to zero so Ruby

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.27.0'.freeze
+    VERSION = '0.28.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.1
 platform: x86_64-linux
 authors:
 - Tobias Schmidt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -197,6 +197,7 @@ 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