gruf-prometheus 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc1bfd65b8d6b2bd2f9cf037b0f555db7050bb2e904b0bff974d0c25661693f
-  data.tar.gz: acc67e687db127073c4d910f5df49deae1aaafa2cb2a51c42a656e3374eaab46
+  metadata.gz: 3b1831369701b8f7b4c858654f06497d928f29f34701f3f9bdb8292b3e07510b
+  data.tar.gz: c0c63008b040f8fa029f9a51f3dcdf840d3cf53ac2f0f1133c88edfea49dd99e
 SHA512:
-  metadata.gz: 06b59c18c94ad363c92d2e6d6926a4c15d202baea8cd1a6ebd53f3a98806d7940f81dd08d128244efe0d7c568132663bca72084af8e03c6e13305d8f1ea8f6a2
-  data.tar.gz: 1271bbc43c962c2c028801eda96394df3e777c80ca917d895494b3f4cb58b3d490382f86652a87c6724ebd6fe0f522bb00637c5945c0e475a3dc7f64f2eda61e
+  metadata.gz: 21036c865a738cca214200eb1a0eff9d8e7ce12c6e3d0311e35c9c8e299bacec9503447773f2516b20bba22852ab7c4ec44d0405de6d70c87cb60575f7897136
+  data.tar.gz: 0540c1f7b69d2387abeb2d2122885ef78ab56a01893633fd0ea559e3d7c9e5f390b0f3a5d46337fe781bc0f81081ee36b3777b29c1eed146466b50fa2acc6979

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Changelog for the gruf-prometheus gem.
 
 ### Pending Release
 
+### 2.5.0
+
+- Add support for Ruby 3.4, 3.3
+- Drop support for Ruby 3.0, 3.1
+
+### 2.4.0
+
+- Add support for Ruby 3.2
+- Drop support for Ruby 2.7 (EOL March 2023)
+
 ### 2.3.1
 
 - Ensure ActiveRecord collector is started on gruf hook

data/README.md

