logstash-integration-jdbc 5.6.3 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afa5771b7e338b50c59cd6f2bd3d28fa23a5ac2df2804fedbde7f372d52c54f
-  data.tar.gz: a50c4f2c24c347363f4398ef0fe8584c6db86fcf6ff9f1bafccdf82ef1989226
+  metadata.gz: 819be7f98076d1baa5ccf68299025f16441218c8a8fbde49818a4711ee153598
+  data.tar.gz: f746524e0a8e2ae44fbc4e817299165a174ffff09fadc987d6cfc21b62c43c08
 SHA512:
-  metadata.gz: 76770166eb5ea2b20758e75d223998bc45d29b0fcc2e78864af6ca936db98c40075be88bbb9292c9473663d734c6be700e9ef5500dc7c5beaa03dcf078ec4a5a
-  data.tar.gz: 3a91177b9028fa7e956c8b4b100bfc20ecd18ea5451e7c625f3d31cce6ae952fdb9c2eb724dbb767fa606dc88c93fec87a55ef4dff37eff0b2b394ab4c7ff232
+  metadata.gz: 8bf0523bfd1e0a687d8f3ec0833ba80c9e98524fd1992dede58195ec8562e94f5fda0f9c1afbf14e840480fd8e0196f92b0c22191b072721007f0ffb03b3a8b3
+  data.tar.gz: ee270f7fc7c07ce78ba08272d3407652dc59668ac50a251652ac4cf71ef0dda17fdb42cad43325477db04efc5d6e4331e695c93bc554ab7041ac46dc0ae27b29

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.6.5
+  - Prevent concurrent Sequel JDBC subadapter initialization races by preloading adapter at driver load time [#203](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/203)
+
+## 5.6.4
+  - Fix connection leak on statement retry by opening JDBC connection once outside retry loop [#201](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/201)
+
 ## 5.6.3
   - Fix: replace deprecated `File.exists?` with `File.exist?` for Ruby 3.4 (JRuby 10) compatibility [#192](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/192)
 

data/README.md

@@ -2,7 +2,7 @@
 Logstash Integration Plugin for JDBC, including Logstash Input and Filter Plugins
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-integration-jdbc.svg)](https://travis-ci.com/logstash-plugins/logstash-integration-jdbc)
+[![Unit Tests](https://github.com/logstash-plugins/logstash-integration-jdbc/actions/workflows/unit-tests.yml/badge.svg?branch=main)](https://github.com/logstash-plugins/logstash-integration-jdbc/actions/workflows/unit-tests.yml)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/lib/logstash/plugin_mixins/jdbc/common.rb

@@ -32,6 +32,7 @@ module LogStash module PluginMixins module Jdbc
       # concurrency related problems with multiple pipelines and multiple drivers
       DRIVERS_LOADING_LOCK.lock()
       begin
+        preload_sequel_jdbc_subadapter
         load_driver_jars
         begin
           @driver_impl = load_jdbc_driver_class
@@ -50,6 +51,24 @@ module LogStash module PluginMixins module Jdbc
       end
     end
 
+    def preload_sequel_jdbc_subadapter
+      subadapter = jdbc_subadapter_scheme
+      return unless subadapter
+
+      # Ensure first-time Sequel jdbc/<subadapter> loading happens serially.
+      Sequel::Database.load_adapter(subadapter, :map => Sequel::JDBC::DATABASE_SETUP, :subdir => 'jdbc')
+    rescue Sequel::AdapterNotFound
+      # Some JDBC URLs can work without a dedicated Sequel sub-adapter.
+      @logger.debug("Skipping Sequel JDBC sub-adapter preload", :subadapter => subadapter, :jdbc_connection_string => @jdbc_connection_string)
+      nil
+    end
+
+    def jdbc_subadapter_scheme
+      return nil unless @jdbc_connection_string
+
+      @jdbc_connection_string[/\Ajdbc:([^:]+):/, 1]&.downcase&.to_sym
+    end
+
     def load_driver_jars
       if jdbc_driver_library_set?
         @jdbc_driver_library.split(",").each do |driver_jar|

data/lib/logstash/plugin_mixins/jdbc/jdbc.rb

@@ -160,6 +160,13 @@ module LogStash  module PluginMixins module Jdbc
       logger.error('', e) # prints nested causes
     end
 
+    def log_jdbc_query_exception(e)
+      details = { exception: e.class, message: e.message }
+      details[:cause] = e.cause.inspect if e.cause
+      details[:backtrace] = e.backtrace if @logger.debug?
+      @logger.warn("Exception when executing JDBC query", details)
+    end
+
     def open_jdbc_connection
       @connection_lock.synchronize do
         # at this point driver is already loaded
@@ -222,30 +229,31 @@ module LogStash  module PluginMixins module Jdbc
 
       @connection_lock.synchronize do
         begin
-          retry_attempts -= 1
           open_jdbc_connection
-          sql_last_value = @use_column_value ? @value_tracker.value : Time.now.utc
-          @tracking_column_warning_sent = false
-          @statement_handler.perform_query(@database, @value_tracker.value) do |row|
-            sql_last_value = get_column_value(row) if @use_column_value
-            yield extract_values_from(row)
-          end
-          success = true
-        rescue Sequel::Error, Java::JavaSql::SQLException => e
-          details = { exception: e.class, message: e.message }
-          details[:cause] = e.cause.inspect if e.cause
-          details[:backtrace] = e.backtrace if @logger.debug?
-          @logger.warn("Exception when executing JDBC query", details)
-
-          if retry_attempts == 0
-            @logger.error("Unable to execute statement. Tried #{@statement_retry_attempts} times.")
+          begin
+            retry_attempts -= 1
+            sql_last_value = @use_column_value ? @value_tracker.value : Time.now.utc
+            @tracking_column_warning_sent = false
+            @statement_handler.perform_query(@database, @value_tracker.value) do |row|
+              sql_last_value = get_column_value(row) if @use_column_value
+              yield extract_values_from(row)
+            end
+            success = true
+          rescue Sequel::Error, Java::JavaSql::SQLException => e
+            log_jdbc_query_exception(e)
+
+            if retry_attempts == 0
+              @logger.error("Unable to execute statement. Tried #{@statement_retry_attempts} times.")
+            else
+              @logger.error("Unable to execute statement. Trying again.")
+              sleep(@statement_retry_attempts_wait_time)
+              retry
+            end
           else
-            @logger.error("Unable to execute statement. Trying again.")
-            sleep(@statement_retry_attempts_wait_time)
-            retry
+            @value_tracker.set_value(sql_last_value)
           end
-        else
-          @value_tracker.set_value(sql_last_value)
+        rescue Sequel::Error, Java::JavaSql::SQLException => e
+          log_jdbc_query_exception(e)
         ensure
           close_jdbc_connection
         end

data/logstash-integration-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-integration-jdbc'
-  s.version         = '5.6.3'
+  s.version         = ::File.read('version').split("\n").first
   s.licenses = ['Apache License (2.0)']
   s.summary         = "Integration with JDBC - input and filter plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths   = ["lib", "vendor/jar-dependencies"]
 
   # Files
-  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
+  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "version", "docs/**/*"]
 
    # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

data/spec/inputs/jdbc_spec.rb

@@ -1310,7 +1310,8 @@ describe LogStash::Inputs::Jdbc do
       plugin.register
       plugin.run(queue)
       db = plugin.instance_variable_get(:@database)
-      expect(db.pool).to be_a_kind_of(::Sequel::ThreadedConnectionPool) # pries into internal details
+      # Sequel defaults to TimedQueueConnectionPool on Ruby 3.2+ (JRuby 10+), ThreadedConnectionPool on older versions under the Sequel::ConnectionPool superclass
+      expect(db.pool).to be_a_kind_of(::Sequel::ConnectionPool)
       expect(db.pool.instance_variable_get(:@timeout)).to eq(0)
       expect(db.pool.instance_variable_get(:@max_size)).to eq(1)
 
@@ -1447,6 +1448,58 @@ describe LogStash::Inputs::Jdbc do
       plugin.run(queue)
       plugin.stop
     end
+
+    it "opens the connection only once across statement retries" do
+      mixin_settings['statement_retry_attempts'] = 3
+      mixin_settings['statement_retry_attempts_wait_time'] = 0
+      queue = Queue.new
+      plugin.register
+
+      handler = plugin.instance_variable_get(:@statement_handler)
+      allow(handler).to receive(:perform_query).and_raise(Sequel::PoolTimeout)
+      allow(plugin.logger).to receive(:warn)
+      allow(plugin.logger).to receive(:error)
+
+      expect(plugin).to receive(:open_jdbc_connection).once.and_call_original
+
+      plugin.run(queue)
+      plugin.stop
+    end
+
+    it "closes the connection after statement retries are exhausted" do
+      mixin_settings['statement_retry_attempts'] = 2
+      mixin_settings['statement_retry_attempts_wait_time'] = 0
+      queue = Queue.new
+      plugin.register
+
+      handler = plugin.instance_variable_get(:@statement_handler)
+      allow(handler).to receive(:perform_query).and_raise(Sequel::PoolTimeout)
+      allow(plugin.logger).to receive(:warn)
+      allow(plugin.logger).to receive(:error)
+
+      expect(plugin).to receive(:close_jdbc_connection).at_least(:once).and_call_original
+
+      plugin.run(queue)
+      plugin.stop
+    end
+
+    it "closes the connection when open_jdbc_connection fails after database is assigned" do
+      queue = Queue.new
+      plugin.register
+
+      allow(plugin).to receive(:open_jdbc_connection).and_wrap_original do |m, *args|
+        # simulate partial initialization: jdbc_connect succeeds but test_connection fails
+        plugin.instance_variable_set(:@database, db)
+        raise Sequel::DatabaseConnectionError, "test_connection failed"
+      end
+      allow(plugin.logger).to receive(:warn)
+      allow(plugin.logger).to receive(:error)
+
+      expect(plugin).to receive(:close_jdbc_connection).at_least(:once).and_call_original
+
+      plugin.run(queue)
+      plugin.stop
+    end
   end
 
   context "when encoding of some columns need to be changed" do
@@ -1854,4 +1907,54 @@ describe LogStash::Inputs::Jdbc do
       end
     end
   end
+
+  describe "jdbc adapter preloading", :no_connection do
+    before do
+      allow(plugin).to receive(:load_jdbc_driver_class).and_return(double("driver_class"))
+    end
+
+    it "extracts jdbc sub-adapter scheme in lowercase" do
+      plugin.instance_variable_set(:@jdbc_connection_string, "jdbc:Oracle:thin:@//localhost:1521/FREEPDB1")
+
+      expect(plugin.send(:jdbc_subadapter_scheme)).to eq(:oracle)
+    end
+
+    it "preloads sequel jdbc sub-adapter for jdbc URLs" do
+      expect(Sequel::Database).to receive(:load_adapter).with(:derby, :map => Sequel::JDBC::DATABASE_SETUP, :subdir => 'jdbc').and_call_original
+
+      plugin.send(:load_driver)
+    end
+
+    it "uses normalized jdbc sub-adapter scheme while preloading" do
+      plugin.instance_variable_set(:@jdbc_connection_string, "jdbc:Oracle:thin:@//localhost:1521/FREEPDB1")
+
+      expect(Sequel::Database).to receive(:load_adapter).with(:oracle, :map => Sequel::JDBC::DATABASE_SETUP, :subdir => 'jdbc').and_return(nil)
+
+      expect { plugin.send(:load_driver) }.not_to raise_error
+    end
+
+    it "does not try to preload when URL is not jdbc" do
+      plugin.instance_variable_set(:@jdbc_connection_string, "mock://localhost:1527/db")
+
+      expect(Sequel::Database).not_to receive(:load_adapter)
+
+      plugin.send(:load_driver)
+    end
+
+    it "ignores unknown jdbc sub-adapters" do
+      plugin.instance_variable_set(:@jdbc_connection_string, "jdbc:unknown://localhost:1527/db")
+
+      expect(Sequel::Database).to receive(:load_adapter).with(:unknown, :map => Sequel::JDBC::DATABASE_SETUP, :subdir => 'jdbc').and_raise(Sequel::AdapterNotFound)
+
+      expect { plugin.send(:load_driver) }.not_to raise_error
+    end
+
+    it "treats nil-returning jdbc sub-adapter load as a no-op" do
+      plugin.instance_variable_set(:@jdbc_connection_string, "jdbc:unknown://localhost:1527/db")
+
+      expect(Sequel::Database).to receive(:load_adapter).with(:unknown, :map => Sequel::JDBC::DATABASE_SETUP, :subdir => 'jdbc').and_return(nil)
+
+      expect { plugin.send(:load_driver) }.not_to raise_error
+    end
+  end
 end

data/version

@@ -0,0 +1 @@
+5.6.5

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.6.5
 platform: ruby
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -286,6 +286,7 @@ files:
 - vendor/jar-dependencies/org/apache/derby/derbyclient/10.15.2.1/derbyclient-10.15.2.1.jar
 - vendor/jar-dependencies/org/apache/derby/derbyshared/10.15.2.1/derbyshared-10.15.2.1.jar
 - vendor/jar-dependencies/org/apache/derby/derbytools/10.15.2.1/derbytools-10.15.2.1.jar
+- version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)