fluent-plugin-rds-pgsql-log 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef1de71b76cd256ade578928b9799c8a728ba8c
-  data.tar.gz: b32866f201c50d4e94a0c608db3762516500e5f1
+  metadata.gz: fe0c978c0df512f082cd523a4b5816a01e5b14cb
+  data.tar.gz: ebbb1604b7e59d4f9c20ab02bf155994b64e34e4
 SHA512:
-  metadata.gz: 48d95204d022492d2a38a7070e2dfe1bb8bb9a960a90f5d7cab78efbddd147c0707ee391d863430cbf24a00f41cd67028646f9b119246989da14d050c4cb0117
-  data.tar.gz: 0f234c127f0ff778cc5914a837be2e77bbed9fbe661e4848ce585c30fa2146dd2acb65f8172e8e5fa7f0c0b61687a23ae971a9e803cd81e3ee46034d760bb541
+  metadata.gz: f791ec9fee312a1f1ff51708a72cd01fdf889389fe81c5842375b61b8ccedb5c3f981ac1cd30844ad3072eb4bef8437f73682e49327f88b0dba85535f8b78b4b
+  data.tar.gz: 5e8d3618e0d1f6e9b42f929136058bbd1e058a17efda2bfad2d6db00f3d14d333bdbdabe503ad431fbfcc43e604d8134ccfc511b0d85c8a0e360a747178cb731

data/.gitignore

@@ -1,3 +1,5 @@
 *.gem
 fluent.conf
-
+coverage/
+pgsql-log-pos.dat
+Gemfile.lock

data/Rakefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+ENV['TZ'] = 'UTC'
 require "bundler/gem_tasks"
 
 require "rake/testtask"

data/fluent-plugin-rds-pgsql-log.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rds-pgsql-log"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon RDS for PostgreSQL log input plugin"
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fluentd", ">= 0.14.0", "< 2"
-  spec.add_dependency "aws-sdk", "~> 3"
+  spec.add_dependency "aws-sdk-ec2", "~> 1"
+  spec.add_dependency "aws-sdk-rds", "~> 1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 12"

data/lib/fluent/plugin/in_rds_pgsql_log.rb

@@ -1,5 +1,6 @@
 require 'fluent/input'
-require 'aws-sdk'
+require 'aws-sdk-ec2'
+require 'aws-sdk-rds'
 
 class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
   Fluent::Plugin.register_input('rds_pgsql_log', self)
@@ -177,6 +178,11 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
     return raw_records
   end
 
+  def event_time_of_row(record)
+    time = Time.parse(record["time"])
+    return Fluent::EventTime.from_time(time)
+  end
+
   def parse_and_emit(raw_records, log_file_name)
     begin
       log.debug "raw_records.count: #{raw_records.count}"
@@ -190,7 +196,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
           record["message"] << "\n" + raw_record unless record.nil?
         else
           # emit before record
-          router.emit(@tag, Time.parse(record["time"]), record) unless record.nil?
+          router.emit(@tag, event_time_of_row(record), record) unless record.nil?
 
           # set a record
           record = {
@@ -206,7 +212,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
         end
       end
       # emit last record
-      router.emit(@tag, Time.parse(record["time"]), record) unless record.nil?
+      router.emit(@tag, event_time_of_row(record), record) unless record.nil?
     rescue => e
       log.warn e.message
     end

data/test/plugin/test_in_rds_pgsql.rb

@@ -76,7 +76,8 @@ class RdsPgsqlLogInputTest < Test::Unit::TestCase
     d.run(timeout: 3, expect_emits: 1)
 
     events = d.events
-    assert_equal(events[0][1].iso8601, "2019-01-26T22:10:20Z")
+    assert_instance_of(Fluent::EventTime, events[0][1])
+    assert_equal(events[0][1].inspect, "2019-01-26 22:10:20.000000000 +0000")
     assert_equal(events[0][2]["pid"], '129155')
     assert_equal(events[0][2]["message_level"], 'LOG')
     assert_equal(events[0][2]["message"], 'some db log')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-pgsql-log
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,19 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-rds
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement