yabeda-prometheus 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99160ecfcc0c1d30b0ce7c02444eb245958cbf05a09ebbed89f016ab5b1e2118
-  data.tar.gz: 85918fdb24afad2f8d3bd3d64fea86be86e97b5f740cb8affce9f5cf0fdf336c
+  metadata.gz: 1922a6edd3de4513c03bb3405280060973cfe6c0004b56be0bf0c923934eb82f
+  data.tar.gz: acc3a06038a5cf9f972406b0edd466ae04f49643d2ad784d0c9e2565919a7308
 SHA512:
-  metadata.gz: 7c73f0756cba70bd4b6da0532108aec67013532f0fbb96907677956db0aeede567fb3f2d32bec1b922ea3eebb0a8c48643de2ccdf798c8a3a77f389b37ad5b46
-  data.tar.gz: 8704ba138071f06b6dc8eecdd6fbbb9349a4d1585a647f5d0ec0050d37dae69225f06e0fbbd7b802591b16d54687d9c079b111658a0a6fbec525f983783fd693
+  metadata.gz: ed6e18d43df3f06ad848c6b6965e7093a71ba36d4c34e3e3bfb93f43eda220bf738436604f0db3ae63e026e53bd6eccfe6ec9f60d667a4cb0687f7ac2a9ce5bb
+  data.tar.gz: 2b77cc35bc3f5e72033aa624371630d6221ba54dc5d3ea5c222db62a12bddca589c5c5bf7bc5925e76de0d5d38083fe5ae7c754bcb913492a2af34b8c9970753

data/CHANGELOG.md

@@ -6,6 +6,28 @@ 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.1.4 - 2018-11-06
+
+### Added
+
+ - Support for prometheus-client-mmap gem that allow to collect metrics from
+   forking servers like Passenger or Puma in clustered mode. @Envek
+
+   Now you need to manually specify which gem you need to use in your Gemfile
+   due to lack of either/or dependencies in RubyGems.
+
+   ```ruby
+   gem "prometheus-client"
+   gem "yabeda-prometheus"
+   ```
+
+   Or:
+
+   ```ruby
+   gem "prometheus-client-mmap"
+   gem "yabeda-prometheus"
+   ```
+
 ## 0.1.3 - 2018-10-31
 
 ### Added

data/README.md

@@ -16,9 +16,10 @@ Adapter for easy exporting your collected metrics from your application to the [
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this lines to your application's Gemfile:
 
 ```ruby
+gem 'prometheus-client' # Or 'prometheus-client-mmap' if you need multi-process support
 gem 'yabeda-prometheus'
 ```
 
@@ -52,7 +53,7 @@ And then execute:
 
     Listening address is configured via `PROMETHEUS_EXPORTER_BIND` env variable (default is `0.0.0.0`).
 
-    Port is configured by `PROMETHEUS_EXPORTER_PORT` or `PORT` variables (default is `9310`).
+    Port is configured by `PROMETHEUS_EXPORTER_PORT` or `PORT` variables (default is `9394`).
 
  3. Use push gateway for short living things (rake tasks, cron jobs, …):
 

data/lib/yabeda/prometheus.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "yabeda"
+require "prometheus/client"
 require "yabeda/prometheus/version"
 require "yabeda/prometheus/adapter"
 require "yabeda/prometheus/exporter"

data/lib/yabeda/prometheus/exporter.rb

@@ -1,11 +1,19 @@
 # frozen_string_literal: true
 
-require "prometheus/middleware/exporter"
+begin
+  # Try to load exporter from GitLab's prometheus-client-mmap gem
+  require "prometheus/client/rack/exporter"
+  BASE_EXPORTER_CLASS = ::Prometheus::Client::Rack::Exporter
+rescue LoadError
+  # Try to load exporter from original prometheus-client
+  require "prometheus/middleware/exporter"
+  BASE_EXPORTER_CLASS = ::Prometheus::Middleware::Exporter
+end
 
 module Yabeda
   module Prometheus
     # Rack application or middleware that provides metrics exposition endpoint
-    class Exporter < ::Prometheus::Middleware::Exporter
+    class Exporter < BASE_EXPORTER_CLASS
       NOT_FOUND_HANDLER = lambda do |_env|
         [404, { "Content-Type" => "text/plain" }, ["Not Found\n"]]
       end.freeze

data/lib/yabeda/prometheus/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Prometheus
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/yabeda-prometheus.gemspec

@@ -26,7 +26,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "yabeda"
-  spec.add_dependency "prometheus-client"
+
+  spec.post_install_message = <<~MESSAGE
+    You need to have installed either prometheus-client or prometheus-client-mmap
+    gem for yabeda-prometheus to work.
+    Please make sure that you have added one of them to your Gemfile.
+  MESSAGE
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: prometheus-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +99,10 @@ metadata:
   homepage_uri: https://github.com/yabeda-rb/yabeda-prometheus
   source_code_uri: https://github.com/yabeda-rb/yabeda-prometheus
   changelog_uri: https://github.com/yabeda-rb/yabeda-prometheus/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message: |
+  You need to have installed either prometheus-client or prometheus-client-mmap
+  gem for yabeda-prometheus to work.
+  Please make sure that you have added one of them to your Gemfile.
 rdoc_options: []
 require_paths:
 - lib