prom_multi_proc_rb 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37f8295264d7bce0f624c278e59d421ae44908bf1111435741011c42154e2fe
-  data.tar.gz: 6a887ad172e0b78965b1cb0f9994faed63552ad29db0b6aa607f533d80d84ccb
+  metadata.gz: 5a78925823a018eb95a68a84c00ff22a798689efd686d0b03e766499137b2cfd
+  data.tar.gz: e8f347f72c15e27fb4873d9bb0477385b179fe04b06bfb45c6e930d00bded430
 SHA512:
-  metadata.gz: 865c47f29f5d5757969144c9131079481e64147b6f3e6cde9ee0109b1b84d33cbef792199cbb7965738160d56218b29035c372b21f04b307c67ad90eede37ba7
-  data.tar.gz: 84c11b31077019cbb073ec74a5e02cf4b4d3db16a479169b713152ba4d8b40747c86852e3db8bae2890e1e0217d9603d97da8e7e9dd68b9e670e3c082341e235
+  metadata.gz: a21b01ee4305201ae371f81ccecf7fd3f6614d1ad90f9db0ab16ec93e57bf82114202bff8127fb02cf09c5a18bd6a91f20a0cf11edcffaba5dc417aef472ecbe
+  data.tar.gz: 71f3e7dad7f1045d59351be8e1661b20f1f220af6de3d3327b328cb443549ec5127d052921f3ea3dde7b151ecfe217f5882144014bf99fa1e16b00ac9897b9d4

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['3.2', '3.3']
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/README.md

@@ -1,12 +1,11 @@
 # prom_multi_proc_rb
 
-[![Build Status](https://travis-ci.org/atongen/prom_multi_proc_rb.svg?branch=master)](https://travis-ci.org/atongen/prom_multi_proc_rb)
+[![CI](https://github.com/atongen/prom_multi_proc_rb/actions/workflows/ci.yml/badge.svg)](https://github.com/atongen/prom_multi_proc_rb/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/prom_multi_proc_rb.svg)](https://badge.fury.io/rb/prom_multi_proc_rb)
 
-Ruby client library for collecting prometheus metrics.
-Designed for use in applications running under forking servers (unicorn, puma).
-Writes metrics in json format to unix socket being listened to
-by [prom_multi_proc](https://github.com/atongen/prom_multi_proc).
+Ruby client library for collecting Prometheus metrics in multi-process applications.
+Designed for forking servers (Unicorn, Puma). Writes metrics as JSON to a Unix socket
+listened to by [prom_multi_proc](https://github.com/atongen/prom_multi_proc).
 
 ## Installation
 
@@ -28,93 +27,151 @@ Or install it yourself as:
 
 ### Define metrics
 
-Create a json file to define the prometheus metrics that your application will track, for example:
+Create a JSON file to define the Prometheus metrics your application will track:
 
 ```json
 [
     {
         "type": "counter",
-        "name": "app_test_counter_total",
-        "help": "A test counter",
-        "labels": [
-            "label1",
-        ]
+        "name": "app_requests_total",
+        "help": "Total HTTP requests",
+        "labels": ["method", "status"]
     },
     {
         "type": "gauge",
-        "name": "app_test_gauge_total",
-        "help": "A test gauge",
-        "labels": [
-            "label2",
-        ]
+        "name": "app_workers_active",
+        "help": "Number of active workers"
     },
     {
         "type": "histogram",
-        "name": "app_test_histogram_seconds",
-        "help": "A test histogram",
-        "labels": [
-            "label3",
-        ]
+        "name": "app_request_duration_seconds",
+        "help": "Request duration in seconds",
+        "labels": ["method"]
     },
     {
         "type": "summary",
-        "name": "app_test_summary_seconds",
-        "help": "A test summary",
-        "labels": [
-            "label4",
-        ]
+        "name": "app_response_size_bytes",
+        "help": "Response size in bytes",
+        "labels": ["method"]
     }
 ]
 ```
 
-This file is intened to be shared by both the aggregator process and this ruby library.
+This file is shared by both the aggregator process and the Ruby client. Metric names
+in the JSON file may or may not include the prefix — the client applies it automatically
+if it is missing.
 
 ### Install and start the aggregator process
 
-Download, install, and start the [prom_multi_proc](https://github.com/atongen/prom_multi_proc)
-aggregator application using the metrics json definition file created earlier.
-Make note of the socket location.
+Download, install, and start [prom_multi_proc](https://github.com/atongen/prom_multi_proc)
+using the metrics JSON definition file. Note the socket path.
 
-Note that in development, the ruby client will funtion normally if there is no aggregator process listening
-on the socket.
+The Ruby client functions normally if no aggregator is listening on the socket — failed
+writes are logged and silently dropped so the host application is never interrupted.
 
-### Collect metrics in ruby app
+### Collect metrics
 
-Create a `PromMultiProc::Base` object for collecting metrics
-and begin collecting metrics:
+Create a `PromMultiProc::Base` object and begin recording metrics:
 
 ```ruby
 metrics = PromMultiProc::Base.new(
-  prefix: "app_",
-  socket: "path/to/aggregator/socket.sock",
-  metrics: "path/to/metrics/definition.json",
+  prefix:     "app_",
+  socket:     "/var/run/prom_multi_proc/metrics.sock",
+  metrics:    "/etc/myapp/metrics.json",
   batch_size: 10,
-  validate: true
+  validate:   true
 )
 
-metrics.test_counter_total.inc(label1: "my-label-value")
-metrics.test_histogram_seconds.observe(2.3, label3: "my-other-label-value")
+metrics.requests_total.inc(method: "GET", status: "200")
+metrics.request_duration_seconds.observe(0.042, method: "GET")
+```
+
+#### Configuration options
+
+| Option | Default | Description |
+|---|---|---|
+| `socket:` | _(required)_ | Path to the Unix socket of the aggregator daemon |
+| `metrics:` | _(required)_ | Path to the JSON metric definition file |
+| `prefix:` | `""` | Metric name prefix. Applied to names in the spec that don't already carry it. |
+| `batch_size:` | `1` | Flush after accumulating this many messages. |
+| `batch_timeout:` | `3` | Force-flush every N seconds even if batch is not full. |
+| `validate:` | `false` | Raise `PromMultiProcError` on invalid labels/values instead of silently dropping |
+
+#### Prefix behavior
+
+The `prefix:` option works the same way as the `-metric-prefix` flag on the aggregator server:
+if a metric name in the JSON spec already starts with the prefix, it is used as-is; otherwise
+the prefix is prepended. This means you can use either full names or short names in your spec file.
+
+```ruby
+# Both of these result in wire name "app_requests_total":
+# spec: {"name": "app_requests_total", ...}  → already has prefix, used as-is
+# spec: {"name": "requests_total", ...}       → prefix applied → "app_requests_total"
+```
+
+#### Multi / batch writes
+
+Use `#multi` to record multiple metrics in a single atomic socket write:
+
+```ruby
+metrics.multi do |m|
+  m.requests_total.inc(method: "POST", status: "201")
+  m.workers_active.set(8)
+  m.request_duration_seconds.observe(0.015, method: "POST")
+end
 ```
 
 ## Rails Usage
 
-This helper class can be used to simplify a rails initializer, for example, in `config/initializers/prom_multi_proc.rb`:
+A Rails initializer helper is provided at `PromMultiProc::Rails.init`.
+Create `config/initializers/prom_multi_proc.rb`:
 
 ```ruby
-$prom_multi_proc = PromMultiProc::Rails.init
+$prom = PromMultiProc::Rails.init
 
-$prom_multi_proc.test_counter_total.inc(label1: "my-label-value")
-$prom_multi_proc.test_histogram_seconds.observe(2.3, label3: "my-other-label-value")
+$prom.requests_total.inc(method: "GET", status: "200")
+$prom.request_duration_seconds.observe(0.042, method: "GET")
 ```
 
-## Contributing
+`Rails.init` derives sensible defaults from the Rails environment (batch size, validate, socket
+path, etc.) and accepts keyword arguments to override any of them:
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/atongen/prom_multi_proc_rb. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+```ruby
+# Override prefix and bump batch size in production
+$prom = PromMultiProc::Rails.init(prefix: "myapp_", batch_size: 50)
 
-## License
+# Point at a non-default socket
+$prom = PromMultiProc::Rails.init(socket: "/run/metrics/custom.sock")
+```
+
+The `PROM_MULTI_PROC_SOCKET` and `PROM_MULTI_PROC_DEFINITION_FILE` environment variables are
+still respected as fallback defaults for `socket:` and `metrics:`, but any value passed directly
+as a keyword argument takes precedence.
+
+## Wire format
+
+Each flush sends a JSON array over the Unix socket and then closes the connection:
+
+```json
+[
+  {"name":"app_requests_total","method":"inc","value":1.0,"label_values":["GET","200"]},
+  {"name":"app_workers_active","method":"set","value":8.0,"label_values":[]}
+]
+```
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+## Metric types and methods
 
-## Code of Conduct
+| Type | Methods |
+|---|---|
+| `counter` | `inc`, `add` |
+| `gauge` | `set`, `inc`, `dec`, `add`, `sub`, `set_to_current_time` |
+| `histogram` | `observe` |
+| `summary` | `observe` |
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/atongen/prom_multi_proc_rb.
+
+## License
 
-Everyone interacting in the prom_multi_proc_rb project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/atongen/prom_multi_proc_rb/blob/master/CODE_OF_CONDUCT.md).
+Available as open source under the [MIT License](http://opensource.org/licenses/MIT).

data/lib/prom_multi_proc/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "logger"
 require "concurrent"
 
@@ -5,8 +7,12 @@ module PromMultiProc
   class Base
     attr_reader :logger, :prefix, :writer
 
-    def initialize(socket:, metrics:, batch_size: 1, batch_timeout: 3, logger: nil, validate: false, prefix: "")
-      @prefix = prefix
+    def initialize(socket:, metrics:, batch_size: nil, batch_timeout: nil, logger: nil, validate: false, prefix: "")
+      @prefix = if prefix.empty? || prefix.end_with?("_")
+        prefix
+      else
+        "#{prefix}_"
+      end
       @logger = logger || ::Logger.new(STDOUT)
 
       unless File.socket?(socket)
@@ -36,9 +42,9 @@ module PromMultiProc
     def multi
       return unless block_given?
       result = @multi_lock.synchronize do
-        Proxy.new(self).tap do |proxy|
-          yield(proxy)
-        end
+        proxy = Proxy.new(self)
+        yield(proxy)
+        proxy
       end
       @writer.write_multi(result.multis)
     end
@@ -46,7 +52,7 @@ module PromMultiProc
   private
 
     def valid_metric?(name)
-      !!METRIC_RE.match(name)
+      METRIC_RE.match?(name)
     end
 
     def get_specs(file)
@@ -68,36 +74,38 @@ module PromMultiProc
     def process_spec!(spec)
       klazz = TYPES[spec["type"].to_sym]
       unless klazz
-        raise PromMultiProcError.new("Unkown type: #{spec.inspect}")
+        raise PromMultiProcError.new("Unknown type: #{spec.inspect}")
       end
 
       unless valid_metric?(spec["name"])
         raise PromMultiProcError.new("Invalid name: #{spec.inspect}")
       end
 
-      unless spec["name"].start_with?(prefix)
-        raise PromMultiProcError.new("Metric '#{spec['name']}' must start with prefix '#{prefix}'")
+      full_name = if prefix.empty? || spec["name"].start_with?(prefix)
+        spec["name"]
+      else
+        "#{prefix}#{spec["name"]}"
       end
-      name = spec["name"].sub(/\A#{prefix}/, "").to_sym
+      name = full_name.sub(/\A#{Regexp.escape(prefix)}/, "").to_sym
 
       unless spec["help"] && !spec["help"].strip.empty?
         raise PromMultiProcError.new("Metric '#{spec['name']}' is missing help")
       end
 
       labels = (spec["labels"] || []).map(&:to_sym)
-      unless labels.all? { |l| valid_metric?(l)  }
+      unless labels.all? { |l| valid_metric?(l) }
         raise PromMultiProcError.new("Invalid label: #{spec.inspect}")
       end
 
-      if self.class.instance_methods(false).include?(name) || methods(false).include?(name)
-        raise PromMultiProcError.new("Metric method exists: #{name}")
-      end
-
       if @metric_objects.key?(name)
         raise PromMultiProcError.new("Metric already exists: #{name}")
       end
 
-      @metric_objects[name] = klazz.new(spec["name"], labels, @writer)
+      if respond_to?(name)
+        raise PromMultiProcError.new("Metric method conflicts with existing method: #{name}")
+      end
+
+      @metric_objects[name] = klazz.new(full_name, labels, @writer)
 
       define_singleton_method(name) do
         @metric_objects[name]

data/lib/prom_multi_proc/collector.rb

@@ -1,16 +1,23 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Collector
-    attr_reader :name, :metric_methods
+    attr_reader :name
+
+    EXCLUDED_FROM_METRIC_METHODS = %i(validate! to_msg).freeze
+
+    def self.metric_methods
+      @metric_methods ||= (public_instance_methods(false) - EXCLUDED_FROM_METRIC_METHODS).map(&:to_s).freeze
+    end
 
     def initialize(name, label_keys, writer)
       @name = name
       @label_keys = label_keys
       @writer = writer
-      @metric_methods = (public_methods(false) - %i(
-        validate!
-        valid_method? valid_label_keys? valid_label_values? valid_value?
-        to_msg
-      )).map(&:to_s)
+    end
+
+    def metric_methods
+      self.class.metric_methods
     end
 
     def validate!(method, value, labels)
@@ -21,13 +28,22 @@ module PromMultiProc
         raise PromMultiProcError.new("Invalid label cardinality (#{name}): #{labels.keys.inspect}, need keys: #{@label_keys.inspect}")
       end
       unless valid_label_values?(labels)
-        raise PromMultiProcError.new("Invalid label values (#{name}): #{labels.values.inspect}")
+        raise PromMultiProcError.new("Invalid label values (#{name}): #{labels.values.inspect} (all values must be string or symbol)")
       end
       unless valid_value?(value)
         raise PromMultiProcError.new("Invalid value (#{name}): #{value.inspect} (must be numeric)")
       end
     end
 
+    def to_msg(method, value, labels)
+      { "name" => name,
+        "method" => method,
+        "value" => value.to_f,
+        "label_values" => labels.values }
+    end
+
+  private
+
     def valid_method?(method)
       metric_methods.include?(method)
     end
@@ -44,15 +60,6 @@ module PromMultiProc
       value.is_a?(Numeric)
     end
 
-    def to_msg(method, value, labels)
-      { "name" => name,
-        "method" => method,
-        "value" => value.to_f,
-        "label_values" => labels.values }
-    end
-
-  private
-
     def write(method, value, labels)
       @writer.write(self, method, value, labels)
     end

data/lib/prom_multi_proc/counter.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Counter < Collector
     def inc(labels = {})
-      write("inc".freeze, 1, labels)
+      write("inc", 1, labels)
     end
 
     def add(value, labels = {})
-      write("add".freeze, value, labels)
+      write("add", value, labels)
     end
   end
 end

data/lib/prom_multi_proc/gauge.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Gauge < Collector
     def set(value, labels = {})
-      write("set".freeze, value, labels)
+      write("set", value, labels)
     end
 
     def inc(labels = {})
-      write("inc".freeze, 1, labels)
+      write("inc", 1, labels)
     end
 
     def dec(labels = {})
-      write("dec".freeze, 1, labels)
+      write("dec", 1, labels)
     end
 
     def add(value, labels = {})
-      write("add".freeze, value, labels)
+      write("add", value, labels)
     end
 
     def sub(value, labels = {})
-      write("sub".freeze, value, labels)
+      write("sub", value, labels)
     end
 
     def set_to_current_time(labels = {})
-      write("set_to_current_time".freeze, 1, labels)
+      write("set_to_current_time", 1, labels)
     end
   end
 end

data/lib/prom_multi_proc/histogram.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Histogram < Collector
     def observe(value, labels = {})
-      write("observe".freeze, value, labels)
+      write("observe", value, labels)
     end
   end
 end

data/lib/prom_multi_proc/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Proxy
     attr_reader :multis

data/lib/prom_multi_proc/rails.rb

@@ -1,54 +1,38 @@
+# frozen_string_literal: true
+
 require "logger"
 
 module PromMultiProc
   module Rails
-    def self.init(prefix = nil)
-      metrics = ENV.fetch("PROM_MULTI_PROC_DEFINITION_FILE", ::Rails.root.join("config/metrics.json").to_s)
-      socket = ENV.fetch("PROM_MULTI_PROC_SOCKET", ::Rails.root.join("tmp/sockets/metrics.sock").to_s)
-
+    def self.init(**options)
       program_name = File.basename($PROGRAM_NAME)
       app_name = ::Rails.application.class.name.underscore.split("/").first
-      prefix ||= "#{app_name}_"
 
-      if ENV.key?("PROM_MULTI_PROC_BATCH_SIZE")
-        batch_size = ENV["PROM_MULTI_PROC_BATCH_SIZE"].to_i
-      elsif %w(rails rake).include?(program_name) || ::Rails.env.development? || ::Rails.env.test?
-        batch_size = 1
-      elsif ::Rails.env.production?
-        batch_size = 100
-      else
-        batch_size = 5
-      end
+      defaults = {
+        prefix:        "#{app_name}_",
+        socket:        ENV.fetch("PROM_MULTI_PROC_SOCKET", ::Rails.root.join("tmp/sockets/metrics.sock").to_s),
+        metrics:       ENV.fetch("PROM_MULTI_PROC_DEFINITION_FILE", ::Rails.root.join("config/metrics.json").to_s),
+        batch_size:    default_batch_size(program_name),
+        batch_timeout: 3,
+        validate:      ::Rails.env.development? || ::Rails.env.test?,
+        logger:        ::Rails.logger || ::Logger.new(STDOUT)
+      }
 
-      if ENV.key?("PROM_MULTI_PROC_BATCH_TIMEOUT")
-        batch_timeout = ENV["PROM_MULTI_PROC_BATCH_TIMEOUT"].to_i
-      else
-        batch_timeout = 3
-      end
+      config = defaults.merge(options)
+      config[:logger].info("Setting up prom_multi_proc for #{app_name}-#{program_name}, batch_size: #{config[:batch_size]}, batch_timeout: #{config[:batch_timeout]}, validate: #{config[:validate]}")
 
-      if ::Rails.env.development? || ::Rails.env.test?
-        validate = true
-      else
-        validate = false
-      end
+      Base.new(**config)
+    end
 
-      if ::Rails.logger
-        logger = ::Rails.logger
+    def self.default_batch_size(program_name)
+      if %w(rails rake).include?(program_name) || ::Rails.env.development? || ::Rails.env.test?
+        1
+      elsif ::Rails.env.production?
+        100
       else
-        logger = ::Logger.new(STDOUT)
+        5
       end
-
-      logger.info("Setting up prom_multi_proc for #{app_name}-#{program_name}, batch size: #{batch_size}, batch timeout: #{batch_timeout} validate: #{validate}")
-
-      Base.new(
-        prefix: prefix,
-        socket: socket,
-        metrics: metrics,
-        batch_size: batch_size,
-        batch_timeout: batch_timeout,
-        validate: validate,
-        logger: logger
-      )
     end
+    private_class_method :default_batch_size
   end
 end

data/lib/prom_multi_proc/summary.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Summary < Collector
     def observe(value, labels = {})
-      write("observe".freeze, value, labels)
+      write("observe", value, labels)
     end
   end
 end

data/lib/prom_multi_proc/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PromMultiProc
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/prom_multi_proc/writer.rb

@@ -1,53 +1,59 @@
+# frozen_string_literal: true
+
 module PromMultiProc
   class Writer
     attr_reader :socket, :batch_size, :batch_timeout
 
-    def initialize(socket:, batch_size: 1, batch_timeout: 3, validate: false)
-      if !batch_size.is_a?(Integer) || batch_size <= 0
+    def initialize(socket:, batch_size: nil, batch_timeout: nil, validate: false)
+      batch_size = 1 if batch_size.nil?
+      batch_timeout = 3 if batch_timeout.nil?
+      unless batch_size.is_a?(Integer) && batch_size > 0
         raise PromMultiProcError.new("Invalid batch size: #{batch_size}")
       end
-      if !batch_timeout.is_a?(Integer) || batch_timeout <= 0
+      unless batch_timeout.is_a?(Integer) && batch_timeout > 0
         raise PromMultiProcError.new("Invalid batch timeout: #{batch_timeout}")
       end
+
       @batch_size = batch_size
       @batch_timeout = batch_timeout
-      @validate = !!validate
+      @validate = validate
+      @socket = socket
 
+      @messages = []
       @lock = Mutex.new
-      @thread = Thread.new {
+      @thread = Thread.new do
         loop do
-          sleep(batch_timeout)
           flush(force: true)
+          sleep(@batch_timeout)
         end
-      }
-      @messages = []
-
-      @socket = socket
+      end
     end
 
     def validate?
       @validate
     end
 
-    def write(metric, method, value, labels)
-      @lock.synchronize do
-        metric.validate!(method, value, labels) if validate?
-        @messages << metric.to_msg(method, value, labels)
+    def shutdown
+      if @thread&.alive?
+        flush
+        @thread.kill
       end
+    end
 
-      flush
+    def write(metric, method, value, labels)
+      write_multi([[metric, method, value, labels]])
     end
 
     # array of arrays where inner array is length 4 matching arguments
     # for signature of #write
     def write_multi(metrics)
-      @lock.synchronize do
-        if validate?
-          metrics.each do |m, method, value, labels|
-            m.validate!(method, value, labels)
-          end
+      if validate?
+        metrics.each do |m, method, value, labels|
+          m.validate!(method, value, labels)
         end
+      end
 
+      @lock.synchronize do
         metrics.each do |m, method, value, labels|
           @messages << m.to_msg(method, value, labels)
         end
@@ -58,9 +64,13 @@ module PromMultiProc
 
     def flush(force: false)
       @lock.synchronize do
-        if force && @messages.length > 0 || @messages.length >= batch_size
+        if (force && @messages.length > 0) || (@messages.length >= batch_size)
           begin
             write_socket(JSON.generate(@messages))
+          rescue StandardError => e
+            # Never raise into host app; drop the batch
+            warn("prom_multi_proc_rb - flush: Failed to write batch to socket #{e}")
+            false
           ensure
             @messages.clear
           end
@@ -71,7 +81,9 @@ module PromMultiProc
     end
 
     def socket?
-      !!write_socket("\n")
+      File.socket?(@socket) && File.writable?(@socket)
+    rescue StandardError
+      false
     end
 
   private
@@ -79,10 +91,9 @@ module PromMultiProc
     def write_socket(msg)
       s = UNIXSocket.new(@socket)
       s.send(msg, 0)
-      s.close
       true
-    rescue StandardError
-      false
+    ensure
+      s&.close
     end
   end
 end

data/lib/prom_multi_proc.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require "socket"
 require "json"
-require "thread"
 
 require "prom_multi_proc/version"
 
@@ -22,9 +23,9 @@ module PromMultiProc
     gauge:     Gauge,
     histogram: Histogram,
     summary:   Summary
-  }
+  }.freeze
 
-  METRIC_RE = /\A[a-z]+[0-9a-z_]+\Z/
+  METRIC_RE = /\A[a-z]+[0-9a-z_]+\Z/.freeze
 end
 
 require "prom_multi_proc/rails" if defined?(::Rails)

data/prom_multi_proc_rb.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "prom_multi_proc/version"
@@ -9,18 +10,17 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Andrew Tongen"]
   spec.email         = ["atongen@gmail.com"]
 
-  spec.summary       = %q{A ruby library for collecting prometheus metrics within forking servers}
-  spec.description   = %q{A ruby library for collecting prometheus metrics within forking servers}
+  spec.summary       = "A ruby library for collecting prometheus metrics within forking servers"
+  spec.description   = "A ruby library for collecting prometheus metrics within forking servers"
   spec.homepage      = "https://github.com/atongen/prom_multi_proc_rb"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  spec.required_ruby_version = ">= 2.7"
+
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -30,10 +30,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "bundler", ">= 2.0"
+  spec.add_development_dependency "rake", ">= 13.0"
+  spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "rspec-collection_matchers", "~> 1.2"
 
   spec.add_dependency "concurrent-ruby", "~> 1.1"
+  spec.add_dependency "logger", ">= 1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prom_multi_proc_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrew Tongen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: A ruby library for collecting prometheus metrics within forking servers
 email:
 - atongen@gmail.com
@@ -89,9 +103,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -116,7 +130,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,15 +138,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: A ruby library for collecting prometheus metrics within forking servers
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.4
-  - 2.4.1
-  - 2.6.5
-before_install: gem install bundler -v 1.15.3