logstash-output-charrington 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fef656027952ae8fd353066e05b572c76bf5632a1af82ff402dda7fe2fc79e
-  data.tar.gz: ebb249f4b2b5ad42bafce89725635017dbcc81be865a933dd6ac0a83709e5e82
+  metadata.gz: 2ae644e2b642cfbf37d315289ff166d7b03e19865dd50320126e71f50954965c
+  data.tar.gz: 5af164f7c8a73ed16001ef89922095bb0d37699fbc7c144c06eff4ab23e0481a
 SHA512:
-  metadata.gz: ede84fd07dd59e83de1338b2d095a5d5818074e10ebb13131ccc22e6cf0874c8b182190b099f7b2df1e09f110b8d9e9a63cabd4add3505ac14ecb50de016ceb6
-  data.tar.gz: 84a254e11976eecaa84bb5057d153035f5578039b1da666993bd01be421d8801cfa29604fd50461f53c6bd7d479ccdb617e0043d03fc3ab854a971498d57bd73
+  metadata.gz: 5f6583538a0632625e50bb48e6b48864455c2edb0987d434bda4f31edd0479b4805e72974feb0213496f6db77bb6e133661e09d448ac4423cd69bce5ddf07c9e
+  data.tar.gz: 7f3cf086ba6be74f724beed922eaf3fc8d8dc8dcabf24a599cce0ac5acbc1cc8ae927d0d10f0da8e287c00145cdbaa770141d7608e79966dcfb521bdde91c76e

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

@@ -176,11 +176,15 @@ module Charrington
         values << value
 
         if @@timestamp_columns.include?(key)
-          format = java.text.SimpleDateFormat.new("yyyy-MM-dd'T'HH:mm:ss'Z'")
-          parsed = format.parse(value)
-          time = java.sql.Timestamp.new(parsed.getTime)
-          stmt.setTimestamp(pos, time)
-          next
+          begin
+            time = parse_date(value)
+            stmt.setTimestamp(pos, time)
+            next
+          rescue java.text.ParseException => e
+            time = parse_date(value, "yyyy-MM-dd'T'HH:mm:ss'Z'")
+            stmt.setTimestamp(pos, time)
+            next
+          end
         end
 
         case value
@@ -212,6 +216,11 @@ module Charrington
     end
 
     ### Helpers
+    def parse_date(date, fmt = "yyyy-MM-dd'T'HH:mm:ss.S'Z'")
+      format = java.text.SimpleDateFormat.new(fmt)
+      parsed = format.parse(date)
+      java.sql.Timestamp.new(parsed.getTime)
+    end
 
     def arr_to_csv(arr)
       '(' + arr.join(', ') + ')'

data/logstash-output-charrington.gemspec

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

data/spec/charrington_spec_helper.rb

@@ -19,10 +19,14 @@ RSpec.shared_context 'pipeline' do
 end
 
 RSpec.shared_context 'postgres' do
-  def start_database(host='localhost', port=57354, database='winston', user='testuser', password='password')
-    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"]))
+  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
 
     # setup connection manager
     @connection_manager = Java::ComZaxxerHikari::HikariDataSource.new
@@ -33,7 +37,11 @@ RSpec.shared_context 'postgres' do
   end
 
   before(:all) do
-    start_database
+    if ENV.fetch("TEST_ENV", "").to_s.casecmp?("ci")
+      start_database(false, 'postgres', 5432, 'postgres', 'postgres', '')
+    else
+      start_database
+    end
   end
 
   let(:driver_path) {

data/spec/outputs/charrington_spec.rb

@@ -248,7 +248,7 @@ describe LogStash::Outputs::Charrington do
       ])
       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=>nil, :received_at=>nil, :segment_dedupe_id=>nil, :sent_at=>a_kind_of(String), :timestamp=>nil, :user_id=>"123", :user_uid=>"456", :uuid=>nil, :uuid_ts=>a_kind_of(String)}
+        {: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)}
       ])
     end
   end

metadata

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