logstash-output-charrington 0.3.21 → 0.3.25

data/lib/logstash/outputs/charrington.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'logstash/outputs/base'
 require 'logstash/namespace'
 require 'concurrent'
@@ -7,10 +8,10 @@ require 'java'
 require 'logstash-output-charrington_jars'
 require 'json'
 require 'bigdecimal'
-require File.join(File.dirname(__FILE__), "charrington/process")
-require File.join(File.dirname(__FILE__), "charrington/transform_postgres")
-require File.join(File.dirname(__FILE__), "charrington/transform_redshift")
-require File.join(File.dirname(__FILE__), "charrington/insert")
+require File.join(File.dirname(__FILE__), 'charrington/process')
+require File.join(File.dirname(__FILE__), 'charrington/transform_postgres')
+require File.join(File.dirname(__FILE__), 'charrington/transform_redshift')
+require File.join(File.dirname(__FILE__), 'charrington/insert')
 
 # Write events to a SQL engine, using JDBC.
 # It is upto the user of the plugin to correctly configure the plugin.
@@ -20,12 +21,11 @@ require File.join(File.dirname(__FILE__), "charrington/insert")
 # is attempted. If that fails, it will try to either
 # create a table via Charrington::CreateTable
 # or alter an existing one via Charrington::AlterTable
-
-class LogStash::Outputs::Charrington < LogStash::Outputs::Base
+class LogStash::Outputs::Charrington < LogStash::Outputs::Base # rubocop:disable Metrics/ClassLength
   concurrency :shared
   config_name 'charrington'
 
-  STRFTIME_FMT = '%Y-%m-%d %T.%L'.freeze
+  STRFTIME_FMT = '%Y-%m-%d %T.%L'
 
   # Driver class - Reintroduced for https://github.com/theangryangel/logstash-output-jdbc/issues/26
   config :driver_class, validate: :string
@@ -98,23 +98,23 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
 
   def multi_receive(events)
     events.each do |event|
-      connection = get_connection
-      break unless connection
+      conn = connection
+      break unless conn
 
       schema = get_schema(event)
 
-      opts = { connection: connection,
+      opts = { connection: conn,
                schema: schema,
                max_retries: @max_flush_exceptions,
                retry_initial_interval: @retry_initial_interval,
                driver: driver,
                transformer: @transformer }
-      Charrington::Process.call(connection, event, opts)
-    rescue => e
+      Charrington::Process.call(conn, event, opts)
+    rescue StandardError => e
       @logger.error("Unable to process event. Event dropped. #{e.message}")
       next
     ensure
-      connection.close unless connection.nil?
+      conn&.close
     end
   end
 
@@ -129,9 +129,9 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
   def driver
     case @driver_class
     when /redshift/
-      "redshift"
+      'redshift'
     else
-      "postgres"
+      'postgres'
     end
   end
 
@@ -147,7 +147,7 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
 
     validate_connection_timeout = (@connection_timeout / 1000) / 2
 
-    if !@connection_test_query.nil? and @connection_test_query.length > 1
+    if !@connection_test_query.nil? && (@connection_test_query.length > 1)
       @pool.setConnectionTestQuery(@connection_test_query)
       @pool.setConnectionInitSql(@connection_test_query)
     end
@@ -156,9 +156,7 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
 
     # Test connection
     test_connection = @pool.getConnection
-    unless test_connection.isValid(validate_connection_timeout)
-      @logger.warn('JDBC - Connection is not reporting as validate. Either connection is invalid, or driver is not getting the appropriate response.')
-    end
+    @logger.warn('JDBC - Connection is not reporting as validate. Either connection is invalid, or driver is not getting the appropriate response.') unless test_connection.isValid(validate_connection_timeout)
     test_connection.close
   end
 
@@ -166,6 +164,7 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
   def load_jar_files!
     unless @driver_jar_path.nil?
       raise LogStash::ConfigurationError, 'JDBC - Could not find jar file at given path. Check config.' unless File.exist? @driver_jar_path
+
       require @driver_jar_path
       return
     end
@@ -192,40 +191,36 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
     if !@schema.nil?
       @schema
     else
-      case event.to_hash["app_name"]
-      when "Web App"
-        "dea_webapp"
-      when "Mobile App"
-        "dea_mobileapp"
+      case event.to_hash['app_name']
+      when 'Web App'
+        'dea_webapp'
+      when 'Mobile App'
+        'dea_mobileapp'
       else
-        ""
+        ''
       end
     end
   end
 
-  def get_connection
-    connection = @pool.getConnection
-  rescue => e
+  def connection
+    @pool.getConnection
+  rescue StandardError => e
     log_jdbc_exception(e, true, nil)
     false
   end
 
   def log_jdbc_exception(exception, retrying, event)
     current_exception = exception
-    log_text = 'JDBC - Exception. ' + (retrying ? 'Retrying' : 'Not retrying')
+    log_text = "JDBC - Exception. #{retrying ? 'Retrying' : 'Not retrying'}"
 
     log_method = (retrying ? 'warn' : 'error')
 
     loop do
-      @logger.send(log_method, log_text, :exception => current_exception, :event => event)
+      @logger.send(log_method, log_text, exception: current_exception, event: event)
 
-      if current_exception.respond_to? 'getNextException'
-        current_exception = current_exception.getNextException()
-      else
-        current_exception = nil
-      end
+      current_exception = (current_exception.getNextException if current_exception.respond_to? 'getNextException')
 
-      break if current_exception == nil
+      break if current_exception.nil?
     end
   end
 end

data/lib/logstash-output-charrington_jars.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'logstash/environment'
 
 root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))

data/logstash-output-charrington.gemspec

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name = 'logstash-output-charrington'
-  s.version = '0.3.21'
+  s.version = '0.3.25'
 
   s.licenses = ['Apache-2.0']
   s.homepage = 'https://gitlab.podium.com/engineering/analytics/logstash-output-charrington'
   s.summary = 'This plugin allows you to output to SQL, via JDBC'
   s.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"
-  s.authors = ['dconger', 'brianbroderick', 'spencerdcarlson']
+  s.authors = %w[dconger brianbroderick spencerdcarlson]
   s.require_paths = ['lib']
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','Gemfile','LICENSE.txt']
+  s.files = Dir['lib/**/*', 'spec/**/*', 'vendor/**/*', '*.gemspec', '*.md', 'Gemfile', 'LICENSE.txt']
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -18,19 +20,17 @@ Gem::Specification.new do |s|
   s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'output' }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core-plugin-api', ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain', '~> 3.0', '>= 3.0.6'
+  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
 
   # 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.6.2'"
+  s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.16.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 'jar-dependencies', '~> 0.4.0'
-  s.add_development_dependency 'ruby-maven', '~> 3.3'
-  s.add_development_dependency 'rubocop', '0.41.2'
   s.add_development_dependency 'logstash-input-generator', '~> 3.0', '>= 3.0.6'
-  s.add_development_dependency 'logstash-codec-json', '~> 3.0', '>= 3.0.5'
-  s.add_development_dependency 'insist','~> 1.0'
+  s.add_development_dependency 'rubocop', '0.41.2'
 end

data/spec/charrington_spec_helper.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
+
 require 'logstash/devutils/rspec/spec_helper'
 require 'logstash/outputs/charrington'
 require 'stud/temporary'
 require 'java'
-require 'logstash-output-charrington_test_jars'
+require 'logstash_output_charrington_test_jars'
 require 'securerandom'
 java_import java.util.ArrayList
 java_import java.nio.file.Paths
 
 RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 80000
-RSpec.configure do |c|
-end
 
 RSpec.shared_context 'pipeline' do
   let(:run_pipeline) do
@@ -18,15 +18,9 @@ RSpec.shared_context 'pipeline' do
   end
 end
 
-RSpec.shared_context 'postgres' do
-  def start_database(embedded = true, host='localhost', port=57354, database='winston', user='testuser', password='password')
-    if embedded
-      config = Java::RuYandexQatoolsEmbedPostgresql::EmbeddedPostgres::cachedRuntimeConfig(Paths::get('/tmp/charrington-test-db-cache')) # avoid archive extraction every time
-      db = Java::RuYandexQatoolsEmbedPostgresql::EmbeddedPostgres.new
-      @url = db.start(config, host, port, database, user, password, ArrayList.new(["-E", "SQL_ASCII", "--locale=C", "--lc-collate=C", "--lc-ctype=C"]))
-    else
-      @url = "jdbc:postgresql://#{host}/#{database}?user=#{user}&password=#{password}";
-    end
+RSpec.shared_context 'postgres' do # rubocop:disable Metrics/BlockLength
+  def start_database(host, _port, database, user, password)
+    @url = "jdbc:postgresql://#{host}/#{database}?user=#{user}&password=#{password}"
 
     # setup connection manager
     @connection_manager = Java::ComZaxxerHikari::HikariDataSource.new
@@ -37,41 +31,42 @@ RSpec.shared_context 'postgres' do
   end
 
   before(:all) do
-    if ENV.fetch("TEST_ENV", "").to_s.casecmp?("ci")
-      start_database(false, 'postgres', 5432, 'postgres', 'postgres', '')
-    else
-      start_database
-    end
+    database_host = ENV.fetch('DATABASE_HOST', 'postgres')
+    database_port = ENV.fetch('DATABASE_PORT', 5432)
+    database_name = ENV.fetch('DATABASE_NAME', 'winston')
+    database_user = ENV.fetch('DATABASE_USER', 'postgres')
+    database_password = ENV.fetch('DATABASE_PASSWORD', 'postgres')
+    start_database(database_host, database_port, database_name, database_user, database_password)
   end
 
-  let(:driver_path) {
+  let(:driver_path) do
     ENV.fetch('DRIVER_JAR_PATH', Pathname.new("#{Dir.pwd}/vendor/jar-dependencies/test-jars/postgresql-42.2.5.jar").to_s)
-  }
+  end
 
   def query(sql)
-    execute(sql, true)
+    execute(sql, results: true)
   end
 
   def create(sql)
-    execute(sql, false)
+    execute(sql)
   end
 
   def insert(sql)
     execute(sql)
   end
 
-  def execute(sql, results=false)
+  def execute(sql, results: false)
     conn = @connection_manager.getConnection
-    stmt = conn.prepareStatement(sql);
+    stmt = conn.prepareStatement(sql)
     if !results
       stmt.execute
-      return
+      nil
     else
-      rs = stmt.executeQuery()
-      meta = rs.getMetaData()
-      n = meta.getColumnCount()
+      rs = stmt.execute_query
+      meta = rs.getMetaData
+      n = meta.getColumnCount
       results = []
-      while rs.next() do
+      while rs.next
         row = {}
         (1..n).each do |i|
           row[meta.getColumnName(i).to_sym] = rs.getString(i)
@@ -80,19 +75,20 @@ RSpec.shared_context 'postgres' do
       end
       results
     end
-  rescue => e
+  rescue StandardError => e
     puts "Error executing query. sql=#{sql} #{e.message}"
     false
   ensure
-    stmt.close if !stmt.nil? and !stmt.isClosed
-    conn.close if !conn.nil? and !conn.isClosed
+    stmt.close if !stmt.nil? && !stmt.isClosed
+    conn.close if !conn.nil? && !conn.isClosed
   end
 
   def create_tracks_table(schema = '')
     sql = <<-SQL
-    CREATE TABLE IF NOT EXISTS #{ schema.empty? ? schema : schema + '.'}tracks
+    CREATE TABLE IF NOT EXISTS #{schema.empty? ? schema : "#{schema}."}tracks
     (
       id VARCHAR(512) NOT NULL CONSTRAINT tracks_pkey PRIMARY KEY,
+      action VARCHAR(512),
       anonymous_id VARCHAR(512),
       app_name VARCHAR(512),
       context_campaign_content VARCHAR(512),
@@ -137,11 +133,11 @@ RSpec.shared_context 'postgres' do
     stmt = conn.createStatement
     stmt.executeUpdate(sql)
     true
-  rescue => e
+  rescue StandardError => e
     puts "Error executing update. sql=#{sql} #{e.message}"
     false
   ensure
-    stmt.close if !stmt.nil? and !stmt.isClosed
-    conn.close if !conn.nil? and !conn.isClosed
+    stmt.close if !stmt.nil? && !stmt.isClosed
+    conn.close if !conn.nil? && !conn.isClosed
   end
 end

data/spec/{logstash-output-charrington_test_jars.rb → logstash_output_charrington_test_jars.rb}

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'logstash/environment'
 
 root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))

data/spec/outputs/charrington_mysql_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # require_relative '../jdbc_spec_helper'
 
 # describe 'logstash-output-jdbc: mysql', if: ENV['JDBC_MYSQL_JAR'] do

data/spec/outputs/charrington_postgres_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # require_relative '../jdbc_spec_helper'
 
 # describe 'logstash-output-jdbc: postgres', if: ENV['JDBC_POSTGRES_JAR'] do
@@ -39,4 +40,3 @@
 #     }
 #   end
 # end
-

data/spec/outputs/charrington_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/BlockLength
 require_relative '../charrington_spec_helper'
 
 describe LogStash::Outputs::Charrington do
@@ -6,7 +9,7 @@ describe LogStash::Outputs::Charrington do
 
   describe 'a new payload with one event that truncates strings correctly' do
     let(:too_big) do
-      "0123456789" * 30
+      '0123456789' * 30
     end
     let(:config) do
       <<-CONFIG
@@ -34,8 +37,8 @@ describe LogStash::Outputs::Charrington do
       create_tracks_table
       drop_table('schemaless')
       run_pipeline
-      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", :meta_too_big => too_big[0,254], :published_at => "2019-07-29 20:09:18"}])
-      expect(query('SELECT COUNT(1) FROM schemaless').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', meta_too_big: too_big[0, 254], published_at: '2019-07-29 20:09:18' }])
+      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq('1')
     end
   end
 
@@ -64,8 +67,8 @@ describe LogStash::Outputs::Charrington do
     it 'creates a table and inserts a record' do
       drop_table('with_plus')
       run_pipeline
-      expect(query('SELECT * FROM with_plus')).to match_array([{id: "1", app_name: "Web App", event: "with plus +", inserted_at: a_kind_of(String), :meta_type => "XML"}])
-      expect(query('SELECT COUNT(1) FROM with_plus').first[:count]).to eq("1")
+      expect(query('SELECT * FROM with_plus')).to match_array([{ id: '1', app_name: 'Web App', event: 'with plus +', inserted_at: a_kind_of(String), meta_type: 'XML' }])
+      expect(query('SELECT COUNT(1) FROM with_plus').first[:count]).to eq('1')
     end
   end
 
@@ -100,10 +103,10 @@ describe LogStash::Outputs::Charrington do
       drop_table('metadata')
       run_pipeline
       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 metadata').first[:count]).to eq("2")
+                                                               { 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 metadata').first[:count]).to eq('2')
     end
   end
 
@@ -136,18 +139,18 @@ describe LogStash::Outputs::Charrington do
       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"}])
+      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 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: 'existing', inserted_at: a_kind_of(String), meta_type: 'XML'}
-                                                               ])
+                                                               { id: '1', app_name: 'Not Agent', event: nil, inserted_at: a_kind_of(String), meta_type: nil },
+                                                               { id: '2', app_name: 'Web App', event: 'existing', inserted_at: a_kind_of(String), meta_type: 'XML' }
+                                                             ])
     end
   end
 
   describe '2 event payloads with different metadata and different schema' do
-    let(:schema) { "dea_test" }
+    let(:schema) { 'dea_test' }
     let(:config) do
       <<-CONFIG
       input {
@@ -179,10 +182,10 @@ describe LogStash::Outputs::Charrington do
       drop_table("#{schema}.from_agent")
       run_pipeline
       expect(query("SELECT * FROM #{schema}.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 COUNT(1) FROM #{schema}.from_agent").first[:count]).to eq("2")
+                                                                           { 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 COUNT(1) FROM #{schema}.from_agent").first[:count]).to eq('2')
     end
   end
 
@@ -211,8 +214,8 @@ describe LogStash::Outputs::Charrington do
     it 'creates a table and inserts a record' do
       drop_table('camel_case_this')
       run_pipeline
-      expect(query('SELECT * FROM camel_case_this')).to match_array([{id: "1", app_name: "Web App", event: "camelCase this", inserted_at: a_kind_of(String), :meta_type => "XML"}])
-      expect(query('SELECT COUNT(1) FROM camel_case_this').first[:count]).to eq("1")
+      expect(query('SELECT * FROM camel_case_this')).to match_array([{ id: '1', app_name: 'Web App', event: 'camelCase this', inserted_at: a_kind_of(String), meta_type: 'XML' }])
+      expect(query('SELECT COUNT(1) FROM camel_case_this').first[:count]).to eq('1')
     end
   end
 
@@ -221,7 +224,7 @@ describe LogStash::Outputs::Charrington do
       <<-CONFIG
       input {
         generator {
-          message => '{"app_name": "Web App", "event": "schemaless", "meta": { "type": "XML" }, "published_at": "2019-07-29T20:09:18Z", "user_id": "123", "user_uid": "456" }'
+          message => '{"app_name": "Web App", "action": "click", "event": "schemaless", "meta": { "type": "XML" }, "published_at": "2019-07-29T20:09:18Z", "user_id": "123", "user_uid": "456" }'
           codec => 'json'
           count => 1
         }
@@ -244,12 +247,12 @@ describe LogStash::Outputs::Charrington do
       drop_table('schemaless')
       run_pipeline
       expect(query('SELECT * FROM schemaless')).to match_array([
-        {:anonymous_id=>"", :app_name=>"Web App", :event=>"schemaless", :event_text=>"schemaless", :id=>a_kind_of(String), :original_timestamp=>a_kind_of(String), :received_at=>a_kind_of(String), :sent_at=>"2019-07-29 20:09:18", :timestamp=>a_kind_of(String), :type=>"XML", :user_id=>"123", :user_uid=>"456", :uuid_ts=>a_kind_of(String)}
-      ])
-      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq("1")
-      expect(query("SELECT * FROM tracks")).to match_array([
-        {:id=>a_kind_of(String), :anonymous_id=>"", :app_name=>"Web App", :context_campaign_content=>nil, :context_campaign_medium=>nil, :context_campaign_name=>nil, :context_campaign_source=>nil, :context_ip=>nil, :context_library_name=>nil, :context_library_version=>nil, :context_page_path=>nil, :context_page_referrer=>nil, :context_page_search=>nil, :context_page_title=>nil, :context_page_url=>nil, :context_user_agent=>nil, :event=>"schemaless", :event_text=>"schemaless", :original_timestamp=>"2019-07-29 20:09:18", :received_at=>"2019-07-29 20:09:18", :segment_dedupe_id=>nil, :sent_at=>"2019-07-29 20:09:18", :timestamp=>"2019-07-29 20:09:18", :user_id=>"123", :user_uid=>"456", :uuid=>nil, :uuid_ts=>a_kind_of(String)}
-      ])
+                                                                 { anonymous_id: '', action: 'click', app_name: 'Web App', event: 'schemaless', event_text: 'schemaless', id: a_kind_of(String), original_timestamp: a_kind_of(String), received_at: a_kind_of(String), sent_at: '2019-07-29 20:09:18', timestamp: a_kind_of(String), type: 'XML', user_id: '123', user_uid: '456', uuid_ts: a_kind_of(String) }
+                                                               ])
+      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq('1')
+      expect(query('SELECT * FROM tracks')).to match_array([
+                                                             { id: a_kind_of(String), action: 'click', anonymous_id: '', app_name: 'Web App', context_campaign_content: nil, context_campaign_medium: nil, context_campaign_name: nil, context_campaign_source: nil, context_ip: nil, context_library_name: nil, context_library_version: nil, context_page_path: nil, context_page_referrer: nil, context_page_search: nil, context_page_title: nil, context_page_url: nil, context_user_agent: nil, event: 'schemaless', event_text: 'schemaless', original_timestamp: '2019-07-29 20:09:18', received_at: '2019-07-29 20:09:18', segment_dedupe_id: nil, sent_at: '2019-07-29 20:09:18', timestamp: '2019-07-29 20:09:18', user_id: '123', user_uid: '456', uuid: nil, uuid_ts: a_kind_of(String) }
+                                                           ])
     end
   end
 
@@ -281,9 +284,10 @@ describe LogStash::Outputs::Charrington do
       drop_table('schemaless')
       run_pipeline
       expect(query('SELECT * FROM schemaless')).to match_array([
-        {:anonymous_id=>"", :app_name=>"Web App", :event=>"schemaless", :event_text=>"schemaless", :id=>a_kind_of(String), :original_timestamp=>"2019-07-29 20:09:18", :received_at=>"2019-07-29 20:09:18", :sent_at=>"2019-07-29 20:09:18", :timestamp=>"2019-07-29 20:09:18", :type=>"XML", :user_id=>"123", :user_uid=>"456", :uuid_ts=>a_kind_of(String)}
-      ])
-      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq("1")
+                                                                 { anonymous_id: '', app_name: 'Web App', event: 'schemaless', event_text: 'schemaless', id: a_kind_of(String), original_timestamp: '2019-07-29 20:09:18', received_at: '2019-07-29 20:09:18', sent_at: '2019-07-29 20:09:18', timestamp: '2019-07-29 20:09:18', type: 'XML', user_id: '123', user_uid: '456', uuid_ts: a_kind_of(String) }
+                                                               ])
+      expect(query('SELECT COUNT(1) FROM schemaless').first[:count]).to eq('1')
     end
   end
 end
+# rubocop:enable Metrics/BlockLength