yabeda-prometheus-mmap 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b9d14db6299b3e2d23ee81c2d32fb45467a9154c41fed27cca1f18e41dd1e6
-  data.tar.gz: 5ac571896729a06fdb4d2d2ffe0dab9eff1cc67721c81ef0272a676b75147876
+  metadata.gz: 4ae6601a66f8d497062fc78cf79a2c148b2f8b6f03ba7ad39a689afa821a6b40
+  data.tar.gz: 0761d311cd01b780e4ef02dfc03636a3dad90846fcdfd1fb44a7553cb0d20f69
 SHA512:
-  metadata.gz: 98c07acbfb65e1e20e0106448abfa1c804bdb8321aedb257bfa1e5793be92652954757f44d5b9a0e372bcf7af12bfa8f22c8f894256cb3c12fd73eed8235515f
-  data.tar.gz: ee2b5ee9803b4df0193911a82440146bbc5733bf152b4e8108d144794a411a729660155f53086ae9b6dedcc2a1c3abb592751cfec1a8cd169dcbda05fc4d47ea
+  metadata.gz: 7b9ea598802e0ee12bc6b597fc928bbde0cd885970310838d6f2e024e089a59904c4a03b92a67d5b84d8005e5aaf4106bced7756ab9a0f2fbaec38a8b52b6f0e
+  data.tar.gz: fecedc71c04707a220b59f512fcff784edaff6158eaaf740d8d9e17b8978368fe71c48103f45dd58a8a0f587841416b25b5d4206a5066165a4cf3c5e4322cf8c

data/.github/workflows/lint.yaml

@@ -0,0 +1,32 @@
+name: Lint Ruby
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "gemfiles/*"
+      - "Gemfile"
+      - "**/*.rb"
+      - "**/*.gemspec"
+      - ".github/workflows/lint.yml"
+  pull_request:
+    paths:
+      - "gemfiles/*"
+      - "Gemfile"
+      - "**/*.rb"
+      - "**/*.gemspec"
+      - ".github/workflows/lint.yml"
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler-cache: true
+      - name: Lint Ruby code with RuboCop
+        run: |
+          bundle exec rubocop

data/.github/workflows/test.yml

@@ -17,31 +17,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 3.0
-          - ruby: 2.7
-          - ruby: 2.6
-          - ruby: 2.5
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        CI: true
+          - ruby: "3.2"
+          - ruby: "3.1"
+          - ruby: "3.0"
+          - ruby: "2.7"
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-            bundle-${{ matrix.ruby }}-
-      - name: Upgrade Bundler to 2.0 (for older Rubies)
-        run: gem install bundler -v '~> 2.0'
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install
-          bundle update
-      - name: Run Rubocop
-        run: bundle exec rubocop
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run RSpec
         run: bundle exec rspec

data/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.4.0 - 2023-12-11
+
+### Added
+
+- Support for gauge aggregation setting [#6](https://github.com/yabeda-rb/yabeda-prometheus-mmap/pull/6) by [@andreaswachowski][].
+
+### Fixed
+
+- Compatibility with Rack 3 and Rack 2. [#8](https://github.com/yabeda-rb/yabeda-prometheus-mmap/pull/8) by [@aroop][].
+
+## 0.3.0 - 2021-08-27
+
+### Added
+
+- Possibility to disable metrics web server logs [@bibendi]
+
 ## 0.2.0 - 2021-07-21
 
 ### Added
@@ -34,3 +50,6 @@ Initial release. [@dsalahutdinov][]
 [@macchiang]: https://github.com/macchiang "Mac"
 [@dsalahutdinov]: https://github.com/dsalahutdinov "Salahutdinov Dmitry"
 [@Envek]: https://github.com/Envek "Andrey Novikov"
+[@bibendi]: https://github.com/bibendi/ "Misha Merkushin"
+[@andreaswachowski]: https://github.com/andreaswachowski "Andreas Wachowski"
+[@aroop]: https://github.com/aroop "Ajay Kumar G"

data/Gemfile

@@ -7,6 +7,6 @@ gemspec
 
 gem 'byebug'
 gem 'rack'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 0.81.0'
+gem 'rubocop', '~> 1.0'

data/lib/yabeda/prometheus/mmap/adapter.rb

@@ -35,7 +35,8 @@ module Yabeda
           registry.gauge(
             build_name(metric),
             metric.comment,
-            build_tags(metric.tags)
+            build_tags(metric.tags),
+            gauge_aggregation_mode(metric.aggregation)
           )
         end
 
@@ -86,6 +87,21 @@ module Yabeda
           end
         end
 
+        private
+
+        def gauge_aggregation_mode(yabeda_mode)
+          case yabeda_mode
+          when nil, :most_recent # TODO: Switch to most_recent when supported: https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/issues/36
+            :all
+          when :min, :max, :all, :liveall
+            yabeda_mode
+          when :sum
+            :livesum
+          else
+            raise ArgumentError, "Unsupported gauge aggregation mode #{yabeda_mode.inspect}"
+          end
+        end
+
         Yabeda.register_adapter(:prometheus, new)
       end
     end

data/lib/yabeda/prometheus/mmap/exporter.rb

@@ -23,7 +23,8 @@ module Yabeda
           def start_metrics_server!
             Thread.new do
               default_port = ENV.fetch('PORT', 9394)
-              ::Rack::Handler::WEBrick.run(
+
+              rack_handler.run(
                 rack_app,
                 Host: ENV['PROMETHEUS_EXPORTER_BIND'] || '0.0.0.0',
                 Port: ENV.fetch('PROMETHEUS_EXPORTER_PORT', default_port),
@@ -32,6 +33,18 @@ module Yabeda
             end
           end
 
+          def rack_handler
+            if Gem.loaded_specs['rack']&.version&.>= Gem::Version.new('3.0')
+              require 'rackup'
+              ::Rackup::Handler::WEBrick
+            else
+              ::Rack::Handler::WEBrick
+            end
+          rescue LoadError
+            warn 'Please add gems rackup and webrick to your Gemfile to expose Yabeda metrics from prometheus-mmap'
+            ::Rack::Handler::WEBrick
+          end
+
           def rack_app(exporter = self, path: '/metrics')
             ::Rack::Builder.new do
               use ::Rack::CommonLogger if ENV['PROMETHEUS_EXPORTER_LOG_REQUESTS'] != 'false'

data/lib/yabeda/prometheus/mmap/version.rb

@@ -3,7 +3,7 @@
 module Yabeda
   module Prometheus
     module Mmap
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus-mmap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Salahutdinov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client-mmap
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build-release.yml"
+- ".github/workflows/lint.yaml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Extensible Prometheus exporter for your application