fluent-plugin-postgres 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc444608cda7a7c9564dfef3351887db330fd89fd07544dc70e63c05a50804f
-  data.tar.gz: b8ab67866697933b5f04e5715b82d9a0a5cc9773e04a5d1b8c5c8994e74ed4da
+  metadata.gz: 722f5f89deefecc29b2b0af9f988deeede2a3844cdbb45b45912735de81baee6
+  data.tar.gz: 87fc645e91e9ceeaf92046819acc4c265b36240678c7ea30f55d402448648444
 SHA512:
-  metadata.gz: 49d8fc658ee51563dec9310093ffa0bee409b7a5a8f401103bf6b78c39a5198956f80b47b45d02f2dfbdcb0d6d5bbab3231ad68ed893ca67310262887919df63
-  data.tar.gz: 465de8a0e4a8f31d808cb19c359a7bbd59a45111a35c90559be620130accba79b76052a887ef6fa22aa8dd3ed0c4532050f363da935c37bbfc5c1ae2ed075434
+  metadata.gz: cfc1105541ab9e8aa9605d1be5fb33d0b37f071b4bced59c411fa4a067232c29f836bb1d38a77be232765b9302f7ac89bcb96a5df218b7ef63e931ba70d782dd
+  data.tar.gz: 40212f615e954ba04ee807c4bc866b74e144cdc9886ad86cd34554d78c4c4e655895c16a881b84d22b5e33889802c98acebdf0f9749b40a17d2846e4cc9246ab

data/fluent-plugin-postgres.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-postgres'
-  s.version       = '0.0.2'
+  s.version       = '0.1.0'
   s.authors       = ['TAGOMORI Satoshi', 'Diogo Terror', 'pitr']
   s.email         = ['team@uken.com']
   s.description   = %q{fluent plugin to insert on PostgreSQL}
   s.summary       = %q{fluent plugin to insert on PostgreSQL}
   s.homepage      = 'https://github.com/uken/fluent-plugin-postgres'
-  s.license       = 'Apache 2.0'
+  s.license       = 'Apache-2.0'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_dependency 'fluentd'
+  s.add_dependency 'fluentd', ['>= 0.14.15', '< 2']
   s.add_dependency 'pg'
 
   s.add_development_dependency 'rake'

data/lib/fluent/plugin/out_postgres.rb

@@ -1,8 +1,10 @@
-class Fluent::PostgresOutput < Fluent::BufferedOutput
+require 'fluent/plugin/output'
+require 'pg'
+
+class Fluent::Plugin::PostgresOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('postgres', self)
 
-  include Fluent::SetTimeKeyMixin
-  include Fluent::SetTagKeyMixin
+  helpers :inject, :compat_parameters
 
   config_param :host, :string
   config_param :port, :integer, :default => nil
@@ -19,13 +21,9 @@ class Fluent::PostgresOutput < Fluent::BufferedOutput
 
   attr_accessor :handler
 
-  def initialize
-    super
-    require 'pg'
-  end
-
   # We don't currently support mysql's analogous json format
   def configure(conf)
+    compat_parameters_convert(conf, :inject)
     super
 
     if @format == 'json'
@@ -52,9 +50,18 @@ class Fluent::PostgresOutput < Fluent::BufferedOutput
   end
 
   def format(tag, time, record)
+    record = inject_values_to_record(tag, time, record)
     [tag, time, @format_proc.call(tag, time, record)].to_msgpack
   end
 
+  def multi_workers_ready?
+    true
+  end
+
+  def formatted_to_msgpack_binary?
+    true
+  end
+
   def client
     PG::Connection.new({
       :host => @host, :port => @port,

data/test/helper.rb

@@ -12,6 +12,8 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|
@@ -25,4 +27,5 @@ end
 require 'fluent/plugin/out_postgres'
 
 class Test::Unit::TestCase
+  include Fluent::Test::Helpers
 end

data/test/plugin/test_out_postgres.rb

@@ -15,8 +15,8 @@ key_names field1,field2,field3
 sql INSERT INTO baz (col1,col2,col3,col4) VALUES (?,?,?,?)
   ]
 
-  def create_driver(conf=CONFIG, tag='test')
-    d = Fluent::Test::BufferedOutputTestDriver.new(Fluent::PostgresOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    d = Fluent::Test::Driver::Output.new(Fluent::Plugin::PostgresOutput).configure(conf)
     d.instance.instance_eval {
       def client
         obj = Object.new
@@ -85,11 +85,12 @@ sql INSERT INTO baz (coltime,coltag,col1,col2,col3,col4) VALUES (?,?,?,?,?,?)
     ]
     assert_equal 'INSERT INTO baz (coltime,coltag,col1,col2,col3,col4) VALUES (?,?,?,?,?,?)', d.instance.sql
 
-    time = Time.utc(2012,12,17,1,23,45).to_i
+    time = event_time('2012-12-17 01:23:45 UTC')
     record = {'field1'=>'value1','field2'=>'value2','field3'=>'value3','field4'=>'value4'}
-    d.emit(record, time)
-    d.expect_format ['test', time, ['2012-12-17T01:23:45Z','test','value1','value2','value3','value4']].to_msgpack
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
+    assert_equal ['test', time, ['2012-12-17T01:23:45Z','test','value1','value2','value3','value4']].to_msgpack, d.formatted[0]
   end
 
   def test_time_and_tag_key_complex
@@ -110,11 +111,11 @@ sql INSERT INTO baz (coltime,coltag,col1,col2,col3,col4) VALUES (?,?,?,?,?,?)
     ]
     assert_equal 'INSERT INTO baz (coltime,coltag,col1,col2,col3,col4) VALUES (?,?,?,?,?,?)', d.instance.sql
 
-    time = Time.new(2012,12,17,9,23,45,'+09:00').to_i
+    time = event_time('2012-12-17 09:23:45 +0900')
     record = {'field1'=>'value1','field2'=>'value2','field3'=>'value3','field4'=>'value4'}
-    d.emit(record, time)
-    d.expect_format ['test', time, ['20121217-002345','test','value1','value2','value3','value4']].to_msgpack
-    d.run
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
+    assert_equal ['test', time, ['20121217-002345','test','value1','value2','value3','value4']].to_msgpack, d.formatted[0]
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -18,14 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +92,7 @@ files:
 - test/plugin/test_out_postgres.rb
 homepage: https://github.com/uken/fluent-plugin-postgres
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []