prometheus_exporter 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f116c0fdf15835af1b9520ca81b47c1d7a6011b3b8991cf9b569127d7a22fc
-  data.tar.gz: f631d2d3259d72577e896a4f2a650f7af65e70b5703f24a02cbcebadd75f97d1
+  metadata.gz: 8bd1d7c955d48051b122205cd59d9700eace9c4b5ef1e38a87c9d4fbb14e8164
+  data.tar.gz: a44f8ab58e239550a0a75875dd4ad05c2f79769dcc781ad380afac7fac02d10b
 SHA512:
-  metadata.gz: 81894939793a45953be6efbf90db9506abb6cc5ca196e03fd0bfe92035430284240820e1311e3f9532933602fa337790eb828e99809f003378cb6290b74f1eba
-  data.tar.gz: 151c49417eee04b2f9b931d9bda160fd19df22d2d9ff474f2f54b57bc828504eaf2d2f047eae2be1f121ce4d0b3ed74e9695959bcd51da8a52949da8a3931604
+  metadata.gz: b5eedad2d76d14cfdaa6e693ba7862b82f3845e2136249bad6a879ec44bdff946c9ffc93f89448e1bdda1b2f673a5bc46df07266c2c8867247aa513250b5e79c
+  data.tar.gz: ae93f7dc838787cb72ae00037de19028f85d66ae7a71432fd74f064820ac3bc9664a27e64bfb0072fa41c195a1956007ffee3b629f80a882517248a4b21ff1bc

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.0.5 - 2022-11-15
+
+- FIX: regression :prepend style instrumentation not working correctly
+
+2.0.4 - 2022-11-10
+
+- FIX/FEATURE: support for Redis 5 gem instrumentation
+
 2.0.3 - 2022-05-23
 
 - FEATURE: new ping endpoint for keepalive checks

data/README.md

@@ -5,7 +5,7 @@ Prometheus Exporter allows you to aggregate custom metrics from multiple process
 To learn more see [Instrumenting Rails with Prometheus](https://samsaffron.com/archive/2018/02/02/instrumenting-rails-with-prometheus) (it has pretty pictures!)
 
 * [Requirements](#requirements)
-* [Migrating from v0.x](#migrating-from-v0.x)
+* [Migrating from v0.x](#migrating-from-v0x)
 * [Installation](#installation)
 * [Usage](#usage)
   * [Single process mode](#single-process-mode)

data/examples/custom_collector.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MyCustomCollector < PrometheusExporter::Server::Collector
+class MyCustomCollector < PrometheusExporter::Server::BaseCollector
   def initialize
     @gauge1 = PrometheusExporter::Metric::Gauge.new("thing1", "I am thing 1")
     @gauge2 = PrometheusExporter::Metric::Gauge.new("thing2", "I am thing 2")

data/lib/prometheus_exporter/instrumentation/method_profiler.rb

@@ -40,10 +40,7 @@ class PrometheusExporter::Instrumentation::MethodProfiler
     data
   end
 
-private
-
-  def self.patch_using_prepend(klass, methods, name)
-    prepend_instument = Module.new
+  def self.define_methods_on_module(klass, methods, name)
     patch_source_line = __LINE__ + 3
     patches = methods.map do |method_name|
       <<~RUBY
@@ -63,8 +60,13 @@ private
       RUBY
     end.join("\n")
 
-    prepend_instument.module_eval patches, __FILE__, patch_source_line
-    klass.prepend(prepend_instument)
+    klass.module_eval patches, __FILE__, patch_source_line
+  end
+
+  def self.patch_using_prepend(klass, methods, name)
+    prepend_instrument = Module.new
+    define_methods_on_module(prepend_instrument, methods, name)
+    klass.prepend(prepend_instrument)
   end
 
   def self.patch_using_alias_method(klass, methods, name)

data/lib/prometheus_exporter/middleware.rb

@@ -11,7 +11,12 @@ class PrometheusExporter::Middleware
     @client = config[:client] || PrometheusExporter::Client.default
 
     if config[:instrument]
-      if defined? Redis::Client
+      if defined?(RedisClient)
+        apply_redis_client_middleware!
+      end
+      if defined?(Redis::VERSION) && (Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0.0'))
+        # redis 5 support handled via RedisClient
+      elsif defined? Redis::Client
         MethodProfiler.patch(Redis::Client, [
           :call, :call_pipeline
         ], :redis, instrument: config[:instrument])
@@ -116,4 +121,14 @@ class PrometheusExporter::Middleware
 
   end
 
+  private
+
+  module RedisInstrumenter
+    MethodProfiler.define_methods_on_module(self, ["call", "call_pipelined"], "redis")
+  end
+
+  def apply_redis_client_middleware!
+    RedisClient.register(RedisInstrumenter)
+  end
+
 end

data/lib/prometheus_exporter/server/web_collector.rb

@@ -60,7 +60,7 @@ module PrometheusExporter::Server
       custom_labels = obj['custom_labels']
       labels = custom_labels.nil? ? default_labels : default_labels.merge(custom_labels)
 
-      @http_requests_total.observe(1, labels.merge(status: obj["status"]))
+      @http_requests_total.observe(1, labels.merge("status" => obj["status"]))
 
       if timings = obj["timings"]
         @http_request_duration_seconds.observe(timings["total_duration"], labels)

data/lib/prometheus_exporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusExporter
-  VERSION = '2.0.3'
+  VERSION = '2.0.5'
 end

data/prometheus_exporter.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", ">= 0.69"
   spec.add_development_dependency "bundler", ">= 2.1.4"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "minitest", "~> 5.15.0" # https://github.com/qrush/m/issues/93
   spec.add_development_dependency "guard", "~> 2.0"
   spec.add_development_dependency "mini_racer", "~> 0.5.0"
   spec.add_development_dependency "guard-minitest", "~> 2.0"
@@ -39,6 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-discourse", ">2"
   spec.add_development_dependency "appraisal", "~> 2.3"
   spec.add_development_dependency "activerecord", "~> 6.0.0"
+  spec.add_development_dependency "redis", "> 5"
+  spec.add_development_dependency "m"
   if !RUBY_ENGINE == 'jruby'
     spec.add_development_dependency "raindrops", "~> 0.19"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.15.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Prometheus metric collector and exporter for Ruby
 email:
 - sam.saffron@gmail.com