logstash-output-charrington 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50e0dc6a545b094b6632682214046bedf1fe56842b17331c44b890157719ad6
-  data.tar.gz: 1e64be923fef5c32b8a678052d76bf774dadf0214519f5a9aee87052638a90fd
+  metadata.gz: d16654dc603c8a1f7ad5e0c394c09c8a1bc018f040f81f22d16b2e13df0cba6d
+  data.tar.gz: 3d74abf0777655dbcd133dce2254dd6f026764ca31b0d76853d04c241f48bcfb
 SHA512:
-  metadata.gz: 93f149aec77737579df06f0e82a49524bc49264d09d4938d67fed25a6b6606e495171f70863ca3b73fe7ea092097a64f43028411a2fb85ad58f5e9adc24c1f2b
-  data.tar.gz: b277fd159871eae94471b3cc2329e5327a1904ccb5e1fffbc2c4f53d40f8b867ebe6346f38af374e3cd428307602a3712e05da5deab5a3eef451ed9733c3d3bf
+  metadata.gz: a2e8d0be10c3491ee93548351d898e631f2c5011e3b4998671aaa447ca77d07ee940dc4162d6ae6ae590bdac11bcdeed4574fa0d33b9d55c88caf7dd2022a4b4
+  data.tar.gz: 31eb24bbab66fbd069e723c684073fd1ce7c777146e538aab34709c2249a30eb45e543f1af75d1d80b38d6558cb6ff80bf008ee4468d3d4830250e66af24cd05

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

@@ -39,27 +39,17 @@ module Charrington
 
     def call
       insert_stmt = insert_statement
+
       stmt = connection.prepareStatement(insert_stmt)
       stmt = add_statement_event_params(stmt)
       stmt.execute
       should_retry
-    rescue Java::OrgPostgresqlUtil::PSQLException => e
-      case e.getSQLState()
-      when "42P01"
-        should_retry = Charrington::CreatePostgresTable.call(connection, event, schema, table_name, columns)
-      when "42703"
-        should_retry = Charrington::AlterPostgresTable.call(connection, event, schema, table_name, columns)
-      else
-        raise InsertFailed, "Charrington: Rescue from SQLException #{e.message}"
-      end
-      should_retry
     rescue Java::JavaSql::SQLException => e
-      puts "catching SQLException #{e.message}"
       case e.getSQLState()
       when "42P01"
-        should_retry = Charrington::CreateRedshiftTable.call(connection, event, schema, table_name, columns)
+        should_retry = create_table
       when "42703"
-        should_retry = Charrington::AlterRedshiftTable.call(connection, event, schema, table_name, columns)
+        should_retry = alter_table
       else
         raise InsertFailed, "Charrington: Rescue from SQLException #{e.message}"
       end
@@ -74,6 +64,22 @@ module Charrington
 
     private
 
+    def create_table
+      if driver == "postgres"
+        Charrington::CreatePostgresTable.call(connection, event, schema, table_name, columns)
+      elsif driver == "redshift"
+        Charrington::CreateRedshiftTable.call(connection, event, schema, table_name, columns)
+      end
+    end
+
+    def alter_table
+      if driver == "postgres"
+        Charrington::AlterPostgresTable.call(connection, event, schema, table_name, columns)
+      elsif driver == "redshift"
+        Charrington::AlterRedshiftTable.call(connection, event, schema, table_name, columns)
+      end
+    end
+
     def cleanup
       @columns.clear if clearable(@columns)
     end

data/lib/logstash/outputs/charrington.rb

@@ -128,7 +128,7 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
     when /redshift/
       "redshift"
     else
-      "postgresql"
+      "postgres"
     end
   end
 

data/logstash-output-charrington.gemspec

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

data/spec/outputs/charrington_spec.rb

@@ -9,7 +9,7 @@ describe LogStash::Outputs::Charrington do
       <<-CONFIG
       input {
         generator {
-          message => '{"app_name": "Web App", "event": "From Agent", "meta": { "type": "XML" } }'
+          message => '{"app_name": "Web App", "event": "schemaless", "meta": { "type": "XML" } }'
           codec => 'json'
           count => 1
         }
@@ -25,10 +25,10 @@ describe LogStash::Outputs::Charrington do
     end
 
     it 'creates a table and inserts a record' do
-      drop_table('from_agent')
+      drop_table('schemaless')
       run_pipeline
-      expect(query('SELECT * FROM from_agent')).to match_array([{id: "1", app_name: "Web App", event: "From Agent", inserted_at: a_kind_of(String), :meta_type => "XML"}])
-      expect(query('SELECT COUNT(1) FROM from_agent').first[:count]).to eq("1")
+      expect(query('SELECT * FROM schemaless')).to match_array([{id: "1", app_name: "Web App", event: "schemaless", inserted_at: a_kind_of(String), :meta_type => "XML"}])
+      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq("1")
     end
   end
 
@@ -38,8 +38,8 @@ describe LogStash::Outputs::Charrington do
       input {
         generator {
           lines => [
-            '{"app_name": "Web App", "event": "From Agent", "meta": { "type": "XML" } }',
-            '{"app_name": "Web App", "event": "From Agent", "meta": { "type": "XML", "file_name": "virus.pdf" } }'
+            '{"app_name": "Web App", "event": "metadata", "meta": { "type": "XML" } }',
+            '{"app_name": "Web App", "event": "metadata", "meta": { "type": "XML", "file_name": "virus.pdf" } }'
           ]
           codec => 'json'
           count => 1
@@ -56,13 +56,13 @@ describe LogStash::Outputs::Charrington do
     end
 
     it 'creates a table and inserts the first record and alters the table for the second record' do
-      drop_table('from_agent')
+      drop_table('metadata')
       run_pipeline
-      expect(query('SELECT * FROM from_agent')).to match_array([
-                                                                   {app_name: 'Web App', event: 'From Agent', id: '1', inserted_at: a_kind_of(String), meta_file_name: nil, meta_type: 'XML'},
-                                                                   {app_name: 'Web App', event: 'From Agent', id: '2', inserted_at: a_kind_of(String), meta_file_name: 'virus.pdf', meta_type: 'XML'}
+      expect(query('SELECT * FROM metadata')).to match_array([
+                                                                   {app_name: 'Web App', event: 'metadata', id: '1', inserted_at: a_kind_of(String), meta_file_name: nil, meta_type: 'XML'},
+                                                                   {app_name: 'Web App', event: 'metadata', id: '2', inserted_at: a_kind_of(String), meta_file_name: 'virus.pdf', meta_type: 'XML'}
                                                                ])
-      expect(query('SELECT COUNT(1) FROM from_agent').first[:count]).to eq("2")
+      expect(query('SELECT COUNT(1) FROM metadata').first[:count]).to eq("2")
     end
   end
 
@@ -71,7 +71,7 @@ describe LogStash::Outputs::Charrington do
       <<-CONFIG
       input {
         generator {
-          message => '{"app_name": "Web App", "event": "From Agent", "meta": { "type": "XML" } }'
+          message => '{"app_name": "Web App", "event": "existing", "meta": { "type": "XML" } }'
           codec => 'json'
           count => 1
         }
@@ -88,15 +88,15 @@ describe LogStash::Outputs::Charrington do
 
     it 'can insert into an existing table' do
       # setup pre-existing data
-      drop_table('from_agent')
-      create_table('CREATE TABLE from_agent (id SERIAL PRIMARY KEY, inserted_at TIMESTAMP DEFAULT NOW(), app_name VARCHAR(255))')
-      insert("INSERT INTO from_agent (app_name) VALUES ('Not Agent')")
-      expect(query('SELECT * FROM from_agent')).to match_array([{id: "1", inserted_at: a_kind_of(String), app_name: "Not Agent"}])
+      drop_table('existing')
+      create_table('CREATE TABLE existing (id SERIAL PRIMARY KEY, inserted_at TIMESTAMP DEFAULT NOW(), app_name VARCHAR(255))')
+      insert("INSERT INTO existing (app_name) VALUES ('Not Agent')")
+      expect(query('SELECT * FROM existing')).to match_array([{id: "1", inserted_at: a_kind_of(String), app_name: "Not Agent"}])
 
       run_pipeline
-      expect(query('SELECT * FROM from_agent')).to match_array([
+      expect(query('SELECT * FROM existing')).to match_array([
                                                                    {id: '1', app_name: 'Not Agent', event: nil, inserted_at: a_kind_of(String), meta_type: nil},
-                                                                   {id: '2', app_name: 'Web App', event: 'From Agent', inserted_at: a_kind_of(String), meta_type: 'XML'}
+                                                                   {id: '2', app_name: 'Web App', event: 'existing', inserted_at: a_kind_of(String), meta_type: 'XML'}
                                                                ])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-charrington
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - dconger