fluentd 0.14.3 → 0.14.4

data/test/test_filter.rb

@@ -23,17 +23,57 @@ class FilterTest < Test::Unit::TestCase
   end
 
   sub_test_case 'configure' do
-    test 'check default' do
-      assert_nothing_raised { create_driver }
+    test 'check to implement `filter` method' do
+      klass = Class.new(Fluent::Filter) do |c|
+        def filter(tag, time, record); end
+      end
+
+      assert_nothing_raised do
+        klass.new
+      end
+    end
+
+    test 'check to implement `filter_with_time` method' do
+      klass = Class.new(Fluent::Filter) do |c|
+        def filter_with_time(tag, time, record); end
+      end
+
+      assert_nothing_raised do
+        klass.new
+      end
+    end
+
+    test 'DO NOT check when implement `filter_stream`' do
+      klass = Class.new(Fluent::Filter) do |c|
+        def filter_stream(tag, es); end
+      end
+
+      assert_nothing_raised do
+        klass.new
+      end
     end
-  end
 
-  sub_test_case 'filter' do
     test 'NotImplementedError' do
-      not_implemented_filter = Class.new(Fluent::Filter)
-      assert_raise(NotImplementedError) { emit(not_implemented_filter, ['foo']) }
+      klass = Class.new(Fluent::Filter)
+
+      assert_raise NotImplementedError do
+        klass.new
+      end
+    end
+
+    test 'duplicated method implementation' do
+      klass = Class.new(Fluent::Filter) do |c|
+        def filter(tag, time, record); end
+        def filter_with_time(tag, time, record); end
+      end
+
+      assert_raise do
+        klass.new
+      end
     end
+  end
 
+  sub_test_case 'filter' do
     test 'null filter' do
       null_filter = Class.new(Fluent::Filter) do |c|
         def filter(tag, time, record)
@@ -61,6 +101,7 @@ class FilterTest < Test::Unit::TestCase
         def filter_stream(tag, es)
           MultiEventStream.new
         end
+        def filter(tag, time, record); record; end
       end
       es = emit(null_filter, ['foo'])
       assert_equal(0, es.instance_variable_get(:@record_array).size)
@@ -71,6 +112,7 @@ class FilterTest < Test::Unit::TestCase
         def filter_stream(tag, es)
           es
         end
+        def filter(tag, time, record); record; end
       end
       es = emit(pass_filter, ['foo'])
       assert_equal(1, es.instance_variable_get(:@record_array).size)

data/test/test_log.rb

@@ -1,17 +1,19 @@
 require_relative 'helper'
 require 'fluent/engine'
 require 'fluent/log'
+require 'timecop'
 
 class LogTest < Test::Unit::TestCase
   def setup
     @log_device = Fluent::Test::DummyLogDevice.new
     @timestamp = Time.parse("2016-04-21 11:58:41 +0900")
     @timestamp_str = @timestamp.strftime("%Y-%m-%d %H:%M:%S %z")
-    stub(Time).now { @timestamp }
+    Timecop.freeze(@timestamp)
   end
 
   def teardown
     @log_device.reset
+    Timecop.return
     Thread.current[:last_repeated_stacktrace] = nil
   end
 
@@ -409,7 +411,7 @@ class PluginLoggerTest < Test::Unit::TestCase
     @log_device = Fluent::Test::DummyLogDevice.new
     @timestamp = Time.parse("2016-04-21 11:58:41 +0900")
     @timestamp_str = @timestamp.strftime("%Y-%m-%d %H:%M:%S %z")
-    stub(Time).now { @timestamp }
+    Timecop.freeze(@timestamp)
     dl_opts = {}
     dl_opts[:log_level] = ServerEngine::DaemonLogger::TRACE
     logdev = @log_device
@@ -419,6 +421,7 @@ class PluginLoggerTest < Test::Unit::TestCase
 
   def teardown
     @log_device.reset
+    Timecop.return
     Thread.current[:last_repeated_stacktrace] = nil
   end
 

data/test/test_output.rb

@@ -65,6 +65,20 @@ module FluentOutputTest
       # assert_equal Float, d.instance.retry_wait.class
     end
 
+    class FormatterInjectTestOutput < Fluent::Output
+      def initialize
+        super
+        @formatter = nil
+      end
+    end
+    def test_start
+      i = FormatterInjectTestOutput.new
+      i.configure(config_element('ROOT', '', {}, [config_element('inject', '', {'hostname_key' => "host"})]))
+      assert_nothing_raised do
+        i.start
+      end
+    end
+
     def create_mock_driver(conf=CONFIG)
       Fluent::Test::BufferedOutputTestDriver.new(Fluent::BufferedOutput) do
         attr_accessor :submit_flush_threads
@@ -95,12 +109,37 @@ module FluentOutputTest
     end
 
     def test_secondary
-      d = create_driver(CONFIG + %[
+      d = Fluent::Test::BufferedOutputTestDriver.new(Fluent::BufferedOutput) do
+        def write(chunk)
+          chunk.read
+        end
+      end
+
+      mock(d.instance.log).warn("secondary type should be same with primary one",
+                                { primary: d.instance.class.to_s, secondary: "Fluent::Plugin::Test2Output" })
+      d.configure(CONFIG + %[
         <secondary>
           type test2
           name c0
         </secondary>
       ])
+
+      assert_not_nil d.instance.instance_variable_get(:@secondary).router
+    end
+
+    def test_secondary_with_no_warn_log
+      # ObjectBufferedOutput doesn't implemnt `custom_filter`
+      d = Fluent::Test::BufferedOutputTestDriver.new(Fluent::ObjectBufferedOutput)
+
+      mock(d.instance.log).warn("secondary type should be same with primary one",
+                                { primary: d.instance.class.to_s, secondary: "Fluent::Plugin::Test2Output" }).never
+      d.configure(CONFIG + %[
+        <secondary>
+          type test2
+          name c0
+        </secondary>
+      ])
+
       assert_not_nil d.instance.instance_variable_get(:@secondary).router
     end
   end
@@ -165,6 +204,7 @@ module FluentOutputTest
       test "emit with invalid event" do
         d = create_driver
         d.instance.start
+        d.instance.after_start
         assert_raise ArgumentError, "time must be a Fluent::EventTime (or Integer)" do
           d.instance.emit_events('test', OneEventStream.new('string', 10))
         end

data/test/test_plugin_classes.rb

@@ -1,24 +1,26 @@
 require_relative 'helper'
-require 'fluent/input'
-require 'fluent/output'
-require 'fluent/filter'
+require 'fluent/plugin/input'
+require 'fluent/plugin/output'
+require 'fluent/plugin/filter'
 
 module FluentTest
-  class FluentTestInput < ::Fluent::Input
+  class FluentTestInput < ::Fluent::Plugin::Input
     ::Fluent::Plugin.register_input('test_in', self)
 
     attr_reader :started
 
     def start
+      super
       @started = true
     end
 
     def shutdown
       @started = false
+      super
     end
   end
 
-  class FluentTestOutput < ::Fluent::Output
+  class FluentTestOutput < ::Fluent::Plugin::Output
     ::Fluent::Plugin.register_output('test_out', self)
 
     def initialize
@@ -30,21 +32,23 @@ module FluentTest
     attr_reader :started
 
     def start
+      super
       @started = true
     end
 
     def shutdown
       @started = false
+      super
     end
 
-    def emit(tag, es, chain)
-      es.each { |time, record|
+    def process(tag, es)
+      es.each do |time, record|
         @events[tag] << record
-      }
+      end
     end
   end
 
-  class FluentTestErrorOutput < ::Fluent::BufferedOutput
+  class FluentTestErrorOutput < ::Fluent::Plugin::Output
     ::Fluent::Plugin.register_output('test_out_error', self)
 
     def format(tag, time, record)
@@ -69,11 +73,13 @@ module FluentTest
     attr_reader :started
 
     def start
+      super
       @started = true
     end
 
     def shutdown
       @started = false
+      super
     end
 
     def filter(tag, time, record)
@@ -96,11 +102,13 @@ module FluentTest
     attr_reader :started
 
     def start
+      super
       @started = true
     end
 
     def shutdown
       @started = false
+      super
     end
 
     def filter(tag, time, record)

data/test/test_root_agent.rb

@@ -129,4 +129,150 @@ EOC
       assert_false @ra.outputs.first.started
     end
   end
+
+  sub_test_case 'configured with MultiOutput plugins' do
+    setup do
+      @ra = RootAgent.new(log: $log)
+      stub(Engine).root_agent { @ra }
+      @ra.configure(Config.parse(<<-EOC, "(test)", "(test_dir)", true))
+<source>
+  @type test_in
+  @id test_in
+</source>
+<filter>
+  @type test_filter
+  @id test_filter
+</filter>
+<match **>
+  @type copy
+  @id test_copy
+  <store>
+    @type test_out
+    @id test_out1
+  </store>
+  <store>
+    @type test_out
+    @id test_out2
+  </store>
+</match>
+EOC
+      @ra
+    end
+
+    test 'plugin status with multi output' do
+      assert_equal 1, @ra.inputs.size
+      assert_equal 1, @ra.filters.size
+      assert_equal 3, @ra.outputs.size
+
+      @ra.start
+      assert_equal [true], @ra.inputs.map{|i| i.started? }
+      assert_equal [true], @ra.filters.map{|i| i.started? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.started? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.after_started? }
+      assert_equal [true], @ra.filters.map{|i| i.after_started? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.after_started? }
+
+      @ra.shutdown
+      assert_equal [true], @ra.inputs.map{|i| i.stopped? }
+      assert_equal [true], @ra.filters.map{|i| i.stopped? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.stopped? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.before_shutdown? }
+      assert_equal [true], @ra.filters.map{|i| i.before_shutdown? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.before_shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.shutdown? }
+      assert_equal [true], @ra.filters.map{|i| i.shutdown? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.after_shutdown? }
+      assert_equal [true], @ra.filters.map{|i| i.after_shutdown? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.after_shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.closed? }
+      assert_equal [true], @ra.filters.map{|i| i.closed? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.closed? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.terminated? }
+      assert_equal [true], @ra.filters.map{|i| i.terminated? }
+      assert_equal [true, true, true], @ra.outputs.map{|i| i.terminated? }
+    end
+  end
+
+  sub_test_case 'configured with MultiOutput plugins and labels' do
+    setup do
+      @ra = RootAgent.new(log: $log)
+      stub(Engine).root_agent { @ra }
+      @ra.configure(Config.parse(<<-EOC, "(test)", "(test_dir)", true))
+<source>
+  @type test_in
+  @id test_in
+  @label @testing
+</source>
+<label @testing>
+  <filter>
+    @type test_filter
+    @id test_filter
+  </filter>
+  <match **>
+    @type copy
+    @id test_copy
+    <store>
+      @type test_out
+      @id test_out1
+    </store>
+    <store>
+      @type test_out
+      @id test_out2
+    </store>
+  </match>
+</label>
+EOC
+      @ra
+    end
+
+    test 'plugin status with multi output' do
+      assert_equal 1, @ra.inputs.size
+      assert_equal 0, @ra.filters.size
+      assert_equal 0, @ra.outputs.size
+      assert_equal 1, @ra.labels.size
+      assert_equal '@testing', @ra.labels.keys.first
+      assert_equal 1, @ra.labels.values.first.filters.size
+      assert_equal 3, @ra.labels.values.first.outputs.size
+
+      label_filters = @ra.labels.values.first.filters
+      label_outputs = @ra.labels.values.first.outputs
+
+      @ra.start
+      assert_equal [true], @ra.inputs.map{|i| i.started? }
+      assert_equal [true], label_filters.map{|i| i.started? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.started? }
+
+      @ra.shutdown
+      assert_equal [true], @ra.inputs.map{|i| i.stopped? }
+      assert_equal [true], label_filters.map{|i| i.stopped? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.stopped? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.before_shutdown? }
+      assert_equal [true], label_filters.map{|i| i.before_shutdown? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.before_shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.shutdown? }
+      assert_equal [true], label_filters.map{|i| i.shutdown? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.after_shutdown? }
+      assert_equal [true], label_filters.map{|i| i.after_shutdown? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.after_shutdown? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.closed? }
+      assert_equal [true], label_filters.map{|i| i.closed? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.closed? }
+
+      assert_equal [true], @ra.inputs.map{|i| i.terminated? }
+      assert_equal [true], label_filters.map{|i| i.terminated? }
+      assert_equal [true, true, true], label_outputs.map{|i| i.terminated? }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -56,42 +48,30 @@ dependencies:
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -130,84 +110,84 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: strptime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.3
 - !ruby/object:Gem::Dependency
@@ -216,70 +196,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -331,6 +311,7 @@ files:
 - example/in_tail.conf
 - example/in_tcp.conf
 - example/in_udp.conf
+- example/multi_filters.conf
 - example/out_buffered_null.conf
 - example/out_copy.conf
 - example/out_file.conf
@@ -554,6 +535,7 @@ files:
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
+- test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
@@ -702,6 +684,7 @@ test_files:
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
+- test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
@@ -781,3 +764,4 @@ test_files:
 - test/test_supervisor.rb
 - test/test_time_formatter.rb
 - test/test_unique_id.rb
+has_rdoc: false