yabeda-prometheus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3853e35a99555c0cba4020b448c677d49209b0dfde07d7852a075ef032c844bb
-  data.tar.gz: 7fd7ba53e5d5c3d5c59ffaa371819867bbe09bd363cfc5adcc747584bc21a721
+  metadata.gz: 99160ecfcc0c1d30b0ce7c02444eb245958cbf05a09ebbed89f016ab5b1e2118
+  data.tar.gz: 85918fdb24afad2f8d3bd3d64fea86be86e97b5f740cb8affce9f5cf0fdf336c
 SHA512:
-  metadata.gz: e50aeccdde88032fa4347fe79dc94f276b4d1681288d02ed90ac2246dceab796ae24c9a3201b287eba8fed157c7a11d379aac79c30dd268b8df78f57a18a9b44
-  data.tar.gz: b20bc4cd6cee5fc905e2bd8597cb046e778064b4cbc2f0c0802a7a8777a5d003bdbd5cfe2ff7622f6ef6d6d91c2289c5c5ed26cd6ab4e3aef38024bedfcc9763
+  metadata.gz: 7c73f0756cba70bd4b6da0532108aec67013532f0fbb96907677956db0aeede567fb3f2d32bec1b922ea3eebb0a8c48643de2ccdf798c8a3a77f389b37ad5b46
+  data.tar.gz: 8704ba138071f06b6dc8eecdd6fbbb9349a4d1585a647f5d0ec0050d37dae69225f06e0fbbd7b802591b16d54687d9c079b111658a0a6fbec525f983783fd693

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+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.1.3 - 2018-10-31
+
+### Added
+
+ - Ability to mount exporter to Rails application routes as standalone Rack app. @Envek
+
+   ```ruby
+   Rails.application.routes.draw do
+     mount Yabeda::Prometheus::Exporter => "/metrics"
+   end
+   ```
+
+## 0.1.2 - 2018-10-17
+
+### Changed
+
+ - Renamed evil-metrics-prometheus gem to yabeda-prometheus. @Envek
+
+## 0.1.1 - 2018-10-05
+
+### Changed
+
+ - Eliminate data duplication in counters and gauges. @Envek
+
+   Use values stored in core gem metric objects and just let Prometheus to read them.
+
+## 0.1.0 - 2018-10-03
+
+ - Initial release of evil-metrics-prometheus gem. @Envek

data/README.md

@@ -1,6 +1,13 @@
 # Yabeda::[Prometheus]
 
-Adapter for easy exporting your collected evil metrics from your application to the [Prometheus]!
+[![Gem Version](https://badge.fury.io/rb/yabeda-prometheus.svg)](https://rubygems.org/gems/yabeda-prometheus)
+
+Adapter for easy exporting your collected metrics from your application to the [Prometheus]!
+
+<a href="https://evilmartians.com/?utm_source=yabeda-prometheus&utm_campaign=project_page">
+<img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
+</a>
+
 
 ## One more? Why not X?
 
@@ -12,9 +19,7 @@ Adapter for easy exporting your collected evil metrics from your application to
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'yabeda'
-# Then add monitoring system adapter, e.g.:
-# gem 'yabeda-prometheus'
+gem 'yabeda-prometheus'
 ```
 
 And then execute:
@@ -31,7 +36,9 @@ And then execute:
     use Yabeda::Prometheus::Exporter
     ```
 
-    Metrics will be available on `/metrics` path.
+    Metrics will be available on `/metrics` path (configured by `:path` option).
+
+    Also you can mount it in Rails application routes as standalone Rack application.
 
  2. Run web-server from long-running processes (delayed jobs, …):
 

data/lib/yabeda/prometheus/exporter.rb

@@ -4,11 +4,22 @@ require "prometheus/middleware/exporter"
 
 module Yabeda
   module Prometheus
+    # Rack application or middleware that provides metrics exposition endpoint
     class Exporter < ::Prometheus::Middleware::Exporter
+      NOT_FOUND_HANDLER = lambda do |_env|
+        [404, { "Content-Type" => "text/plain" }, ["Not Found\n"]]
+      end.freeze
+
       class << self
+        # Allows to use middleware as standalone rack application
+        def call(env)
+          @app ||= new(NOT_FOUND_HANDLER, path: "/")
+          @app.call(env)
+        end
+
         def start_metrics_server!
           Thread.new do
-            default_port = ENV.fetch("PORT", 9310)
+            default_port = ENV.fetch("PORT", 9394)
             Rack::Handler::WEBrick.run(
               rack_app,
               Host: ENV["PROMETHEUS_EXPORTER_BIND"] || "0.0.0.0",
@@ -18,24 +29,22 @@ module Yabeda
           end
         end
 
-        protected
-
-        def rack_app(exporter = self)
+        def rack_app(exporter = self, path: "/metrics")
           Rack::Builder.new do
             use Rack::CommonLogger
             use Rack::ShowExceptions
-            use exporter, registry: Yabeda::Prometheus.registry
-            run ->(_env) do
-              [404, { "Content-Type" => "text/plain" }, ["Not Found\n"]]
-            end
+            use exporter, path: path
+            run NOT_FOUND_HANDLER
           end
         end
       end
 
+      def initialize(app, options = {})
+        super(app, options.merge(registry: Yabeda::Prometheus.registry))
+      end
+
       def call(env)
-        if env["REQUEST_PATH"].start_with?(path)
-          Yabeda.collectors.each(&:call)
-        end
+        Yabeda.collectors.each(&:call) if env["PATH_INFO"] == path
         super
       end
     end

data/lib/yabeda/prometheus/version.rb

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

data/yabeda-prometheus.gemspec

@@ -14,6 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/yabeda-rb/yabeda-prometheus"
   spec.license       = "MIT"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/yabeda-rb/yabeda-prometheus"
+  spec.metadata["changelog_uri"] = "https://github.com/yabeda-rb/yabeda-prometheus/blob/master/CHANGELOG.md"
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -24,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "yabeda"
   spec.add_dependency "prometheus-client"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -108,7 +109,10 @@ files:
 homepage: https://github.com/yabeda-rb/yabeda-prometheus
 licenses:
 - MIT
-metadata: {}
+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: 
 rdoc_options: []
 require_paths: