stack-service-base 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5511026a19ca068d501ca1cf33053d66cc3f22925adb51a232f981948aa22f01
-  data.tar.gz: aa6640e692ef366445b02151eeedd9235ba6d0dc5397a1d30eb419910b203626
+  metadata.gz: 4514d564ff933c16486b2b001e7ad75ecfe4ebe4c01294d33007c4da3d25dd33
+  data.tar.gz: af9e0e826a5731107674214815f239ebb2b9eead5e8c4c26921eb37c2be80c14
 SHA512:
-  metadata.gz: 07eedfbefd18e243a62af1482d960638f4f2b8fe607af7de588f3a67e6b491b4244727163faeb34f8bda69585d8012d4e33e8f1e4116cd4f26b14454faf14002
-  data.tar.gz: 43c0f4db64e33650a66ab08cd5b24b5763df191a4941914d541c1c7a55c713b2d287f28b4d53dca1cc221e8f6f2654c9de6c6fa8fbff13c07666972505d8dcb2
+  metadata.gz: 890c9c92274c9cb9d4905243655627bc9cc7ea089072fe6b15faae6ca4fe81c6475ed3a682eb9945b2c6a70a3e4a69ccbe608598e568120c16fe9192c109d1f8
+  data.tar.gz: bd3c39a6041eddb570018bcdf74bf60a3950bb9321a6a3d401f1f6dc3366c21d958359d34ea04a479f9d314e99746c0489df3cb02f61d212fb1f4cebe6771283

data/lib/stack-service-base/fiber_pool.rb

@@ -0,0 +1,99 @@
+require 'sequel'
+require 'async/semaphore'
+# $stdout.sync = true
+
+class FiberConnectionPool < Sequel::ConnectionPool
+  VALIDATION_TIMEOUT = 20
+  POOL_SIZE = 10
+
+  def log(msg)
+    return if defined? PERFORMANCE
+    $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{msg}"
+    # LOGGER.debug :fiber_pool, msg
+  end
+
+  def initialize(db, opts = OPTS)
+    super
+    @allocator = ->() {
+      make_new(:default).tap { |conn|
+        log "new connection (fiber pool) #{conn}"
+      }
+    }
+    @stock = []
+    @acquired = {}
+    @sp = Async::Semaphore.new opts[:max_connections] || POOL_SIZE
+  end
+
+  def is_valid_connection?(conn)
+    sql = valid_connection_sql
+    log_connection_execute(conn, sql)
+    true
+  rescue =>e_
+    conn.close rescue
+    false
+  end
+
+  def hold(_server = nil)
+    return yield @acquired[Fiber.current] if @acquired[Fiber.current] # protect from recursion
+    log "hold in (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"
+    fiber = Fiber.current
+    try_count = 2
+
+    @sp.acquire do
+      until @acquired[fiber] &&
+        ( @acquired[fiber].instance_eval { @last_use_.nil? || (Time.now - @last_use_).to_i < VALIDATION_TIMEOUT } ||
+          is_valid_connection?(@acquired[fiber]) )
+
+        @acquired[fiber] = @stock.shift || @allocator.call
+      end
+
+      @acquired[fiber].instance_eval { @last_use_ = Time.now }
+      yield @acquired[fiber]
+
+    rescue Sequel::DatabaseDisconnectError => e
+      log "remove connection (fiber pool) retry(#{try_count})"
+      @acquired.delete(fiber)
+      (try_count -=1) < 0 ? raise : retry
+
+    rescue =>e
+      $stdout.puts e.message
+      $stdout.puts e.backtrace[0..10].join "\n"
+      log 'remove connection (fiber pool) give up'
+      @acquired.delete(fiber)
+      raise
+    ensure
+      @stock.push @acquired.delete(fiber) if @acquired[fiber]
+      log "hold out (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"
+    end
+  end
+
+  def size = @acquired.size
+  def max_size = @sp.limit
+  # def preconnect(_concurrent = false) = :unimplemented
+  def disconnect(symbol)
+     until @stock.empty?
+       log 'disconnect connection (fiber pool)'
+       @stock.shift.close
+     end
+  end
+  # def servers = []
+  def pool_type = :fiber # :threaded
+  def sync = yield
+end
+
+# Override Sequel::Database to use FiberConnectionPool by default.
+Sequel::Database.prepend(Module.new do
+  def connection_pool_default_options = { pool_class: FiberConnectionPool }
+end)
+
+require 'sequel/adapters/postgres'
+
+class Sequel::Postgres::Adapter
+  def execute_query(sql, args)
+    $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{sql[0..60]}" unless defined? PERFORMANCE
+    @db.log_connection_yield(sql, self, args){args ? async_exec_params(sql, args) : async_exec(sql)}
+  rescue => e
+    $stdout.puts e.message
+    raise
+  end
+end

data/lib/stack-service-base/logging.rb

@@ -1,7 +1,7 @@
 require 'console'
 require 'fiber'
 
-QUIET = ENV.fetch('CONSOLE_LEVEL', 'false') == 'true'
+QUIET = ENV.fetch('QUIET', 'false') == 'true'
 PERFORMANCE = ENV.fetch('PERFORMANCE', 'false') == 'true'
 
 ENV['CONSOLE_LEVEL'] ||= 'all' unless QUIET || PERFORMANCE

data/lib/stack-service-base/open_telemetry.rb

@@ -135,6 +135,11 @@ def otl_current_span
   yield OpenTelemetry::Trace.current_span
 end
 
+# OpenTelemetry::Trace.current_span.tap do |span|
+#   span.record_exception(e)
+#   span.status = OpenTelemetry::Trace::Status.error("Unhandled exception of type: #{e.class}")
+# end
+
 def otl_traceparent_id
     return nil unless OTEL_ENABLED
 

data/lib/stack-service-base/rack_helpers.rb

@@ -46,6 +46,16 @@ module RackHelpers
 
   #
 
+  Rack.define_middleware :OTELTraceFullRequest do |env, app, opts|
+    request_headers = env.select { |k, _| k.start_with? 'HTTP_' }
+    request_body = env['rack.input'].read
+
+    response_code, response_headers, response_body = app.call(env)
+    response_body = response_body.read if response_body.respond_to? :read
+    otl_span( :Request, {request_headers: , request_body:, response_code:, response_headers: , response_body: }) {}
+    [response_code, response_headers, response_body]
+  end
+
   Rack.define_middleware :OTELTraceInfo do |env, app, opts|
     status, headers, body = app.call env
     if status.to_i >= 500

data/lib/stack-service-base.rb

@@ -23,6 +23,33 @@ module StackServiceBase
           otel_initialize
         end
 
+        if defined? Sequel
+          Sequel::Database.after_initialize { _1.loggers << LOGGER }
+
+          attempts= 10
+          sleep_interval= 1
+
+          mod = Module.new do
+            define_method(:connect) do |*args, **opts, &blk|
+              tries = attempts
+              begin
+                super(*args, **opts, &blk)
+              rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
+                if (tries -= 1) > 0
+                  LOGGER.warn "DB connect failed (#{e.message}), retrying in #{sleep_interval}s… (#{tries} left)"
+                  sleep sleep_interval
+                  retry
+                end
+                raise
+              end
+            end
+          end
+
+          Sequel.singleton_class.prepend(mod)
+          # ---
+          #
+          require_relative 'stack-service-base/fiber_pool'
+        end
       end
     end
   end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module StackServiceBase
   class Base
-    VERSION = '0.0.11'
+    VERSION = '0.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -171,6 +171,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/stack-service-base.rb
+- lib/stack-service-base/fiber_pool.rb
 - lib/stack-service-base/logging.rb
 - lib/stack-service-base/open_telemetry.rb
 - lib/stack-service-base/prometheus.rb