prometheus-client-mmap 0.20.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91fbb3a1899d0093d51d92ab8dceec80981c6160b3a09d35d90117f29e6c3d0
-  data.tar.gz: fea591800d5a3a2344082fd38df75f35aea8b5bf5394bcd7e20bf80d14dd48fd
+  metadata.gz: ddabdc180689b2098a062a41246907e31fc76ce668a4f1ca520c225f802a6dcd
+  data.tar.gz: b41caad16aa1f6710440fca61baf78cc84dd1e9a187f20b7e59afcb39d736b6b
 SHA512:
-  metadata.gz: f6e98dda485f79a83fe614a21c52444fad33a69b208c4a6d637516c0390f79c9c54216dda50f7b151483d3e69fe4e7739ed0076984cb7497c59110f0f941b664
-  data.tar.gz: 30bc5288dd7247222128b99a4cf88bdde9ca8625682b0d013dc5ea9cd6ce12aa5285be4b3a875f9a933dcc23e943c4b2cccc9ad9c53e273754a4dac46ddee1ed
+  metadata.gz: a5275669d21536a3d379ca606bff7f3df76aaa61df01b8f4ff5ad599304dfb19ec73f156e07eac2157c257373eb49bd4cfdaf951d6321b3dd3af4eb9245e3067
+  data.tar.gz: 65e34ad07012ea9e5e8c61594bbffbf37fa26019bdb673014b597abf10107c5b80c9f6ab065313402225fefcbc6494472f46b7e31e181eeac547e30196c6e071

data/README.md

@@ -244,6 +244,19 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+### Releasing a new version
+
+To release a new version:
+
+1. Update `lib/prometheus/client/version.rb` with the version number.
+1. Update `CHANGELOG.md` with the changes in the release.
+1. Create a merge request and merge it to `master`.
+1. Push a new tag to the repository.
+
+The new version with precompiled, native gems will automatically be
+published to [RubyGems](https://rubygems.org/gems/prometheus-client-mmap) when the
+pipeline for the tag completes.
+
 [1]: https://github.com/prometheus/prometheus
 [2]: http://rack.github.io/
 [3]: https://gitlab.com/gitlab-org/prometheus-client-mmap/badges/master/pipeline.svg

data/ext/fast_mmaped_file_rs/extconf.rb

@@ -1,24 +1,30 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("fast_mmaped_file_rs") do |r|
-  r.auto_install_rust_toolchain = false
+if find_executable('rustc')
+  create_rust_makefile("fast_mmaped_file_rs") do |r|
+    r.auto_install_rust_toolchain = false
 
-  if enable_config('fail-on-warning')
-    r.extra_rustflags = ["-Dwarnings"]
-  end
+    if enable_config('fail-on-warning')
+      r.extra_rustflags = ["-Dwarnings"]
+    end
 
-  if enable_config('debug')
-    r.profile = :dev
-  end
+    if enable_config('debug')
+      r.profile = :dev
+    end
+
+    if enable_config('address-sanitizer')
+      r.extra_rustflags = ["-Zsanitizer=address"]
+    end
 
-  if enable_config('address-sanitizer')
-    r.extra_rustflags = ["-Zsanitizer=address"]
+    # `rb_sys/mkmf` passes all arguments after `--` directly to `cargo rustc`.
+    # We use this awful hack to keep compatibility with existing flags used by
+    # the C implementation.
+    trimmed_argv = ARGV.take_while { |arg| arg != "--" }
+    ARGV = trimmed_argv
   end
+else
+  puts 'rustc not found, skipping Rust extension.'
 
-  # `rb_sys/mkmf` passes all arguments after `--` directly to `cargo rustc`.
-  # We use this awful hack to keep compatibility with existing flags used by
-  # the C implementation.
-  trimmed_argv = ARGV.take_while { |arg| arg != "--" }
-  ARGV = trimmed_argv
+  File.write('Makefile', dummy_makefile($srcdir).join(''))
 end

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

@@ -46,13 +46,22 @@ module Prometheus
 
           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
-              require 'fast_mmaped_file_rs'
+              load_rust_extension
               true
             rescue LoadError
               Prometheus::Client.logger.info('FastMmapedFileRs unavailable')

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

@@ -1,6 +1,13 @@
 require 'prometheus/client/helper/entry_parser'
 require 'prometheus/client/helper/file_locker'
-require 'fast_mmaped_file'
+
+# load precompiled extension if available
+begin
+  ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION)
+  require_relative "../../../#{ruby_version}/fast_mmaped_file"
+rescue LoadError
+  require 'fast_mmaped_file'
+end
 
 module Prometheus
   module Client

data/lib/prometheus/client/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Tobias Schmidt
 - Paweł Chojnacki
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -79,14 +79,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +115,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.2
-description:
+description: 
 email:
 - ts@soundcloud.com
 - pawel@gitlab.com
@@ -197,7 +211,7 @@ homepage: https://gitlab.com/gitlab-org/prometheus-client-mmap
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -210,10 +224,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.22
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a
   web services interface.