logstash-filter-jdbc_streaming 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677e0e5ec0f5045d139d29bc159e197d7f771391e303a11f0de12b707e54d224
-  data.tar.gz: af5f3e19476f2789a65afd5e5e10faa48a632b667ba0c5ca2ffc030720a23562
+  metadata.gz: 68322804fb8d02a7f7831e6ea4eb3c47514e02033ae3ffa8d7f562a9a9ac25fe
+  data.tar.gz: 1fbbb4043350281a2660c6b7108ad1d2cff58ac98ef35ae695a8028c253f7d21
 SHA512:
-  metadata.gz: 82b751b0170789cf6b27939030976f3c315d53221e82dcc5862ab1cbca43cdf7df2086ee2f9649aa2da469dbbac5a49d058fe6095c47e4f8228a4a6c0ba50c7a
-  data.tar.gz: a096d52b59659d6aee46c764567a9131bb077da1e13aed1e492884f10ace4050448f88750e433d689d509e3642286865d756df3e0d6e8713370cd9f6c2d3d2e3
+  metadata.gz: 74996330617c8b291b4f09ebe001c91d76ed6e07de666b40f6260e2fb0a63b4c6140519ba3f5199db7953f2511d70333d21d7bc20dc3a5fdbfa05271cba1b423
+  data.tar.gz: eb7a1d7750383f2678b319933a645a529f582165c32bdb2689a939b10628024bf169b06972aeabca9ba6b4f34bcbd5abe07d81991d2bf5ef348e4464d95ed31a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.10
+  - Fixed driver loading [#35](https://github.com/logstash-plugins/logstash-filter-jdbc_streaming/pull/35)
+
 ## 1.0.9
   - Added support for prepared statements [PR 32](https://github.com/logstash-plugins/logstash-filter-jdbc_streaming/pull/32)
   - Added support for `sequel_opts` to pass options to the 3rd party Sequel library.

data/lib/logstash/plugin_mixins/jdbc_streaming.rb

@@ -58,28 +58,19 @@ module LogStash module PluginMixins module JdbcStreaming
 
   private
 
-  def load_drivers
-    return if @jdbc_driver_library.nil? || @jdbc_driver_library.empty?
-    driver_jars = @jdbc_driver_library.split(",")
-
-    # Needed for JDK 11 as the DriverManager has a different ClassLoader than Logstash
-    urls = java.net.URL[driver_jars.length].new
-    driver_jars.each_with_index do |driver, idx|
-        urls[idx] = java.io.File.new(driver).toURI().toURL()
+  def load_driver_jars
+    unless @jdbc_driver_library.nil? || @jdbc_driver_library.empty?
+      @jdbc_driver_library.split(",").each do |driver_jar|
+        begin
+          @logger.debug("loading #{driver_jar}")
+          # Use https://github.com/jruby/jruby/wiki/CallingJavaFromJRuby#from-jar-files to make classes from jar
+          # available
+          require driver_jar
+        rescue LoadError => e
+          raise LogStash::PluginLoadingError, "unable to load #{driver_jar} from :jdbc_driver_library, #{e.message}"
+        end
       end
-      ucl = java.net.URLClassLoader.new_instance(urls)
-      begin
-        klass = java.lang.Class.forName(@jdbc_driver_class.to_java(:string), true, ucl);
-      rescue Java::JavaLang::ClassNotFoundException => e
-        raise LogStash::Error, "Unable to find driver class via URLClassLoader in given driver jars: #{@jdbc_driver_class}"
-      end
-      begin
-        driver = klass.getConstructor().newInstance();
-        java.sql.DriverManager.register_driver(WrappedDriver.new(driver.to_java(java.sql.Driver)).to_java(java.sql.Driver))
-      rescue Java::JavaSql::SQLException => e
-        raise LogStash::Error, "Unable to register driver with java.sql.DriverManager using WrappedDriver: #{@jdbc_driver_class}"
-      end
-
+    end
   end
 
   public
@@ -88,7 +79,7 @@ module LogStash module PluginMixins module JdbcStreaming
     require "sequel/adapters/jdbc"
     require "java"
 
-    load_drivers
+    load_driver_jars
 
     @sequel_opts_symbols = @sequel_opts.inject({}) {|hash, (k,v)| hash[k.to_sym] = v; hash}
     @sequel_opts_symbols[:user] = @jdbc_user unless @jdbc_user.nil? || @jdbc_user.empty?

data/logstash-filter-jdbc_streaming.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-filter-jdbc_streaming'
-  s.version         = '1.0.9'
+  s.version         = '1.0.10'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Enrich events with your database data"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'jdbc-derby'
-  s.add_development_dependency 'jdbc-postgres'
 end

data/spec/integration/jdbcstreaming_spec.rb

@@ -1,6 +1,5 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/filters/jdbc_streaming"
-require 'jdbc/postgres'
 require "sequel"
 require "sequel/adapters/jdbc"
 
@@ -10,17 +9,15 @@ module LogStash module Filters
   end
 
   describe JdbcStreaming, :integration => true do
-    # Use Postgres for integration tests
-    ::Jdbc::Postgres.load_driver
-
     ENV["TZ"] = "Etc/UTC"
 
     # For Travis and CI based on docker, we source from ENV
     jdbc_connection_string = ENV.fetch("PG_CONNECTION_STRING",
-      "jdbc:postgresql://localhost:5432") + "/jdbc_streaming_db?user=postgres"
+      "jdbc:postgresql://postgresql:5432") + "/jdbc_streaming_db?user=postgres"
 
     let(:mixin_settings) do
       { "jdbc_driver_class" => "org.postgresql.Driver",
+        "jdbc_driver_library" => "/usr/share/logstash/postgresql.jar",
         "jdbc_connection_string" => jdbc_connection_string
       }
     end
@@ -50,19 +47,9 @@ module LogStash module Filters
     let(:ipaddr)    { "10.#{idx}.1.1" }
 
     before :each do
-      db.create_table :reference_table do
-        String :ip
-        String  :name
-        String  :location
-      end
-      1.upto(250) do |i|
-        db[:reference_table].insert(:ip => "10.#{i}.1.1", :name => "ldn-server-#{i}", :location => "LDN-#{i}-2-3")
-      end
       plugin.register
     end
 
-    after(:each) { db.drop_table(:reference_table) }
-
     describe "found record - uses row" do
       let(:idx) { 200 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-jdbc_streaming
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: jdbc-postgres
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the
   Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not
   a stand-alone program