logstash-output-charrington 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc89a196e03294552a4b25fef760461874c3eb8fad194845e127cc517d1a53f
-  data.tar.gz: a330a0c2c09a9d4c8746244e3320e76ce121bfee85e97304ddebf87deccf9b31
+  metadata.gz: 9e1dc7c6c92672c4d42224e9a9e617e3a2cd3599e2ec65d03822b1b095c23714
+  data.tar.gz: '06886089b25d6ff468a6741f82f70be806f5d11a56d63f0709c1796b32ddbee4'
 SHA512:
-  metadata.gz: e206bed7a803e0f999931fdddc0f95769cab0ed47ac9813ae27934decf695de7f1a5d38f95f01168c3d8ae6eede046c5b247a31a1efb8a6919ec34cc32da6905
-  data.tar.gz: d94bcd0d15c6fe32bcaa937f3a78231f592e2dffd90217e8a8635faaef3747c121989e8552ae66d5a019be9cf3e5ba066c375922608f25a332dcaf596e5efa20
+  metadata.gz: 0c28fb16d1494ac30c28d05102367475b094bee1160b5d42688da24ad9e1a0511a0533c338b661cdaa6e89b1c1bdc7a4d7cb4a049544b8d8d37524c6bf308ebc
+  data.tar.gz: f2fb7a4ea94a0e401d324452826c936dddf0b5624cedd4ec30f81ef85bb0ffc178547307ef4888fa822a3378b8c9e371f00a75c3c61b81e968295022408d1030

data/lib/logstash/outputs/charrington/insert.rb

@@ -227,7 +227,7 @@ module Charrington
     end
 
     def clearable(obj)
-      obj.is_a? Hash or obj.is_a? Array
+      obj.is_a?(Hash) || obj.is_a?(Array)
     end
 
     def underscore(str)

data/lib/logstash/outputs/charrington/process.rb

@@ -71,7 +71,7 @@ module Charrington
     end
 
     def clearable(obj)
-      obj.is_a? Hash or obj.is_a? Array
+      obj.is_a?(Hash) || obj.is_a?(Array)
     end
   end
 end

data/lib/logstash/outputs/charrington.rb

@@ -5,7 +5,7 @@ require 'logstash/namespace'
 require 'concurrent'
 require 'stud/interval'
 require 'java'
-require 'logstash-output-charrington_jars'
+require 'logstash_output_charrington_jars'
 require 'json'
 require 'bigdecimal'
 require File.join(File.dirname(__FILE__), 'charrington/process')

data/lib/logstash-output-charrington_jars.rb

@@ -1,6 +1,18 @@
-# frozen_string_literal: true
+# this is a generated file, to avoid over-writing it just delete this comment
+begin
+  require 'jar_dependencies'
+rescue LoadError
+  require 'com/zaxxer/HikariCP/2.7.2/HikariCP-2.7.2.jar'
+  require 'org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar'
+  require 'org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar'
+  require 'org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar'
+  require 'org/apache/logging/log4j/log4j-slf4j-impl/2.17.0/log4j-slf4j-impl-2.17.0.jar'
+end
 
-require 'logstash/environment'
-
-root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-LogStash::Environment.load_runtime_jars! File.join(root_dir, 'vendor')
+if defined? Jars
+  require_jar 'com.zaxxer', 'HikariCP', '2.7.2'
+  require_jar 'org.slf4j', 'slf4j-api', '1.7.25'
+  require_jar 'org.apache.logging.log4j', 'log4j-api', '2.17.0'
+  require_jar 'org.apache.logging.log4j', 'log4j-core', '2.17.0'
+  require_jar 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.17.0'
+end

data/lib/logstash_output_charrington_jars.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'logstash/environment'
+
+root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+LogStash::Environment.load_runtime_jars! File.join(root_dir, 'vendor')

data/logstash-output-charrington.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'logstash-output-charrington'
-  s.version = '0.3.25'
+  s.version = '0.3.26'
 
   s.licenses = ['Apache-2.0']
   s.homepage = 'https://gitlab.podium.com/engineering/analytics/logstash-output-charrington'
@@ -26,11 +26,11 @@ Gem::Specification.new do |s|
   # The 'install_jars' rake task will download these jars from Maven and put them into the vendor directory
   # See jar-dependencies gem's wiki - https://github.com/mkristian/jar-dependencies/wiki/declare-jars-inside-gemspec
   s.requirements << "jar 'com.zaxxer:HikariCP', '2.7.2'"
-  s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.16.0'"
+  s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.17.0'"
 
   s.add_development_dependency 'jar-dependencies', '~> 0.4.1'
   s.add_development_dependency 'logstash-codec-json', '~> 3.0', '>= 3.0.5'
   s.add_development_dependency 'logstash-devutils', '~> 1.3', '>= 1.3.1'
   s.add_development_dependency 'logstash-input-generator', '~> 3.0', '>= 3.0.6'
-  s.add_development_dependency 'rubocop', '0.41.2'
+  s.add_development_dependency 'rubocop', '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-charrington
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors:
 - dconger
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 1.0.0
   name: rubocop
   prerelease: false
   type: :development
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 1.0.0
 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 'logstash-output-charrington'.
   This gem is not a stand-alone program
@@ -161,9 +161,10 @@ files:
 - lib/logstash/outputs/charrington/service.rb
 - lib/logstash/outputs/charrington/transform_postgres.rb
 - lib/logstash/outputs/charrington/transform_redshift.rb
-- lib/org/apache/logging/log4j/log4j-api/2.16.0/log4j-api-2.16.0.jar
-- lib/org/apache/logging/log4j/log4j-core/2.16.0/log4j-core-2.16.0.jar
-- lib/org/apache/logging/log4j/log4j-slf4j-impl/2.16.0/log4j-slf4j-impl-2.16.0.jar
+- lib/logstash_output_charrington_jars.rb
+- lib/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar
+- lib/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar
+- lib/org/apache/logging/log4j/log4j-slf4j-impl/2.17.0/log4j-slf4j-impl-2.17.0.jar
 - lib/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
 - logstash-output-charrington.gemspec
 - spec/charrington_spec_helper.rb
@@ -172,9 +173,9 @@ files:
 - spec/outputs/charrington_postgres_spec.rb
 - spec/outputs/charrington_spec.rb
 - vendor/jar-dependencies/runtime-jars/HikariCP-2.7.2.jar
-- vendor/jar-dependencies/runtime-jars/log4j-api-2.16.0.jar
-- vendor/jar-dependencies/runtime-jars/log4j-core-2.16.0.jar
-- vendor/jar-dependencies/runtime-jars/log4j-slf4j-impl-2.16.0.jar
+- vendor/jar-dependencies/runtime-jars/log4j-api-2.17.0.jar
+- vendor/jar-dependencies/runtime-jars/log4j-core-2.17.0.jar
+- vendor/jar-dependencies/runtime-jars/log4j-slf4j-impl-2.17.0.jar
 - vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.25.jar
 homepage: https://gitlab.podium.com/engineering/analytics/logstash-output-charrington
 licenses:
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - jar 'com.zaxxer:HikariCP', '2.7.2'
-- jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.16.0'
+- jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.17.0'
 rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: