logstash-integration-jdbc 5.2.4 → 5.4.11

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.4.11
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
   name: jar-dependencies
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -34,8 +34,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.5.0
   name: logstash-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -77,15 +77,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.74.0
   name: sequel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.74.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -93,8 +93,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: lru_redux
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,8 +107,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: tzinfo
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,8 +121,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: tzinfo-data
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,40 +131,40 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rufus-scheduler
-  prerelease: false
+        version: '1.3'
+  name: logstash-mixin-ecs_compatibility_support
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  name: logstash-mixin-ecs_compatibility_support
-  prerelease: false
+        version: '1.0'
+  name: logstash-mixin-validator_support
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-validator_support
-  prerelease: false
+  name: logstash-mixin-event_support
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -176,9 +176,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-mixin-event_support
-  prerelease: false
+  name: logstash-mixin-scheduler
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -191,8 +191,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: childprocess
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -205,8 +205,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -219,22 +219,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: timecop
-  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: jdbc-derby
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -275,11 +261,11 @@ 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
+- lib/logstash/plugin_mixins/jdbc/sequel_bootstrap.rb
 - lib/logstash/plugin_mixins/jdbc/statement_handler.rb
+- lib/logstash/plugin_mixins/jdbc/timezone_proxy.rb
 - lib/logstash/plugin_mixins/jdbc/value_tracking.rb
 - lib/logstash/plugin_mixins/jdbc_streaming.rb
 - lib/logstash/plugin_mixins/jdbc_streaming/cache_payload.rb
@@ -307,10 +293,13 @@ files:
 - spec/helpers/derbyrun.jar
 - spec/inputs/integration/integ_spec.rb
 - spec/inputs/jdbc_spec.rb
-- spec/plugin_mixins/jdbc/scheduler_spec.rb
+- spec/plugin_mixins/jdbc/timezone_proxy_spec.rb
+- spec/plugin_mixins/jdbc/value_tracking_spec.rb
 - spec/plugin_mixins/jdbc_streaming/parameter_handler_spec.rb
-- vendor/jar-dependencies/org/apache/derby/derby/10.14.1.0/derby-10.14.1.0.jar
-- vendor/jar-dependencies/org/apache/derby/derbyclient/10.14.1.0/derbyclient-10.14.1.0.jar
+- vendor/jar-dependencies/org/apache/derby/derby/10.15.2.1/derby-10.15.2.1.jar
+- 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
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -334,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Integration with JDBC - input and filter plugins
@@ -360,5 +349,6 @@ test_files:
 - spec/helpers/derbyrun.jar
 - spec/inputs/integration/integ_spec.rb
 - spec/inputs/jdbc_spec.rb
-- spec/plugin_mixins/jdbc/scheduler_spec.rb
+- spec/plugin_mixins/jdbc/timezone_proxy_spec.rb
+- spec/plugin_mixins/jdbc/value_tracking_spec.rb
 - spec/plugin_mixins/jdbc_streaming/parameter_handler_spec.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

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

@@ -1,175 +0,0 @@
-require 'rufus/scheduler'
-
-require 'logstash/util/loggable'
-
-module LogStash module PluginMixins module Jdbc
-  class Scheduler < Rufus::Scheduler
-
-    include LogStash::Util::Loggable
-
-    # Rufus::Scheduler >= 3.4 moved the Time impl into a gem EoTime = ::EtOrbi::EoTime`
-    # Rufus::Scheduler 3.1 - 3.3 using it's own Time impl `Rufus::Scheduler::ZoTime`
-    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 }
-      details[:cause] = err.cause if err.cause
-
-      details[:now] = debug_format_time(TimeImpl.now)
-      details[:last_time] = (debug_format_time(job.last_time) rescue nil)
-      details[:next_time] = (debug_format_time(job.next_time) rescue nil)
-      details[:job] = job
-
-      details[:opts] = @opts
-      details[:started_at] = started_at
-      details[:thread] = thread.inspect
-      details[:jobs_size] = @jobs.size
-      details[:work_threads_size] = work_threads.size
-      details[:work_queue_size] = work_queue.size
-
-      logger.error("Scheduler intercepted an error:", details)
-
-    rescue => e
-      logger.error("Scheduler failed in #on_error #{e.inspect}")
-    end
-
-    def debug_format_time(time)
-      # EtOrbi::EoTime used by (newer) Rufus::Scheduler has to_debug_s https://git.io/JyiPj
-      time.respond_to?(:to_debug_s) ? time.to_debug_s : time.strftime("%Y-%m-%dT%H:%M:%S.%L")
-    end
-    private :debug_format_time
-
-    # @private helper used by JobDecorator
-    def work_thread_name_prefix
-      ( @opts[:thread_name] || "#{@thread_key}_scheduler" ) + '_worker-'
-    end
-
-    protected
-
-    # @overload
-    def start
-      ret = super() # @thread[:name] = @opts[:thread_name] || "#{@thread_key}_scheduler"
-
-      # at least set thread.name for easier thread dump analysis
-      if @thread.is_a?(Thread) && @thread.respond_to?(:name=)
-        @thread.name = @thread[:name] if @thread[:name]
-      end
-
-      ret
-    end
-
-    # @overload
-    def do_schedule(job_type, t, callable, opts, return_job_instance, block)
-      job_or_id = super
-
-      job_or_id.extend JobDecorator if return_job_instance
-
-      job_or_id
-    end
-
-    module JobDecorator
-
-      def start_work_thread
-        prev_thread_count = @scheduler.work_threads.size
-
-        ret = super() # does not return Thread instance in 3.0
-
-        work_threads = @scheduler.work_threads(:__all_no_cache__)
-        while prev_thread_count == work_threads.size # very unlikely
-          Thread.pass
-          work_threads = @scheduler.work_threads(:__all_no_cache__)
-        end
-
-        work_thread_name_prefix = @scheduler.work_thread_name_prefix
-
-        work_threads.sort! do |t1, t2|
-          if t1[:name].nil?
-            t2[:name].nil? ? 0 : +1 # nils at the end
-          elsif t2[:name].nil?
-            t1[:name].nil? ? 0 : -1
-          else
-            t1[:name] <=> t2[:name]
-          end
-        end
-
-        work_threads.each_with_index do |thread, i|
-          unless thread[:name]
-            thread[:name] = "#{work_thread_name_prefix}#{sprintf('%02i', i)}"
-            thread.name = thread[:name] if thread.respond_to?(:name=)
-            # e.g. "[oracle]<jdbc_scheduler_worker-00"
-          end
-        end
-
-        ret
-      end
-
-    end
-
-  end
-end end end

data/spec/plugin_mixins/jdbc/scheduler_spec.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/plugin_mixins/jdbc/scheduler"
-
-describe LogStash::PluginMixins::Jdbc::Scheduler do
-
-  let(:thread_name) { '[test]<jdbc_scheduler' }
-
-  let(:opts) do
-    { :max_work_threads => 2, :thread_name => thread_name }
-  end
-
-  subject(:scheduler) { LogStash::PluginMixins::Jdbc::Scheduler.new(opts) }
-
-  after { scheduler.stop(:wait) }
-
-  it "sets scheduler thread name" do
-    expect( scheduler.thread.name ).to include thread_name
-  end
-
-  context 'cron schedule' do
-
-    before do
-      scheduler.schedule_cron('* * * * * *') { sleep 1.25 } # every second
-    end
-
-    it "sets worker thread names" do
-      sleep 3.0
-      threads = scheduler.work_threads
-      threads.sort! { |t1, t2| (t1.name || '') <=> (t2.name || '') }
-
-      expect( threads.size ).to eql 2
-      expect( threads.first.name ).to eql "#{thread_name}_worker-00"
-      expect( threads.last.name ).to eql "#{thread_name}_worker-01"
-    end
-
-  end
-
-  context 'every 1s' do
-
-    before do
-      scheduler.schedule_in('1s') { raise 'TEST' } # every second
-    end
-
-    it "logs errors handled" do
-      expect( scheduler.logger ).to receive(:error).with /Scheduler intercepted an error/, hash_including(:message => 'TEST')
-      sleep 1.5
-    end
-
-  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