prometheus-client-mmap 0.25.0-arm64-darwin → 0.26.1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e25b5c221f6dbace3fcd430752e961cbdacb59cea837743f56d26612987fbce
-  data.tar.gz: 50f1f162c9147c9b01fa2d0238f55216bd3eb9e74c5c0ff9f011d72c7dfe2b22
+  metadata.gz: 8adc827050ddc653aa4309f81269e9652e89dbd7472633acd2d088d53d6b669a
+  data.tar.gz: 16bcbbd60af12df61dc028a9424a0d62fcbe45c279c08d0ce5fd60da9b57aa56
 SHA512:
-  metadata.gz: 1ece252ef9705f506e22ce9bc73007053c1536749949a4c38cad377e66a8edbe9081962362c8848fa8df37cd3a80a9db56adb98004c7f6096298255a08b94ae8
-  data.tar.gz: cc97ecd47e4f24734a9349fb963e3ae7b6cfd8bc3995fb01b394baa9aeac3364d3e68aa58d694820898b9399089a40c1bdeeed6b4d0fc9e0f299d0496643a7c3
+  metadata.gz: fdc0adeba0a82257a8698cb2429f89deded38efdbb453df232b2892bb6cee576c198a40f6a873a29a3a39685686000bb1e4411ddb6221f298750adfcb313d73b
+  data.tar.gz: b92d771ee6b3a0b4c854488362ccc7754a8fce25d67e4c3aec9eeb16d2d9838e2e90c89a48f83de5a714472cf9d7dd363adca4b2812e9da65bcb7ed449a649ac

data/README.md

@@ -10,7 +10,24 @@ through a HTTP interface. Intended to be used together with a
 
 [![Gem Version][4]](http://badge.fury.io/rb/prometheus-client-mmap)
 [![Build Status][3]](https://gitlab.com/gitlab-org/prometheus-client-mmap/commits/master)
-[![Dependency Status][5]](https://gemnasium.com/prometheus/prometheus-client-mmap)
+
+## Installation
+
+prometheus-client-mmap ships with [precompiled native gems](https://rubygems.org/gems/prometheus-client-mmap).
+Install the gem via:
+
+```shell
+gem install prometheus-client-mmap
+```
+
+### Requirements for building from source
+
+Building from source requires a number of dependencies:
+
+* Rust v1.65+
+* clang 5.0 or higher for [bindgen](https://rust-lang.github.io/rust-bindgen/requirements.html)
+* `make`
+* A C compiler (for legacy extension, which will be removed soon)
 
 ## Usage
 
@@ -34,9 +51,9 @@ http_requests = prometheus.counter(:http_requests, 'A counter of HTTP requests m
 http_requests.increment
 ```
 
-## Rust extension (experimental)
+## Rust extension
 
-In an effort to improve maintainability, there is now an optional Rust
+In an effort to improve maintainability, there is now a Rust
 implementation that reads the metric files and outputs the multiprocess
 metrics to text. If `rustc` is available, then the Rust extension will
 be built automatically. The `use_rust` keyword argument can be used:
@@ -45,8 +62,10 @@ be built automatically. The `use_rust` keyword argument can be used:
 puts Prometheus::Client::Formats::Text.marshal_multiprocess(use_rust: true)
 ```
 
+Starting with v0.26.0, `use_rust` defaults to `true`.
+
 Note that this parameter will likely be deprecated and removed once the Rust
-extension becomes the default mode.
+extension becomes the only supported mode.
 
 ### Rack middleware
 
@@ -202,14 +221,21 @@ prometheus_multiproc_dir=/tmp
 
 ### Multiprocess metrics via Rust extension
 
-If the environment variable `prometheus_rust_multiprocess_metrics=true` is set or if the `rust_multiprocess_metrics`
-configuration setting is `true` and the `fast_mmaped_file_rs` extension is available, it will be used to generate
-multiprocess metrics. This should be significantly faster than the C extension.
+By default, the Rust extension will be used to read and write multiprocess
+metrics if the `fast_mmaped_file_rs` extension is available. This should
+be significantly faster than the C extension.
+
+If the environment variable `prometheus_rust_multiprocess_metrics=false`
+is set or if the `rust_multiprocess_metrics` configuration setting is
+`false` , the C extension will be used.
 
 ### Read and write metrics via Rust extension
 
-If the environment variable `prometheus_rust_mmaped_file=true` is set then if the `fast_mmaped_file_rs`
-extension is available it will be used to read and write metrics from the mmapped file.
+By default, the Rust extension will be used to read and write metrics
+from the mmaped file if the `fast_mmaped_file_rs` extension is available.
+
+To use the C extension, set the environment variable
+`prometheus_rust_mmaped_file=false`.
 
 ## Pitfalls
 

data/lib/prometheus/client/configuration.rb

@@ -14,7 +14,7 @@ module Prometheus
         @initial_mmap_file_size = ::Prometheus::Client::PageSize.page_size(fallback_page_size: 4096)
         @logger = Logger.new($stdout)
         @pid_provider = Process.method(:pid)
-        @rust_multiprocess_metrics = ENV.fetch('prometheus_rust_multiprocess_metrics', nil) == 'true'
+        @rust_multiprocess_metrics = ENV.fetch('prometheus_rust_multiprocess_metrics', 'true') == 'true'
         @multiprocess_files_dir = ENV.fetch('prometheus_multiproc_dir') do
           Dir.mktmpdir("prometheus-mmap")
         end

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

@@ -27,7 +27,7 @@ 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, use_rust: true)
             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] }

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

@@ -29,7 +29,11 @@ module Prometheus
               load_rust_extension
               true
             rescue LoadError
-              Prometheus::Client.logger.info('FastMmapedFileRs unavailable')
+              warn <<~WARN
+WARNING: The Rust extension for prometheus-client-mmap is unavailable, falling back to the legacy C extension.
+  The Rust extension will be required in the next version. If you are compiling this gem from source,
+  ensure your build system has a Rust compiler and clang: https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap
+WARN
               false
             end
           end

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

@@ -14,7 +14,7 @@ module Prometheus
   module Client
     module Helper
       # We can't check `Prometheus::Client.configuration` as this creates a circular dependency
-      if (ENV.fetch('prometheus_rust_mmaped_file', nil) == "true" &&
+      if (ENV.fetch('prometheus_rust_mmaped_file', 'true') == "true" &&
           Prometheus::Client::Helper::Loader.rust_impl_available?)
         class MmapedFile < FastMmapedFileRs
         end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.25.0'.freeze
+    VERSION = '0.26.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.1
 platform: arm64-darwin
 authors:
 - Tobias Schmidt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys