fluent-plugin-td 0.10.28 → 0.10.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a57a8ecc7cd03af85dfacdce2623dabf6862c7
-  data.tar.gz: 7e5046ff0e73947ce69d7d3daa40875f3c74be83
+  metadata.gz: 910b18fb23795e9d27ff8ebeb6a382b61a5fe814
+  data.tar.gz: 71d77ea864bde3c88e35a077aaed26a338d0e530
 SHA512:
-  metadata.gz: 07b585a15dad7100ab91e7316c3248772233c70268139b6f762d02bdb8f356b9dbbe06b4c04dac015a92e483e2e4143c77d79ce7a66d6c0c5e4d489101de7645
-  data.tar.gz: fd1d7f3e57dad3acce19569a1e575b7c167c06209a9757a6517e3c8450b78e7e89eef026ab5562d47bd127c5925c3ed284d8982678e1a7283e8a08aeb94dd7c1
+  metadata.gz: fd18a7186e55f8fbd464382572a2b315886578661ca39bbcfdec63ebbe7a384beca2fb6287dc2870e66b469b9e47e7f7a293882bc41b98df74987e5f4abbbdf8
+  data.tar.gz: 80157c8f89bd3c5f8340a5c47b4674e454cd22a04274c1fb4e5bcba19090105f1dc73530c7c9f1a333aea764c0269c9dccb59c30dbcca2bf7c80f40b4cb0473d

data/.travis.yml

@@ -1,10 +1,25 @@
 rvm:
  - 1.9.3
- - 2.0.0
- - 2.1.0
+ - 2.0
+ - 2.1
+ - 2.2.4
+ - 2.3.1
+ - ruby-head
 
 gemfile:
  - Gemfile
- - Gemfile.msgpack.0.4
+ - Gemfile.v0.12
 
+before_install: gem update bundler
 script: bundle exec rake test
+
+sudo: false
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.0
+      gemfile: Gemfile

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.10.29 - 2016/07/06
+
+  * Work with fluentd v0.14
+
+
 Release 0.10.28 - 2015/10/28
 
   * Remove tditem output plugin

data/Gemfile.v0.12

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'json', '= 1.8.3'
+gem 'fluentd', '~> 0.12.0'
+
+gemspec

data/example.conf

@@ -5,7 +5,7 @@
 # Treasure Data output
 # match events whose tag is td.DATABASE.TABLE
 <match td.*.*>
-  type tdlog
+  @type tdlog
   apikey YOUR_API_KEY
 
   auto_create_table
@@ -15,7 +15,7 @@
 
 ## match tag=debug.** and dump to console
 <match debug.**>
-  type stdout
+  @type stdout
 </match>
 
 ####
@@ -24,25 +24,25 @@
 
 ## built-in TCP input
 <source>
-  type forward
+  @type forward
 </source>
 
 ## built-in UNIX socket input
 #<source>
-#  type unix
+#  @type unix
 #</source>
 
 # HTTP input
 # POST http://localhost:8888/<tag>?json=<json>
 # POST http://localhost:8888/td.myapp.login?json={"user"%3A"me"}
 <source>
-  type http
+  @type http
   port 8888
 </source>
 
 ## live debugging agent
 <source>
-  type debug_agent
+  @type debug_agent
   bind 127.0.0.1
   port 24230
 </source>
@@ -54,7 +54,7 @@
 ## File input
 ## read apache logs continuously and tags td.apache.access
 #<source>
-#  type tail
+#  @type tail
 #  format apache
 #  path /var/log/httpd-access.log
 #  tag td.apache.access
@@ -63,14 +63,14 @@
 ## File output
 ## match tag=local.** and write to file
 #<match local.**>
-#  type file
+#  @type file
 #  path /var/log/td-agent/access
 #</match>
 
 ## Forwarding
 ## match tag=system.** and forward to another td-agent server
 #<match system.**>
-#  type forward
+#  @type forward
 #  host 192.168.0.11
 #  # secondary host is optional
 #  <secondary>
@@ -81,16 +81,16 @@
 ## Multiple output
 ## match tag=td.*.* and output to Treasure Data AND file
 #<match td.*.*>
-#  type copy
+#  @type copy
 #  <store>
-#    type tdlog
+#    @type tdlog
 #    apikey API_KEY
 #    auto_create_table
 #    buffer_type file
 #    buffer_path /var/log/td-agent/buffer/td
 #  </store>
 #  <store>
-#    type file
+#    @type file
 #    path /var/log/td-agent/td-%Y-%m-%d/%H.log
 #  </store>
 #</match>

data/lib/fluent/plugin/out_tdlog.rb

@@ -1,4 +1,5 @@
 require 'td-client'
+require 'fluent/output'
 require 'fluent/plugin/td_plugin_version'
 
 module Fluent
@@ -21,7 +22,6 @@ module Fluent
     config_param :connect_timeout, :integer, :default => nil
     config_param :read_timeout, :integer, :default => nil
     config_param :send_timeout, :integer, :default => nil
-    config_set_default :buffer_type, 'file'
     config_set_default :flush_interval, 300
 
     def initialize
@@ -45,6 +45,16 @@ module Fluent
     end
 
     def configure(conf)
+      # overwrite default value of buffer_chunk_limit
+      unless conf.has_key?('buffer_chunk_limit')
+        conf['buffer_chunk_limit'] = IMPORT_SIZE_LIMIT
+      end
+
+      # v0.14 seems to have a bug of config_set_default: https://github.com/treasure-data/fluent-plugin-td/pull/22#issuecomment-230782005
+      unless conf.has_key?('buffer_type')
+        conf['buffer_type'] = 'file'
+      end
+
       super
 
       if @use_gzip_command
@@ -57,11 +67,6 @@ module Fluent
         end
       end
 
-      # overwrite default value of buffer_chunk_limit
-      if !conf['buffer_chunk_limit']
-        @buffer.buffer_chunk_limit = IMPORT_SIZE_LIMIT
-      end
-
       if conf.has_key?('tmpdir')
         @tmpdir = conf['tmpdir']
         FileUtils.mkdir_p(@tmpdir)

data/lib/fluent/plugin/td_plugin_version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module TreasureDataPlugin
-    VERSION = '0.10.28'
+    VERSION = '0.10.29'
   end
 end

data/test/plugin/test_out_tdlog.rb

@@ -3,11 +3,6 @@ require 'fluent/plugin/out_tdlog'
 require 'test_helper.rb'
 
 class TreasureDataLogOutputTest < Test::Unit::TestCase
-  # BufferedOutputTestDriver uses module_eval, not inheritance.
-  # This DummyOutput is for testing actual write method with webmock
-  class TreasureDataLogDummyOutput < Fluent::TreasureDataLogOutput
-  end
-
   def setup
     Fluent::Test.setup
   end
@@ -25,9 +20,12 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
       buffer_path #{TMP_DIR}/buffer
     ] + conf
 
-    Fluent::Test::BufferedOutputTestDriver.new(TreasureDataLogDummyOutput) do
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::TreasureDataLogOutput) do
       def write(chunk)
         chunk.instance_variable_set(:@key, @key)
+        def chunk.key
+          @key
+        end
         super(chunk)
       end
     end.configure(config)
@@ -51,7 +49,7 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
     assert_rr {
       # mock(d.instance).gzip_by_writer(is_a(Fluent::BufferChunk), is_a(Tempfile)) causes empty request body so using dont_allow instead to check calling method
       # We need actual gzipped content to verify compressed body is correct or not.
-      dont_allow(d.instance).gzip_by_command(is_a(Fluent::BufferChunk), is_a(Tempfile))
+      dont_allow(d.instance).gzip_by_command(anything, is_a(Tempfile))
 
       records.each { |record|
         d.emit(record, time)
@@ -70,7 +68,7 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
     stub_td_import_request(stub_request_body(records, time), database, table)
     assert_rr {
       # same as test_emit
-      dont_allow(d.instance).gzip_by_writer(is_a(Fluent::BufferChunk), is_a(Tempfile))
+      dont_allow(d.instance).gzip_by_writer(anything, is_a(Tempfile))
 
       records.each { |record|
         d.emit(record, time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.28
+  version: 0.10.29
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -112,6 +112,7 @@ files:
 - ChangeLog
 - Gemfile
 - Gemfile.msgpack.0.4
+- Gemfile.v0.12
 - README.rdoc
 - Rakefile
 - example.conf
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Treasure Data Cloud Data Service plugin for Fluentd