logstash-output-charrington 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67301110645343eb9a0187da8a7c914cdba6ebe03241cea40ec757cc0972d61d
-  data.tar.gz: 753facf12027fd4a0c2d6a446835d060911aae52e74100b334ba6a277c37385c
+  metadata.gz: 18ae186abb98be6db8aca5f0713593a0597737f516608c97ea05fca4b58537a4
+  data.tar.gz: 9cecf3cf3ed56956fe8907032a6a2322a6c46495a8fe1fc074ac066d15b00d01
 SHA512:
-  metadata.gz: '0178367f4b8c91dff6da258005228ea8d473c7c6e550bcb03b6dd4e36a03f123a8ae83e96a7f91e8099c619f0fd7b3916388ba24741336881d2b3ff0c0c98733'
-  data.tar.gz: 16467a4fa971bc585e24cab322555239ba687daf77ece2839ad2e5d35ecf9af19463726261c7e4d31752a5771aee5881870fac3d61dbe887c8b0c6457caf6d95
+  metadata.gz: f661d570cf5b4d04c170253354387da2b157f132a8b8dba60a5be5b5bdb7b087f959eb0234ce28c4dae91b984ea53e0ccbeafcbd5eb97a6dbf9d40474f236acf
+  data.tar.gz: fac3bc74393a48e88df615afe5c3451fb0d2d073c5a400ceae06ce3ca441da202324f8f964b24f6b665a627464cbece2da0b9d95badcbb78e74498384120f826

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

@@ -71,10 +71,10 @@ module Charrington
       sql = "SELECT * FROM #{schema}#{table_name} LIMIT 1;"
       stmt, rs = executeQuery(prep_sql(sql))
       meta_data = rs.getMetaData()
-      stmt.close unless stmt.nil?
       column_count = meta_data.getColumnCount()
       (1..column_count).map {|i| meta_data.getColumnName(i) }
     ensure
+      self.logger.info "Within ensure block of current_table_columns in alter_redshift_table.rb and value of stmt.nil?: #{stmt.nil?}"
       stmt.close unless stmt.nil?
     end
 
@@ -97,6 +97,7 @@ module Charrington
       puts "Alter Redshift Unknown exception: #{e.message}, with SQL: #{sql}"
       self.logger.info "Alter Redshift Unknown exception: #{e.message}"
     ensure
+      self.logger.info "Within ensure block of execute in alter_redshift_table.rb and value of stmt.nil?: #{stmt.nil?}"
       stmt.close unless stmt.nil?
     end
 

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

@@ -24,6 +24,7 @@ module Charrington
 
     def call
       set_column_types
+      self.logger.info "Finished running set_column_types and now have column_types for create table of: #{column_types}"
       create_table
       true
     rescue => e
@@ -75,12 +76,15 @@ module Charrington
     end
 
     def execute(sql)
+      self.logger.info "Running sql of: #{sql}"
+
       statement = connection.prepareStatement( sql.gsub(/\s+/, " ").strip )
       statement.execute()
     rescue Java::JavaSql::SQLException => e
       puts "Redshift SQLException: #{e.message}"
       self.logger.info "Redshift SQLException: #{e.message}, with SQL: #{sql}"
     ensure
+      self.logger.info "Within ensure block of create_redshift_table.rb and value of statement.nil?: #{statement.nil?}"
       statement.close unless statement.nil?
     end
   end

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

@@ -39,17 +39,22 @@ module Charrington
     end
 
     def call
+      self.logger.info "Attempting insert into table name: #{table_name}"
       insert_stmt = insert_statement
+      self.logger.info "Insert statement passed into prepareStatement is: #{insert_stmt}"
 
       stmt = connection.prepareStatement(insert_stmt)
       stmt = add_statement_event_params(stmt)
+      self.logger.info "Insert statement to be run is: #{insert_stmt}"
       stmt.execute
       should_retry
     rescue Java::JavaSql::SQLException => e
       case e.getSQLState()
       when "42P01"
+        self.logger.info "Received Java::JavaSql::SQLException with error sql state of 42P01, moving to create table"
         should_retry = create_table
       when "42703"
+        self.logger.info "Received Java::JavaSql::SQLException with error sql state of 42703, moving to alter table"
         should_retry = alter_table
       else
         raise InsertFailed, "Charrington: Rescue from SQLException #{e.message}"

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

@@ -6,6 +6,7 @@ module Charrington
     # It handles retries where applicable.
 
     include Service
+    include LogStash::Util::Loggable
     attr_reader :event, :connection, :opts, :max_retries, :schema, :retry_max_interval, :driver
     attr_accessor :retry_interval, :should_retry
 
@@ -32,10 +33,13 @@ module Charrington
       while should_retry do
         transformed = case driver
                         when "redshift"
+                          self.logger.info "Found driver for redshift with event of: #{event}"
                           Charrington::TransformRedshift.call(event)
                         else
+                          self.logger.info "Found driver for postgres with event of: #{event}"
                           Charrington::TransformPostgres.call(event)
                         end
+        self.logger.info "Transformed event into: #{transformed}"
         should_retry = Charrington::Insert.call(connection, transformed, opts)
         break if !should_retry
 

data/logstash-output-charrington.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-charrington'
-  s.version = '0.3.6'
+  s.version = '0.3.7'
 
   s.licenses = ['Apache-2.0']
   s.homepage = 'https://gitlab.podium.com/engineering/analytics/logstash-output-charrington'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-charrington
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - dconger
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement