upfluence-utils 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185ccb39ffbe42b800bf9949a55d706d94ee5876fc883760ab3c639d3a0caea9
-  data.tar.gz: d6a2b76fdc2ad0eeec49b77d887c3b460f61d16cecd562c5c2f032e5fb3b8511
+  metadata.gz: 568c4033f087730c94a75c756587432873ee149b4d2462ea04b1b03169d9b551
+  data.tar.gz: e824e37e1cd2c901342f0089e859af8d62a908aa1c755d2527dc1a20309449f2
 SHA512:
-  metadata.gz: 117c839c07924e783815ba743613d9dcf8be403f5cdc2b4dbc46e6843f10786fe689dab160fdb2d50990e101775e942596f169986b99bc3b3bd66dbd15d88502
-  data.tar.gz: 3c6fe69b7f7265f3d0f392125dbe24aba0a0c3f69fef3f873d6cef7fd56a342363f8e7732a16d30ebd4d0cac8feeb15e776dd1b0a8a716d0db202e4709c3d838
+  metadata.gz: 60d4fd0ba8383217d60a73eadf48920d15259c77be69922f7a65f313b9a297dc62274c598655e739f3403a51e0d0f2cdd8f116e714528cc261dfb1a59ea47536
+  data.tar.gz: c6cbf56699eb8e3d540dea322fda7920a35c5bb06162d1483aaeb337dae7ea16f1f30137d052aab41497b8596f73efdac21f10a87961060194fdcd00809e1106

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    uses: upfluence/actions/.github/workflows/lib-ruby-test.yml@master
+    secrets: inherit
+
+  release:
+    needs: test
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+    - name: Bump version
+      id: bump-version
+      uses: upfluence/actions/bump-version@master
+    - name: Create release
+      uses: upfluence/actions/create-github-release@master
+      with:
+        version: ${{ steps.bump-version.outputs.version }}

data/Makefile

@@ -0,0 +1,4 @@
+.PHONY: release
+
+release:
+	BUNDLE_FROZEN=false bundle exec rake release:rubygem_push

data/lib/upfluence/http/middleware/active_record.rb

@@ -0,0 +1,17 @@
+module Upfluence
+  module HTTP
+    module Middleware
+      class ActiveRecord
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          ::ActiveRecord::Base.connection_pool.with_connection do
+            @app.call(env)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/server.rb

@@ -26,56 +26,63 @@ module Upfluence
   module HTTP
     class Server
       REQUEST_CONTEXT_KEY = :uhttp_request_context
+      SHUTDOWN_SIGNALS = %w[INT TERM].freeze
       DEFAULT_MIDDLEWARES = []
       DEFAULT_OPTIONS = {
-        server:                :puma,
-        Port:                  ENV.fetch('PORT', 8080),
-        Host:                  '0.0.0.0',
-        threaded:              true,
-        interfaces:            [],
-        push_gateway_url:      ENV.fetch('PUSH_GATEWAY_URL', nil),
-        push_gateway_interval: 15, # sec
-        prometheus_endpoint:   ENV.fetch('PUSH_GATEWAY_URL', nil).eql?(nil),
-        app_name:              ENV.fetch('APP_NAME', 'uhttp-rb-server'),
-        unit_name:             ENV.fetch('UNIT_NAME','uhttp-rb-server-anonymous'),
-        base_processor_klass:  nil,
-        base_handler_klass:    nil,
-        max_threads:           ENV.fetch('HTTP_SERVER_MAX_THREADS', 5).to_i,
-        request_timeout:       ENV['HTTP_SERVER_REQUEST_TIMEOUT']&.to_i,
-        middlewares:           [],
-        instrumentations:      [
+        server:                          :puma,
+        Port:                            ENV.fetch('PORT', 8080),
+        Host:                            '0.0.0.0',
+        threaded:                        true,
+        interfaces:                      [],
+        push_gateway_url:                ENV.fetch('PUSH_GATEWAY_URL', nil),
+        push_gateway_interval:           15, # sec
+        prometheus_endpoint:             ENV.fetch('PUSH_GATEWAY_URL', nil).eql?(nil),
+        app_name:                        ENV.fetch('APP_NAME', 'uhttp-rb-server'),
+        unit_name:                       ENV.fetch('UNIT_NAME', 'uhttp-rb-server-anonymous'),
+        base_processor_klass:            nil,
+        base_handler_klass:              nil,
+        max_threads:                     ENV.fetch('HTTP_SERVER_MAX_THREADS', 5).to_i,
+        request_timeout:                 ENV['HTTP_SERVER_REQUEST_TIMEOUT']&.to_i,
+        enable_active_record_middleware: true,
+        middlewares:                     [],
+        instrumentations:                [
           Instrumentation::PumaInstrumenter.new,
           Instrumentation::GCInstrumenter.new,
           Instrumentation::ActiveRecordPoolInstrumenter.new
         ],
-        admin_port:            ENV.fetch('ADMIN_PORT', nil),
-        debug:                 ENV.fetch('DEBUG', nil)
+        admin_port:                      ENV.fetch('ADMIN_PORT', nil),
+        debug:                           ENV.fetch('DEBUG', nil)
       }
 
       def initialize(options = {}, &block)
         @options = DEFAULT_OPTIONS.dup.merge(options)
         opts = @options
 
-        if opts[:base_handler_klass]
-          @base_handler = opts[:base_handler_klass].new(opts[:interfaces])
-        end
+        @base_handler = opts[:base_handler_klass].new(opts[:interfaces]) if opts[:base_handler_klass]
 
         @admin_builder = admin_builder(opts) if opts[:admin_port]
         @production_builder = production_builder(opts, &block)
         @handler = Rack::Handler.get(opts[:server])
+        @stoppables = []
       end
 
       def serve
         ENV['RACK_ENV'] = Upfluence.env.to_s
+        @stopping = false
+        signal_handlers = install_signal_handlers
+        admin_thread = nil
 
-        Thread.new { run_prometheus_exporter } if @options[:push_gateway_url]
+        register_stoppable(prometheus_exporter_thread) if @options[:push_gateway_url]
 
-        @options[:instrumentations].each(&:start)
+        @options[:instrumentations].each do |instrumentation|
+          instrumentation.start
+          register_stoppable(instrumentation) if instrumentation.respond_to?(:stop)
+        end
 
         if @admin_builder
           admin_port = @options[:admin_port].to_i
 
-          Thread.new do
+          admin_thread = Thread.new do
             run_builder(@admin_builder, Port: admin_port)
           end
 
@@ -85,6 +92,10 @@ module Upfluence
         end
 
         run_builder(@production_builder)
+      ensure
+        stop
+        admin_thread&.join
+        restore_signal_handlers(signal_handlers) if signal_handlers
       end
 
       class << self
@@ -103,68 +114,100 @@ module Upfluence
         opts = @options.merge(overrides)
 
         @handler.run(builder, **opts) do |server|
+          register_stoppable(server)
+          register_booted_handler(server)
+          configure_puma_instrumenter(server) if builder.equal?(@production_builder)
           server.threaded = opts[:threaded] if server.respond_to? :threaded=
 
           # Thin does not recognize the max_thread argument, howerver it has a
           # threadpool_size setter. Puma on the other hand recognize max_thread.
-          if server.respond_to?(:threadpool_size=) && opts[:max_threads]
-            server.threadpool_size = opts[:max_threads]
+          server.threadpool_size = opts[:max_threads] if server.respond_to?(:threadpool_size=) && opts[:max_threads]
+        end
+      end
+
+      def register_booted_handler(server)
+        return unless server.respond_to?(:events)
+
+        server.events.after_booted { install_signal_handlers }
+      end
+
+      def configure_puma_instrumenter(server)
+        @options[:instrumentations].select { |instrumentation| instrumentation.respond_to?(:server=) }.each do |instrumentation|
+          instrumentation.server = server
+        end
+      end
+
+      def install_signal_handlers
+        SHUTDOWN_SIGNALS.to_h do |signal|
+          previous_handler = Signal.trap(signal) do
+            Thread.new { stop }
           end
+
+          [signal, previous_handler]
         end
       end
 
-      def production_builder(opts, &block)
-        base_handler = @base_handler
-        has_admin = !opts[:admin_port].nil?
-        mount = method(:mount_admin_endpoints)
+      def restore_signal_handlers(handlers)
+        handlers.each { |signal, handler| Signal.trap(signal, handler) }
+      end
 
-        Builder.new do
-          use Middleware::RequestStapler, timeout: opts[:request_timeout]
-          use Middleware::Logger
-          use Middleware::Prometheus
-          use Middleware::ApplicationHeaders, base_handler
-          use Middleware::HandleException
+      def register_stoppable(stoppable)
+        return stoppable.stop if @stopping
+
+        @stoppables << stoppable
+      end
+
+      def stop
+        @stopping = true
+        stoppables = @stoppables
+        @stoppables = []
+
+        stoppables.each(&:stop)
+      end
 
-          if opts[:request_timeout]
-            use Rack::Timeout, service_timeout: opts[:request_timeout]
+      def prometheus_exporter_thread
+        Thread.new { run_prometheus_exporter }.tap do |thread|
+          thread.define_singleton_method(:stop) do
+            kill
+            join
           end
+        end
+      end
 
-          use Upfluence.error_logger.middleware
+      def production_builder(opts, &block)
+        has_admin = !opts[:admin_port].nil?
+        builder = Builder.new
 
-          use Rack::ContentLength
-          use Rack::Chunked
-          use Rack::Lint if Upfluence.env.development?
-          use Rack::TempfileReaper
-          use Rack::ETag
-          use Middleware::CORS if Upfluence.env.development?
+        mount_middlewares(builder, opts)
+
+        builder.instance_eval do
+          if opts[:enable_active_record_middleware] &&
+             defined?(ActiveRecord::Base) &&
+             ActiveRecord::Base.configurations.any?
+            require 'upfluence/http/middleware/active_record'
+
+            use Middleware::ActiveRecord
+          end
 
           (DEFAULT_MIDDLEWARES + opts[:middlewares]).each do |m|
             m = [m] unless m.is_a?(Array)
             use(*m)
           end
+        end
 
-          mount.call(self, opts) unless has_admin
-
-          map '/healthcheck' do
-            run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
-          end
+        mount_admin_endpoints(builder, opts) unless has_admin
+        builder.instance_eval(&block)
 
-          instance_eval(&block)
-        end
+        builder
       end
 
       def admin_builder(opts)
-        mount = method(:mount_admin_endpoints)
+        builder = Builder.new
 
-        Builder.new do
-          use Rack::ContentLength
-
-          map '/healthcheck' do
-            run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
-          end
+        mount_middlewares(builder, opts)
+        mount_admin_endpoints(builder, opts)
 
-          mount.call(self, opts)
-        end
+        builder
       end
 
       def mount_admin_endpoints(builder, opts)
@@ -183,6 +226,35 @@ module Upfluence
         end
       end
 
+      def mount_middlewares(builder, opts)
+        base_handler = @base_handler
+
+        builder.instance_eval do
+          use Middleware::RequestStapler, timeout: opts[:request_timeout]
+          use Middleware::Logger
+          use Middleware::Prometheus
+          use Middleware::ApplicationHeaders, base_handler
+          use Middleware::HandleException
+
+          use Rack::Timeout, service_timeout: opts[:request_timeout] if opts[:request_timeout]
+
+          use Upfluence.error_logger.middleware
+
+          use Rack::ContentLength
+          use Rack::Chunked
+          use Rack::Lint if Upfluence.env.development?
+          use Rack::TempfileReaper
+          use Rack::ETag
+          use Middleware::CORS if Upfluence.env.development?
+        end
+
+        builder.instance_eval do
+          map '/healthcheck' do
+            run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
+          end
+        end
+      end
+
       def run_prometheus_exporter
         push = Prometheus::Client::Push.new(
           @options[:app_name],

data/lib/upfluence/instrumentation/periodic_instrumenter.rb

@@ -30,7 +30,7 @@ module Upfluence
             rescue => e
               Upfluence.error_logger.notify(e)
             ensure
-              sleep @interval
+              sleep @interval unless @stop_thread
             end
           end
         end

data/lib/upfluence/instrumentation/puma_instrumenter.rb

@@ -6,6 +6,8 @@ module Upfluence
     class PumaInstrumenter < PeriodicInstrumenter
       KEYS = %i[backlog_thread running_thread busy_thread pool_capacity requests_count].freeze
 
+      attr_writer :server
+
       def prefix
         'puma'
       end
@@ -17,15 +19,17 @@ module Upfluence
       end
 
       def values
-        stats = Puma.stats_hash
+        return {} unless @server
+
+        stats = @server.stats
 
         {
-          requests_count: [{ value: stats[:requests_count] }],
-          backlog_thread: [{ value: stats[:backlog] }],
-          running_thread: [{ value: stats[:running] }],
-          busy_thread:    [{ value: stats[:busy_threads] }],
-          pool_capacity:  [{ value: stats[:max_threads] }]
-        }
+          requests_count: stats[:requests_count],
+          backlog_thread: stats[:backlog],
+          running_thread: stats[:running],
+          busy_thread:    stats[:busy_threads],
+          pool_capacity:  stats[:max_threads]
+        }.compact.transform_values { |value| [{ value: value }] }
       rescue NoMethodError
         {}
       end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.13.1'.freeze
+    VERSION = '0.14.1'.freeze
   end
 end

data/upfluence_utils.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sentry-ruby', '< 6.0'
   spec.add_runtime_dependency 'sinatra-contrib'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'puma'
-  spec.add_runtime_dependency 'rack'
+  spec.add_runtime_dependency 'puma', '>= 7.0'
+  spec.add_runtime_dependency 'rack', '< 3.0'
   spec.add_runtime_dependency 'stackprof'
   spec.add_runtime_dependency 'prometheus-client', '~> 2.1'
   spec.add_runtime_dependency 'userializer'
@@ -35,4 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'loofah'
   spec.add_runtime_dependency 'rack-timeout'
   spec.add_runtime_dependency 'mutex_m'
+  spec.add_runtime_dependency 'base64'
+  spec.add_runtime_dependency 'bigdecimal'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Upfluence
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-18 00:00:00.000000000 Z
+date: 2026-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,28 +141,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +261,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: bigdecimal
+  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'
 email:
 - dev@upfluence.com
 executables: []
@@ -270,11 +296,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - lib/test.rb
@@ -291,6 +319,7 @@ files:
 - lib/upfluence/http/endpoint/healthcheck.rb
 - lib/upfluence/http/endpoint/profiler.rb
 - lib/upfluence/http/endpoint/validation_error.rb
+- lib/upfluence/http/middleware/active_record.rb
 - lib/upfluence/http/middleware/application_headers.rb
 - lib/upfluence/http/middleware/cors.rb
 - lib/upfluence/http/middleware/handle_exception.rb
@@ -331,7 +360,6 @@ homepage: https://github.com/upfluence/upfluence_utils
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -346,8 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Upfluence common utils for Ruby projects
 test_files: []