logstash-integration-jdbc 5.2.2 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f43be09f1996c0e4effd6914055fa643549925433ab4512f4e3a0ed1fa1933c
-  data.tar.gz: 346cb42a27eaaa3f51e7cf1ba3d52fb332f278dfe8cecf7d1aa200af42ba4f5b
+  metadata.gz: b74796568bc1df12ae5015cfcf38aeb43971b3bd3eda2dcc668104decc69b6a2
+  data.tar.gz: ae3a1f82f7354798692933a2426977ea2e17f7335a74d02eb09a376e4421af6b
 SHA512:
-  metadata.gz: 3a75a4a4165e04178384a66740de3bce2981c2d019a8bd2192519a725bfe88d5ddf7469cf2a2aebda12b1b48b2117817171da2f459d283c3e3e16d86422c4c06
-  data.tar.gz: ae15ead4d5efd52cc67bf58ad1d994bde11443bbc0e083d56f695ddc7163be44454ee1db1a95b81ec884c51a790f2e7582733df4f5faf6b9d4715a0685a31c92
+  metadata.gz: d198c08e74dc4702dae5de1ca4661d68d10298ff497e44739e7cc775d575bfc9fe825154a9de6f2497e60fb3c694f06d36d8971ecf9935e13592c959d6c13c53
+  data.tar.gz: ccd725393201ec5282644f003880fa0449a027942442698fe6e1758f25335ff585efb73d0f52716c9698eb19990ef67a15b21fef90255473b39683339520796a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.2.5
+  - Fix: do not execute more queries with debug logging [#109](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/109)
+
+## 5.2.4
+  - Fix: compatibility with all (>= 3.0) rufus-scheduler versions [#97](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/97) 
+
+## 5.2.3
+  - Performance: avoid contention on scheduler execution [#103](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/103)
+
 ## 5.2.2
   - Feat: name scheduler threads + redirect error logging [#102](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/102)
 

data/Gemfile

@@ -9,3 +9,5 @@ if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end
+
+gem 'rufus-scheduler', ENV['RUFUS_SCHEDULER_VERSION'] if ENV['RUFUS_SCHEDULER_VERSION']

data/lib/logstash/filters/jdbc/loader_schedule.rb

@@ -4,60 +4,26 @@ require "rufus/scheduler"
 
 module LogStash module Filters module Jdbc
   class LoaderSchedule < Validatable
-    attr_reader :schedule_frequency, :loader_schedule
-
-    def to_log_string
-      message = ""
-      message.concat "these months in the year [#{@cronline.months.to_a.join(", ")}];" unless @cronline.months.nil?
-      message.concat "these days in the month [#{@cronline.days.to_a.join(", ")}];" unless @cronline.days.nil?
-      message.concat "these hours in the day [#{@cronline.hours.to_a.join(", ")}];" unless @cronline.hours.nil?
-      message.concat "these minutes in the hour [#{@cronline.minutes.to_a.join(", ")}];" unless @cronline.minutes.nil?
-      message.concat "these seconds in the minute [#{@cronline.seconds.to_a.join(", ")}]" unless @cronline.seconds.nil?
-      if !message.empty?
-        message.prepend "Scheduled for: "
-      end
-      message
-    end
+    attr_reader :loader_schedule
 
     private
 
-    def post_initialize
-      if valid?
-        # From the Rufus::Scheduler docs:
-        #   By default, rufus-scheduler sleeps 0.300 second between every step.
-        #   At each step it checks for jobs to trigger and so on.
-        # set the frequency to 2.5 seconds if we are not reloading in the seconds timeframe
-        # rufus scheduler thread should respond to stop quickly enough.
-        if only_seconds_set?
-          @schedule_frequency = 0.3
-        else
-          @schedule_frequency = 2.5
-        end
-      end
-    end
-
-
-    def only_seconds_set?
-      @cronline.seconds &&
-        @cronline.minutes.nil? &&
-        @cronline.hours.nil? &&
-        @cronline.days.nil? &&
-        @cronline.months.nil?
-    end
-
+    # @overload
     def parse_options
       @loader_schedule = @options
 
-      unless @loader_schedule.is_a?(String)
+      if @loader_schedule.is_a?(String)
+        begin
+          # Rufus::Scheduler 3.0 - 3.6 methods signature: parse_cron(o, opts)
+          # since Rufus::Scheduler 3.7 methods signature: parse_cron(o, opts={})
+          @cronline = Rufus::Scheduler.parse_cron(@loader_schedule, {})
+        rescue => e
+          @option_errors << "The loader_schedule option is invalid: #{e.message}"
+        end
+      else
         @option_errors << "The loader_schedule option must be a string"
       end
 
-      begin
-        @cronline = Rufus::Scheduler::CronLine.new(@loader_schedule)
-      rescue => e
-        @option_errors << "The loader_schedule option is invalid: #{e.message}"
-      end
-
       @valid = @option_errors.empty?
     end
   end

data/lib/logstash/filters/jdbc/repeating_load_runner.rb

@@ -3,8 +3,6 @@ require_relative "single_load_runner"
 
 module LogStash module Filters module Jdbc
   class RepeatingLoadRunner < SingleLoadRunner
-   # info - attr_reader :local, :loaders, :preloaders
-
     def repeated_load
       local.repopulate_all(loaders)
       @reload_counter.increment

data/lib/logstash/filters/jdbc/single_load_runner.rb

@@ -26,10 +26,6 @@ module LogStash module Filters module Jdbc
     def repeated_load
     end
 
-    def call
-      repeated_load
-    end
-
     def reload_count
       @reload_counter.value
     end

data/lib/logstash/filters/jdbc_static.rb

@@ -3,6 +3,7 @@ require "logstash-integration-jdbc_jars"
 require "logstash/filters/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/ecs_compatibility_support"
+require "logstash/plugin_mixins/jdbc/scheduler"
 require_relative "jdbc/loader"
 require_relative "jdbc/loader_schedule"
 require_relative "jdbc/repeating_load_runner"
@@ -191,17 +192,15 @@ module LogStash module Filters class JdbcStatic < LogStash::Filters::Base
     @processor = Jdbc::LookupProcessor.new(@local_lookups, global_lookup_options)
     runner_args.unshift(@processor.local)
     if @loader_schedule
-      args = []
       @loader_runner = Jdbc::RepeatingLoadRunner.new(*runner_args)
       @loader_runner.initial_load
-      cronline = Jdbc::LoaderSchedule.new(@loader_schedule)
-      cronline.to_log_string.tap do |msg|
-        logger.info("Scheduler operations: #{msg}") unless msg.empty?
+      @scheduler = LogStash::PluginMixins::Jdbc::Scheduler.
+          start_cron_scheduler(@loader_schedule, thread_name: "[#{id}]-jdbc_static__scheduler") { @loader_runner.repeated_load }
+      cron_job = @scheduler.cron_jobs.first
+      if cron_job
+        frequency = cron_job.respond_to?(:rough_frequency) ? cron_job.rough_frequency : cron_job.frequency
+        logger.info("Loaders will execute every #{frequency} seconds", loader_schedule: @loader_schedule)
       end
-      logger.info("Scheduler scan for work frequency is: #{cronline.schedule_frequency}")
-      rufus_args = {:max_work_threads => 1, :frequency => cronline.schedule_frequency}
-      @scheduler = Rufus::Scheduler.new(rufus_args)
-      @scheduler.cron(cronline.loader_schedule, @loader_runner)
     else
       @loader_runner = Jdbc::SingleLoadRunner.new(*runner_args)
       @loader_runner.initial_load

data/lib/logstash/inputs/jdbc.rb

@@ -259,8 +259,8 @@ module LogStash module Inputs class Jdbc < LogStash::Inputs::Base
       end
     end
 
-    set_value_tracker(LogStash::PluginMixins::Jdbc::ValueTracking.build_last_value_tracker(self))
-    set_statement_logger(LogStash::PluginMixins::Jdbc::CheckedCountLogger.new(@logger))
+    set_value_tracker LogStash::PluginMixins::Jdbc::ValueTracking.build_last_value_tracker(self)
+    set_statement_handler LogStash::PluginMixins::Jdbc::StatementHandler.build_statement_handler(self)
 
     @enable_encoding = !@charset.nil? || !@columns_charset.empty?
 
@@ -283,8 +283,8 @@ module LogStash module Inputs class Jdbc < LogStash::Inputs::Base
   end # def register
 
   # test injection points
-  def set_statement_logger(instance)
-    @statement_handler = LogStash::PluginMixins::Jdbc::StatementHandler.build_statement_handler(self, instance)
+  def set_statement_handler(handler)
+    @statement_handler = handler
   end
 
   def set_value_tracker(instance)
@@ -295,13 +295,8 @@ module LogStash module Inputs class Jdbc < LogStash::Inputs::Base
     load_driver
     if @schedule
       # input thread (Java) name example "[my-oracle]<jdbc"
-      @scheduler = LogStash::PluginMixins::Jdbc::Scheduler.new(
-          :max_work_threads => 1, :thread_name => "[#{id}]<jdbc__scheduler"
-      )
-      @scheduler.schedule_cron @schedule do
-        execute_query(queue)
-      end
-
+      @scheduler = LogStash::PluginMixins::Jdbc::Scheduler.
+          start_cron_scheduler(@schedule, thread_name: "[#{id}]<jdbc__scheduler") { execute_query(queue) }
       @scheduler.join
     else
       execute_query(queue)

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

@@ -4,7 +4,6 @@ require "logstash/config/mixin"
 require "time"
 require "date"
 require_relative "value_tracking"
-require_relative "checked_count_logger"
 require_relative "statement_handler"
 
 java_import java.util.concurrent.locks.ReentrantLock

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

@@ -12,6 +12,70 @@ module LogStash module PluginMixins module Jdbc
     TimeImpl = defined?(Rufus::Scheduler::EoTime) ? Rufus::Scheduler::EoTime :
                    (defined?(Rufus::Scheduler::ZoTime) ? Rufus::Scheduler::ZoTime : ::Time)
 
+    # @param cron [String] cron-line
+    # @param opts [Hash] scheduler options
+    # @return scheduler instance
+    def self.start_cron_scheduler(cron, opts = {}, &block)
+      unless block_given?
+        raise ArgumentError, 'missing (cron scheduler) block - worker task to execute'
+      end
+      scheduler = new_scheduler(opts)
+      scheduler.schedule_cron(cron, &block)
+      scheduler
+    end
+
+    # @param opts [Hash] scheduler options
+    # @return scheduler instance
+    def self.new_scheduler(opts)
+      unless opts.key?(:thread_name)
+        raise ArgumentError, 'thread_name: option is required to be able to distinguish multiple scheduler threads'
+      end
+      opts[:max_work_threads] ||= 1
+      # amount the scheduler thread sleeps between checking whether jobs
+      # should trigger, default is 0.3 which is a bit too often ...
+      # in theory the cron expression '* * * * * *' supports running jobs
+      # every second but this is very rare, we could potentially go higher
+      opts[:frequency] ||= 1.0
+
+      new(opts)
+    end
+
+    # @overload
+    def timeout_jobs
+      # Rufus relies on `Thread.list` which is a blocking operation and with many schedulers
+      # (and threads) within LS will have a negative impact on performance as scheduler
+      # threads will end up waiting to obtain the `Thread.list` lock.
+      #
+      # However, this isn't necessary we can easily detect whether there are any jobs
+      # that might need to timeout: only when `@opts[:timeout]` is set causes worker thread(s)
+      # to have a `Thread.current[:rufus_scheduler_timeout]` that is not nil
+      return unless @opts[:timeout]
+      super
+    end
+
+    # @overload
+    def work_threads(query = :all)
+      if query == :__all_no_cache__ # special case from JobDecorator#start_work_thread
+        @_work_threads = nil # when a new worker thread is being added reset
+        return super(:all)
+      end
+
+      # Gets executed every time a job is triggered, we're going to cache the
+      # worker threads for this scheduler (to avoid `Thread.list`) - they only
+      # change when a new thread is being started from #start_work_thread ...
+      work_threads = @_work_threads
+      if work_threads.nil?
+        work_threads = threads.select { |t| t[:rufus_scheduler_work_thread] }
+        @_work_threads = work_threads
+      end
+
+      case query
+      when :active then work_threads.select { |t| t[:rufus_scheduler_job] }
+      when :vacant then work_threads.reject { |t| t[:rufus_scheduler_job] }
+      else work_threads
+      end
+    end
+
     # @overload
     def on_error(job, err)
       details = { exception: err.class, message: err.message, backtrace: err.backtrace }
@@ -76,10 +140,10 @@ module LogStash module PluginMixins module Jdbc
 
         ret = super() # does not return Thread instance in 3.0
 
-        work_threads = @scheduler.work_threads
+        work_threads = @scheduler.work_threads(:__all_no_cache__)
         while prev_thread_count == work_threads.size # very unlikely
           Thread.pass
-          work_threads = @scheduler.work_threads
+          work_threads = @scheduler.work_threads(:__all_no_cache__)
         end
 
         work_thread_name_prefix = @scheduler.work_thread_name_prefix

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

@@ -2,7 +2,7 @@
 
 module LogStash module PluginMixins module Jdbc
   class StatementHandler
-    def self.build_statement_handler(plugin, logger)
+    def self.build_statement_handler(plugin)
       if plugin.use_prepared_statements
         klass = PreparedStatementHandler
       else
@@ -16,27 +16,39 @@ module LogStash module PluginMixins module Jdbc
           klass = NormalStatementHandler
         end
       end
-      klass.new(plugin, logger)
+      klass.new(plugin)
     end
 
-    attr_reader :statement, :parameters, :statement_logger
+    attr_reader :statement, :parameters
 
-    def initialize(plugin, statement_logger)
+    def initialize(plugin)
       @statement = plugin.statement
-      @statement_logger = statement_logger
-      post_init(plugin)
     end
 
     def build_query(db, sql_last_value)
-      # override in subclass
+      fail NotImplementedError # override in subclass
     end
 
-    def post_init(plugin)
-      # override in subclass, if needed
-    end
   end
 
   class NormalStatementHandler < StatementHandler
+
+    attr_reader :parameters
+
+    def initialize(plugin)
+      super(plugin)
+      @parameter_keys = ["sql_last_value"] + plugin.parameters.keys
+      @parameters = plugin.parameters.inject({}) do |hash,(k,v)|
+        case v
+        when LogStash::Timestamp
+          hash[k.to_sym] = v.time
+        else
+          hash[k.to_sym] = v
+        end
+        hash
+      end
+    end
+
     # Performs the query, yielding once per row of data
     # @param db [Sequel::Database]
     # @param sql_last_value [Integer|DateTime|Time]
@@ -52,27 +64,18 @@ module LogStash module PluginMixins module Jdbc
 
     def build_query(db, sql_last_value)
       parameters[:sql_last_value] = sql_last_value
-      query = db[statement, parameters]
-      statement_logger.log_statement_parameters(statement, parameters, query)
-      query
+      db[statement, parameters]
     end
 
-    def post_init(plugin)
-      @parameter_keys = ["sql_last_value"] + plugin.parameters.keys
-      @parameters = plugin.parameters.inject({}) do |hash,(k,v)|
-        case v
-        when LogStash::Timestamp
-          hash[k.to_sym] = v.time
-        else
-          hash[k.to_sym] = v
-        end
-        hash
-      end
-    end
   end
 
   class PagedNormalStatementHandler < NormalStatementHandler
-    attr_reader :jdbc_page_size
+
+    def initialize(plugin)
+      super(plugin)
+      @jdbc_page_size = plugin.jdbc_page_size
+      @logger = plugin.logger
+    end
 
     # Performs the query, respecting our pagination settings, yielding once per row of data
     # @param db [Sequel::Database]
@@ -81,16 +84,22 @@ module LogStash module PluginMixins module Jdbc
     def perform_query(db, sql_last_value)
       query = build_query(db, sql_last_value)
       query.each_page(@jdbc_page_size) do |paged_dataset|
+        log_dataset_page(paged_dataset) if @logger.debug?
         paged_dataset.each do |row|
           yield row
         end
       end
     end
 
-    def post_init(plugin)
-      super(plugin)
-      @jdbc_page_size = plugin.jdbc_page_size
+    private
+
+    # @param paged_dataset [Sequel::Dataset::Pagination] like object
+    def log_dataset_page(paged_dataset)
+      @logger.debug "fetching paged dataset", current_page: paged_dataset.current_page,
+                                              record_count: paged_dataset.current_page_record_count,
+                                              total_record_count: paged_dataset.pagination_record_count
     end
+
   end
 
   class ExplicitPagingModeStatementHandler < PagedNormalStatementHandler
@@ -101,20 +110,29 @@ module LogStash module PluginMixins module Jdbc
     def perform_query(db, sql_last_value)
       query = build_query(db, sql_last_value)
       offset = 0
+      page_size = @jdbc_page_size
       loop do
         rows_in_page = 0
-        query.with_sql(query.sql, offset: offset, size: jdbc_page_size).each do |row|
+        query.with_sql(query.sql, offset: offset, size: page_size).each do |row|
           yield row
           rows_in_page += 1
         end
-        break unless rows_in_page == jdbc_page_size
-        offset += jdbc_page_size
+        break unless rows_in_page == page_size
+        offset += page_size
       end
     end
   end
 
   class PreparedStatementHandler < StatementHandler
-    attr_reader :name, :bind_values_array, :statement_prepared, :prepared
+    attr_reader :name, :bind_values_array, :statement_prepared, :prepared, :parameters
+
+    def initialize(plugin)
+      super(plugin)
+      @name = plugin.prepared_statement_name.to_sym
+      @bind_values_array = plugin.prepared_statement_bind_values
+      @parameters = plugin.parameters
+      @statement_prepared = Concurrent::AtomicBoolean.new(false)
+    end
 
     # Performs the query, ignoring our pagination settings, yielding once per row of data
     # @param db [Sequel::Database]
@@ -142,7 +160,6 @@ module LogStash module PluginMixins module Jdbc
         db.set_prepared_statement(name, prepared)
       end
       bind_value_sql_last_value(sql_last_value)
-      statement_logger.log_statement_parameters(statement, parameters, nil)
       begin
         db.call(name, parameters)
       rescue => e
@@ -153,17 +170,6 @@ module LogStash module PluginMixins module Jdbc
       end
     end
 
-    def post_init(plugin)
-      # don't log statement count when using prepared statements for now...
-      # needs enhancement to allow user to supply a bindable count prepared statement in settings.
-      @statement_logger.disable_count
-
-      @name = plugin.prepared_statement_name.to_sym
-      @bind_values_array = plugin.prepared_statement_bind_values
-      @parameters = plugin.parameters
-      @statement_prepared = Concurrent::AtomicBoolean.new(false)
-    end
-
     def create_bind_values_hash
       hash = {}
       bind_values_array.each_with_index {|v,i| hash[:"p#{i}"] = v}

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

@@ -6,9 +6,6 @@ module LogStash module PluginMixins module Jdbc
 
     def self.build_last_value_tracker(plugin)
       handler = plugin.record_last_run ? FileHandler.new(plugin.last_run_metadata_path) : NullFileHandler.new(plugin.last_run_metadata_path)
-      if plugin.record_last_run
-        handler = FileHandler.new(plugin.last_run_metadata_path)
-      end
       if plugin.clean_run
         handler.clean
       end

data/logstash-integration-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-integration-jdbc'
-  s.version         = '5.2.2'
+  s.version         = '5.2.5'
   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"
@@ -34,7 +34,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'tzinfo'
   s.add_runtime_dependency 'tzinfo-data'
-  s.add_runtime_dependency 'rufus-scheduler', '~> 3.0.9'
+  # plugin maintains compatibility with < 3.5 (3.0.9)
+  # but works with newer rufus-scheduler >= 3.5 as well
+  s.add_runtime_dependency 'rufus-scheduler'
   s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.3'
   s.add_runtime_dependency "logstash-mixin-validator_support", '~> 1.0'
   s.add_runtime_dependency "logstash-mixin-event_support", '~> 1.0'

data/spec/filters/jdbc/repeating_load_runner_spec.rb

@@ -17,7 +17,7 @@ module LogStash module Filters module Jdbc
         expect(local_db).to receive(:populate_all).once.with(loaders)
         expect(local_db).to receive(:repopulate_all).once.with(loaders)
         runner.initial_load
-        subject.call
+        subject.repeated_load
       end
     end
   end

data/spec/inputs/integration/integ_spec.rb

@@ -41,6 +41,31 @@ describe LogStash::Inputs::Jdbc, :integration => true do
       expect(event.get('first_name')).to eq("Mark")
       expect(event.get('last_name')).to eq("Guckenheimer")
     end
+
+    context 'with paging' do
+      let(:settings) do
+        super().merge 'jdbc_paging_enabled' => true, 'jdbc_page_size' => 1,
+                      "statement" => 'SELECT * FROM "employee" WHERE EMP_NO >= :p1 ORDER BY EMP_NO',
+                      'parameters' => { 'p1' => 0 }
+      end
+
+      before do # change plugin logger level to debug - to exercise logging
+        logger = plugin.class.name.gsub('::', '.').downcase
+        logger = org.apache.logging.log4j.LogManager.getLogger(logger)
+        @prev_logger_level = [ logger.getName, logger.getLevel ]
+        org.apache.logging.log4j.core.config.Configurator.setLevel logger.getName, org.apache.logging.log4j.Level::DEBUG
+      end
+
+      after do
+        org.apache.logging.log4j.core.config.Configurator.setLevel *@prev_logger_level
+      end
+
+      it "should populate the event with database entries" do
+        plugin.run(queue)
+        event = queue.pop
+        expect(event.get('first_name')).to eq('David')
+      end
+    end
   end
 
   context "when supplying a non-existent library" do

data/spec/inputs/jdbc_spec.rb

@@ -1432,54 +1432,6 @@ describe LogStash::Inputs::Jdbc do
     end
   end
 
-  context "when debug logging and a count query raises a count related error" do
-    let(:settings) do
-      { "statement" => "SELECT * from types_table" }
-    end
-    let(:logger) { double("logger", :debug? => true) }
-    let(:statement_logger) { LogStash::PluginMixins::Jdbc::CheckedCountLogger.new(logger) }
-    let(:value_tracker) { double("value tracker", :set_value => nil, :write => nil) }
-    let(:msg) { 'Java::JavaSql::SQLSyntaxErrorException: Dynamic SQL Error; SQL error code = -104; Token unknown - line 1, column 105; LIMIT [SQLState:42000, ISC error code:335544634]' }
-    let(:error_args) do
-      {"exception" => msg}
-    end
-
-    before do
-      db << "INSERT INTO types_table (num, string, started_at, custom_time, ranking) VALUES (1, 'A test', '1999-12-31', '1999-12-31 23:59:59', 95.67)"
-      plugin.register
-      plugin.set_statement_logger(statement_logger)
-      plugin.set_value_tracker(value_tracker)
-      allow(value_tracker).to receive(:value).and_return("bar")
-      allow(statement_logger).to receive(:execute_count).once.and_raise(StandardError.new(msg))
-    end
-
-    after do
-      plugin.stop
-    end
-
-    context "if the count query raises an error" do
-      it "should log a debug line without a count key as its unknown whether a count works at this stage" do
-        expect(logger).to receive(:warn).once.with("Attempting a count query raised an error, the generated count statement is most likely incorrect but check networking, authentication or your statement syntax", error_args)
-        expect(logger).to receive(:warn).once.with("Ongoing count statement generation is being prevented")
-        expect(logger).to receive(:debug).once.with("Executing JDBC query", :statement => settings["statement"], :parameters => {:sql_last_value=>"bar"})
-        plugin.run(queue)
-        queue.pop
-      end
-
-      it "should create an event normally" do
-        allow(logger).to receive(:warn)
-        allow(logger).to receive(:debug)
-        plugin.run(queue)
-        event = queue.pop
-        expect(event.get("num")).to eq(1)
-        expect(event.get("string")).to eq("A test")
-        expect(event.get("started_at")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T00:00:00.000Z")
-        expect(event.get("custom_time")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T23:59:59.000Z")
-        expect(event.get("ranking").to_f).to eq(95.67)
-      end
-    end
-  end
-
   context "when an unreadable jdbc_driver_path entry is present" do
     let(:driver_jar_path) do
       jar_file = $CLASSPATH.find { |name| name.index(Jdbc::Derby.driver_jar) }

data/spec/plugin_mixins/jdbc/scheduler_spec.rb

@@ -49,4 +49,30 @@ describe LogStash::PluginMixins::Jdbc::Scheduler do
 
   end
 
+  context 'work threads' do
+
+    let(:opts) { super().merge :max_work_threads => 3 }
+
+    let(:counter) { java.util.concurrent.atomic.AtomicLong.new(0) }
+
+    before do
+      scheduler.schedule_cron('* * * * * *') { counter.increment_and_get; sleep 3.25 } # every second
+    end
+
+    it "are working" do
+      sleep(0.05) while counter.get == 0
+      expect( scheduler.work_threads.size ).to eql 1
+      sleep(0.05) while counter.get == 1
+      expect( scheduler.work_threads.size ).to eql 2
+      sleep(0.05) while counter.get == 2
+      expect( scheduler.work_threads.size ).to eql 3
+
+      sleep 1.25
+      expect( scheduler.work_threads.size ).to eql 3
+      sleep 1.25
+      expect( scheduler.work_threads.size ).to eql 3
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -131,17 +131,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: '0'
   name: rufus-scheduler
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -275,7 +275,6 @@ files:
 - lib/logstash/filters/jdbc_streaming.rb
 - lib/logstash/inputs/jdbc.rb
 - lib/logstash/inputs/tzinfo_jruby_patch.rb
-- lib/logstash/plugin_mixins/jdbc/checked_count_logger.rb
 - lib/logstash/plugin_mixins/jdbc/common.rb
 - lib/logstash/plugin_mixins/jdbc/jdbc.rb
 - lib/logstash/plugin_mixins/jdbc/scheduler.rb

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

@@ -1,43 +0,0 @@
-# encoding: utf-8
-
-module LogStash module PluginMixins module Jdbc
-  class CheckedCountLogger
-    def initialize(logger)
-      @logger = logger
-      @needs_check = true
-      @count_is_supported = false
-      @in_debug = @logger.debug?
-    end
-
-    def disable_count
-      @needs_check = false
-      @count_is_supported = false
-    end
-
-    def log_statement_parameters(statement, parameters, query)
-      return unless @in_debug
-      check_count_query(query) if @needs_check && query
-      if @count_is_supported
-        @logger.debug("Executing JDBC query", :statement => statement, :parameters => parameters, :count => execute_count(query))
-      else
-        @logger.debug("Executing JDBC query", :statement => statement, :parameters => parameters)
-      end
-    end
-
-    def check_count_query(query)
-      @needs_check = false
-      begin
-        execute_count(query)
-        @count_is_supported = true
-      rescue Exception => e
-        @logger.warn("Attempting a count query raised an error, the generated count statement is most likely incorrect but check networking, authentication or your statement syntax", "exception" => e.message)
-        @logger.warn("Ongoing count statement generation is being prevented")
-        @count_is_supported = false
-      end
-    end
-
-    def execute_count(query)
-      query.count
-    end
-  end
-end end end