vinted-prometheus-client-mmap 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c2172a64911eb3a109b866611b4167e9dafacedf7bdb4ee45da71340d0314e
-  data.tar.gz: '018047827caaea20f96e7ca8b62a717c1c17b0aab14ad1a0bf7ea2735f8ee18a'
+  metadata.gz: 86a6083d5e7a88ac1e5e96a6660ebbd70fa31cecb1b1e6e324e26c4e91279713
+  data.tar.gz: a14011ec2a97f717bf0a18913fdde846b29ad742acb69b846b9f77c93ee7004f
 SHA512:
-  metadata.gz: 1f09730605d1c7904ec72b3ac0afc0fd61a79da99e78f93da27551ec2340dbde87b47c72d3b59e934df72e5af92139f488364d1ea161bf2ab1052f118aed1e57
-  data.tar.gz: 6bf4a9f9aeac52d16f15f3d8b3cc44306b009487891b22d431cc2a96aa46a0bba70b9364845e9f382d35729172ce4171ce980c5907c3c4aac47501d3b9710be5
+  metadata.gz: e735c20e4bca0539a7e1219a1c9a0f7d3c61f838af04928e3d75d293bbf090be50ca9708aa0819234dc60025baa578795c65c8100da0550022cf4c0867186a65
+  data.tar.gz: bad6fe000c9a94c57797f3337fa961759a25660a337794d644b1edad8402b3a95314e51add28d6c9d3f4749ee09af3112658f13db8e95b2bb18fade77c580d6e

data/ext/fast_mmaped_file_rs/src/file_entry.rs

@@ -1,5 +1,5 @@
 use core::panic;
-use magnus::{eval, Symbol, Value};
+use magnus::Symbol;
 use serde::Deserialize;
 use serde_json::value::RawValue;
 use smallvec::SmallVec;
@@ -362,6 +362,11 @@ impl FileEntry {
                                         curf += gr.0.meta.value.unwrap();
 
                                         bucket.cumulative_count_float = Some(curf);
+
+                                        if gr.0.meta.ex.is_some() {
+                                            bucket.exemplar =
+                                                Some(exemplar_to_proto(gr.0.meta.ex.as_ref().unwrap()));
+                                        }
                                     }
                                 }
                                 None => {
@@ -380,7 +385,7 @@ impl FileEntry {
                                         final_metric_name = stripped;
                                     }
 
-                                    let buckets = vec![io::prometheus::client::Bucket {
+                                    let mut buckets = vec![io::prometheus::client::Bucket {
                                         cumulative_count: None,
                                         cumulative_count_float: gr.0.meta.value,
                                         upper_bound: Some(
@@ -391,6 +396,11 @@ impl FileEntry {
                                         ),
                                         exemplar: None,
                                     }];
+
+                                    if gr.0.meta.ex.is_some() {
+                                        buckets[0].exemplar =
+                                            Some(exemplar_to_proto(gr.0.meta.ex.as_ref().unwrap()));
+                                    }
                                     m.label = m
                                         .label
                                         .into_iter()

data/ext/fast_mmaped_file_rs/src/map.rs

@@ -1,7 +1,6 @@
 use hashbrown::hash_map::RawEntryMut;
 use hashbrown::HashMap;
-use magnus::class::file;
-use magnus::{eval, exception::*, Error, RArray, Value};
+use magnus::{exception::*, Error, RArray};
 use std::hash::{BuildHasher, Hash, Hasher};
 use std::mem::size_of;
 

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

@@ -15,6 +15,7 @@ use crate::util::{read_exemplar, CheckedOps};
 use crate::util::{self, errno, read_f64, read_u32};
 use crate::Result;
 use crate::HEADER_SIZE;
+use std::iter;
 
 /// A mmapped file and its metadata. Ruby never directly interfaces
 /// with this struct.
@@ -186,7 +187,11 @@ impl InnerMmap {
         let val = serde_json::to_string(&exemplar).unwrap();
 
         let value_bytes = val.as_bytes();
-        let value_range = self.item_range(offset, value_bytes.len())?;
+
+        let mut value_bytes = value_bytes.to_vec();
+        value_bytes.extend(iter::repeat(0).take(EXEMPLAR_ENTRY_MAX_SIZE_BYTES - value_bytes.len()));
+
+        let value_range = self.item_range(offset, EXEMPLAR_ENTRY_MAX_SIZE_BYTES)?;
 
         let bytes = self.map.as_mut();
         bytes[value_range].copy_from_slice(&value_bytes);

data/ext/fast_mmaped_file_rs/src/mmap.rs

@@ -338,7 +338,7 @@ impl MmapedFile {
         let since_the_epoch = start
             .duration_since(UNIX_EPOCH)
             .expect("Time went backwards");
-        
+
         let ex: Exemplar = Exemplar {
             label_name: unsafe { exemplar_name.as_str().unwrap().into() },
             label_value: unsafe { exemplar_value.as_str().unwrap().into() },

data/ext/fast_mmaped_file_rs/src/util.rs

@@ -1,6 +1,5 @@
 use nix::errno::Errno;
 use nix::libc::c_long;
-use std::borrow::Cow;
 use std::fmt::Display;
 use std::io;
 use std::mem::size_of;

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

@@ -29,7 +29,8 @@ module Prometheus
           end
 
           def marshal_multiprocess(path = Prometheus::Client.configuration.multiprocess_files_dir, use_rust: true)
-            file_list = Dir.glob(File.join(path, '*.db')).sort
+            # NOTE(GiedriusS): need to ensure exemplar files go at the end because they add extra data.
+            file_list = Dir.glob(File.join(path, '*.db')).sort_by { |f| [f.include?('exemplar') ? 1 : 0, f] }
               .map {|f| Helper::PlainFile.new(f) }
               .map {|f| [f.filepath, f.multiprocess_mode.to_sym, f.type.to_sym, f.pid] }
 

data/lib/prometheus/client/histogram.rb

@@ -60,9 +60,9 @@ module Prometheus
         :histogram
       end
 
-      def observe(labels, value)
+      def observe(labels, value, exemplar_name = '', exemplar_value = '')
         label_set = label_set_for(labels)
-        synchronize { @values[label_set].observe(value) }
+        synchronize { @values[label_set].observe(value, exemplar_name, exemplar_value) }
       end
 
       private

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinted-prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys