logstash-integration-jdbc 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0434f8f19d3cb7df52955e6263c639acbf7edf1e8007f6eca2f0428c63d7794
-  data.tar.gz: 1a741166ce8d2e83a1d32d727448042fd2fd3b801635528b67c40ca79733f608
+  metadata.gz: 819be7f98076d1baa5ccf68299025f16441218c8a8fbde49818a4711ee153598
+  data.tar.gz: f746524e0a8e2ae44fbc4e817299165a174ffff09fadc987d6cfc21b62c43c08
 SHA512:
-  metadata.gz: 514915aa797a46b5ec6f167c69809773f110a848bfbd98a874f71fc6e145517c268768ecb1240bd82346ce9d26350f9e66ce1d3f1e39c07dc7b437410d061032
-  data.tar.gz: eb4a71bdc9b67344f53ccf7a2502c50108e0ea2a746fa204b4f52a314c487def7fe9ae5cc3679f7811a7842f2e270e97ef1c281619309637b1f7fda0ee506f9c
+  metadata.gz: 8bf0523bfd1e0a687d8f3ec0833ba80c9e98524fd1992dede58195ec8562e94f5fda0f9c1afbf14e840480fd8e0196f92b0c22191b072721007f0ffb03b3a8b3
+  data.tar.gz: ee270f7fc7c07ce78ba08272d3407652dc59668ac50a251652ac4cf71ef0dda17fdb42cad43325477db04efc5d6e4331e695c93bc554ab7041ac46dc0ae27b29

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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)
 

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/spec/inputs/jdbc_spec.rb

@@ -1907,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

@@ -1 +1 @@
-5.6.4
+5.6.5

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.6.5
 platform: ruby
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 2026-07-21 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api