stack-service-base 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c874451fe4493ce74c1978b28cb29c90ae97c1b888b110b086e19c6bb8cd89db
-  data.tar.gz: 13081cea051d66b4b6ecbf1eec9d4de2cc1029c22b3b7b00e5a921b4cc70c6ed
+  metadata.gz: cd3a6544546c69ce6ebd7eff7341a5c1de98b1507da11b9c8e295422192c2141
+  data.tar.gz: 2328aa5384c4f3fd04af5fc98c86abc39ecf263c95cc5b1b3566a6689cae5214
 SHA512:
-  metadata.gz: b61dd10a594676726546302b8e8b0a1eb77d34e8ab43cec4c01c101a4b71879d34d79cde940eaf0885ffff803c080817402bdf922343b66aaf93719f879e5d0c
-  data.tar.gz: 93e57502203a62601b70e63055bed25e12da10e33bb141d093af384522a24dfdc4c580098a1b3c330d2ff420cdd66951de5d792927a115748e1488401d30edae
+  metadata.gz: 3738ed3de0e7a67c9bcc96bac1032b3d9f3e3c795468073f6056a00cfa56f1b83d4eb07ef5a3f5cc35f80304c2cbf18c45ca42b3502ca6677a9f876e6765b479
+  data.tar.gz: 17d3f71a9195f62b5d40870ae38d278e6306d0a58c5f843b98547bc886ac1b5d2a30c5550bac8939b82164d1b410fd808f006484d128143dda51e97d6994f3a0

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/open_telemetry.rb

@@ -60,10 +60,13 @@ def otel_initialize
 
   OpenTelemetry::SDK.configure do |c|
     OpenTelemetry::Instrumentation::Rack
+    # OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware
+    # Rack::Builder
+    OpenTelemetry::Instrumentation::Sinatra
     c.use_all({
-      'OpenTelemetry::Instrumentation::Sinatra' => { install_rack: true },
+      'OpenTelemetry::Instrumentation::Sinatra' => { install_rack: false }, # instlled by stack-service-base.rb#24 (use *OpenTelemetry::Instrumentation::Rack::Instrumentation.instance.middleware_args)
       'OpenTelemetry::Instrumentation::Rack' => {
-        use_rack_events: false, # TODO: doesnt work with Websoker requests
+        use_rack_events: false, # TODO: doesnt work with Websoket requests
         # /home/user/.rbenv/versions/3.3.1/lib/ruby/gems/3.3.0/gems/opentelemetry-instrumentation-rack-0.26.0/lib/opentelemetry/instrumentation/rack/instrumentation.rb#43
         url_quantization: ->(path, env) { "HTTP #{env['REQUEST_METHOD']} #{path}" },
         untraced_requests: ->(env) { env['HTTP_UPGRADE'] == 'websocket' }

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

@@ -21,6 +21,7 @@ module StackServiceBase
 
         if OTEL_ENABLED
           otel_initialize
+          use *OpenTelemetry::Instrumentation::Rack::Instrumentation.instance.middleware_args
         end
 
         if defined? Sequel
@@ -47,6 +48,8 @@ module StackServiceBase
 
           Sequel.singleton_class.prepend(mod)
           # ---
+          #
+          require_relative 'stack-service-base/fiber_pool'
         end
       end
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module StackServiceBase
   class Base
-    VERSION = '0.0.12'
+    VERSION = '0.0.14'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-06-19 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