@@ -2,7 +2,7 @@
 
 [![CircleCI](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/main.svg?style=svg)](https://circleci.com/gh/bigcommerce/gruf-prometheus/tree/main)  [![Gem Version](https://badge.fury.io/rb/gruf-prometheus.svg)](https://badge.fury.io/rb/gruf-prometheus) [![Documentation](https://inch-ci.org/github/bigcommerce/gruf-prometheus.svg?branch=main)](https://inch-ci.org/github/bigcommerce/gruf-prometheus?branch=main)
 
-Adds Prometheus support for [gruf](https://github.com/bigcommerce/gruf) 2.7.0+. Supports Ruby 2.7-3.1.
+Adds Prometheus support for [gruf](https://github.com/bigcommerce/gruf) 2.7.0+. Supports Ruby 3.x.
 
 ## Installation
 

data/gruf-prometheus.gemspec

@@ -31,22 +31,10 @@ Gem::Specification.new do |spec|
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files         = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'gruf-prometheus.gemspec']
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.7', '< 4'
+  spec.require_paths = %w[lib]
+  spec.required_ruby_version = '>= 3.2', '< 4'
 
   # Runtime dependencies
-  spec.add_runtime_dependency 'bc-prometheus-ruby', '>= 0.5.1'
-  spec.add_runtime_dependency 'gruf', '>= 2.7'
-
-  # Development dependencies
-  spec.add_development_dependency 'bundler-audit', '>= 0.6'
-  spec.add_development_dependency 'pry', '>= 0.13'
-  spec.add_development_dependency 'rake', '>= 13.0'
-  spec.add_development_dependency 'rspec', '>= 3.10'
-  spec.add_development_dependency 'rspec_junit_formatter', '>= 0.4'
-  spec.add_development_dependency 'rubocop', '>= 1.1'
-  spec.add_development_dependency 'rubocop-packaging', '~> 0.5'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.8'
-  spec.add_development_dependency 'rubocop-thread_safety', '~> 0.3'
-  spec.add_development_dependency 'simplecov', '>= 0.19'
+  spec.add_dependency 'bc-prometheus-ruby', '>= 0.5.1'
+  spec.add_dependency 'gruf', '>= 2.7'
 end

data/lib/gruf/prometheus/client/collector.rb

@@ -39,7 +39,7 @@ module Gruf
         def started_total(request_context:)
           push(
             grpc_client_started_total: 1,
-            custom_labels: custom_labels(request_context: request_context)
+            custom_labels: custom_labels(request_context:)
           )
         end
 
@@ -52,7 +52,7 @@ module Gruf
 
           push(
             grpc_client_failed_total: 1,
-            custom_labels: custom_labels(request_context: request_context)
+            custom_labels: custom_labels(request_context:)
           )
         end
 
@@ -63,7 +63,7 @@ module Gruf
         def completed(request_context:, result:)
           push(
             grpc_client_completed: 1,
-            custom_labels: custom_labels(request_context: request_context, result: result)
+            custom_labels: custom_labels(request_context:, result:)
           )
         end
 
@@ -74,7 +74,7 @@ module Gruf
         def completed_latency_seconds(request_context:, result:)
           push(
             grpc_client_completed_latency_seconds: result.elapsed.to_f,
-            custom_labels: custom_labels(request_context: request_context, result: result)
+            custom_labels: custom_labels(request_context:, result:)
           )
         end
 

data/lib/gruf/prometheus/client/interceptor.rb

@@ -25,10 +25,10 @@ module Gruf
         ##
         # Intercept the call and send metrics
         #
-        def call(request_context:, &block)
-          result = ::Gruf::Interceptors::Timer.time(&block)
+        def call(request_context:, &)
+          result = ::Gruf::Interceptors::Timer.time(&)
 
-          send_metrics(request_context: request_context, result: result)
+          send_metrics(request_context:, result:)
 
           raise result.message unless result.successful?
 
@@ -42,10 +42,10 @@ module Gruf
         # @param [Gruf::Interceptors::Timer::Result] result
         #
         def send_metrics(request_context:, result:)
-          prometheus_collector.started_total(request_context: request_context)
-          prometheus_collector.failed_total(request_context: request_context, result: result) unless result.successful?
-          prometheus_collector.completed(request_context: request_context, result: result)
-          prometheus_collector.completed_latency_seconds(request_context: request_context, result: result) if measure_latency?
+          prometheus_collector.started_total(request_context:)
+          prometheus_collector.failed_total(request_context:, result:) unless result.successful?
+          prometheus_collector.completed(request_context:, result:)
+          prometheus_collector.completed_latency_seconds(request_context:, result:) if measure_latency?
         rescue StandardError => e
           # we don't want this to affect actual RPC execution, so just log an error and move on
           Gruf.logger.error "Failed registering metric to prometheus type collector: #{e.message} - #{e.class.name}"

data/lib/gruf/prometheus/collector.rb

@@ -47,6 +47,7 @@ module Gruf
 
       ##
       # @return [GRPC::RpcServer]
+      # @return [NilClass]
       #
       def grpc_server
         @options.fetch(:server, nil)&.server

data/lib/gruf/prometheus/configuration.rb

@@ -71,7 +71,7 @@ module Gruf
       #
       def reset
         VALID_CONFIG_KEYS.each do |k, v|
-          send("#{k}=".to_sym, v)
+          send(:"#{k}=", v)
         end
         self.process_label = ENV.fetch('PROMETHEUS_PROCESS_LABEL', 'grpc').to_s
         self.process_name = ENV.fetch('PROMETHEUS_PROCESS_NAME', 'grpc').to_s
@@ -86,8 +86,8 @@ module Gruf
       # @return [String] The current Ruby environment
       #
       def environment
-        if defined?(Rails)
-          Rails.env.to_s
+        if defined?(::Rails)
+          ::Rails.env.to_s
         else
           (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development').to_s
         end

data/lib/gruf/prometheus/hook.rb

@@ -70,9 +70,7 @@ module Gruf
           )
         end
         ::Gruf::Prometheus::Collector.start(
-          options: {
-            server: server
-          },
+          options: { server: },
           type: 'grpc',
           client: ::Bigcommerce::Prometheus.client,
           frequency: ::Gruf::Prometheus.collection_frequency

data/lib/gruf/prometheus/server/collector.rb

@@ -39,7 +39,7 @@ module Gruf
         def started_total(request:)
           push(
             grpc_server_started_total: 1,
-            custom_labels: custom_labels(request: request)
+            custom_labels: custom_labels(request:)
           )
         end
 
@@ -52,7 +52,7 @@ module Gruf
 
           push(
             grpc_server_failed_total: 1,
-            custom_labels: custom_labels(request: request)
+            custom_labels: custom_labels(request:)
           )
         end
 
@@ -63,7 +63,7 @@ module Gruf
         def handled_total(request:, result:)
           push(
             grpc_server_handled_total: 1,
-            custom_labels: custom_labels(request: request, result: result)
+            custom_labels: custom_labels(request:, result:)
           )
         end
 
@@ -74,7 +74,7 @@ module Gruf
         def handled_latency_seconds(request:, result:)
           push(
             grpc_server_handled_latency_seconds: result.elapsed.to_f,
-            custom_labels: custom_labels(request: request, result: result)
+            custom_labels: custom_labels(request:, result:)
           )
         end
 

data/lib/gruf/prometheus/server/interceptor.rb

@@ -25,8 +25,8 @@ module Gruf
         ##
         # Intercept the call and send metrics
         #
-        def call(&block)
-          result = ::Gruf::Interceptors::Timer.time(&block)
+        def call(&)
+          result = ::Gruf::Interceptors::Timer.time(&)
 
           send_metrics(result)
 
@@ -41,10 +41,10 @@ module Gruf
         # @param [Gruf::Interceptors::Timer::Result] result
         #
         def send_metrics(result)
-          prometheus_collector.started_total(request: request)
-          prometheus_collector.failed_total(request: request, result: result) unless result.successful?
-          prometheus_collector.handled_total(request: request, result: result)
-          prometheus_collector.handled_latency_seconds(request: request, result: result) if measure_latency?
+          prometheus_collector.started_total(request:)
+          prometheus_collector.failed_total(request:, result:) unless result.successful?
+          prometheus_collector.handled_total(request:, result:)
+          prometheus_collector.handled_latency_seconds(request:, result:) if measure_latency?
         rescue StandardError => e
           # we don't want this to affect actual RPC execution, so just log an error and move on
           Gruf.logger.error "Failed registering metric to prometheus type collector: #{e.message} - #{e.class.name}"

data/lib/gruf/prometheus/version.rb

@@ -17,6 +17,6 @@
 #
 module Gruf
   module Prometheus
-    VERSION = '2.3.1'
+    VERSION = '2.5.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gruf-prometheus
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Shaun McCormick
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bc-prometheus-ruby
@@ -38,146 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop-thread_safety
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
 description: Prometheus support for gruf
 email:
 - shaun.mccormick@bigcommerce.com
@@ -207,7 +66,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -225,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Prometheus support for gruf
 test_files: []