fluentd 1.13.0-x64-mingw32 → 1.14.0-x64-mingw32

data/test/plugin/test_out_stream.rb

@@ -52,20 +52,30 @@ end
 class TcpOutputTest < Test::Unit::TestCase
   include StreamOutputTest
 
-  PORT = unused_port
-  CONFIG = %[
-    port #{PORT}
-    host 127.0.0.1
-    send_timeout 51
-  ]
+  def setup
+    super
+    @port = unused_port
+  end
 
-  def create_driver(conf=CONFIG)
+  def teardown
+    @port = nil
+  end
+
+  def config
+    %[
+      port #{@port}
+      host 127.0.0.1
+      send_timeout 51
+    ]
+  end
+
+  def create_driver(conf=config)
     super(Fluent::TcpOutput, conf)
   end
 
   def test_configure
     d = create_driver
-    assert_equal PORT, d.instance.port
+    assert_equal @port, d.instance.port
     assert_equal '127.0.0.1', d.instance.host
     assert_equal 51, d.instance.send_timeout
   end

data/test/plugin/test_output.rb

@@ -223,6 +223,22 @@ class OutputTest < Test::Unit::TestCase
       assert @i.terminated?
     end
 
+    test 'can use metrics plugins and fallback methods' do
+      @i.configure(config_element())
+
+      %w[num_errors_metrics emit_count_metrics emit_size_metrics emit_records_metrics
+         write_count_metrics rollback_count_metrics flush_time_count_metrics slow_flush_count_metrics].each do |metric_name|
+        assert_true @i.instance_variable_get(:"@#{metric_name}").is_a?(Fluent::Plugin::Metrics)
+      end
+
+      assert_equal 0, @i.num_errors
+      assert_equal 0, @i.emit_count
+      assert_equal 0, @i.emit_size
+      assert_equal 0, @i.emit_records
+      assert_equal 0, @i.write_count
+      assert_equal 0, @i.rollback_count
+    end
+
     data(:new_api => :chunk,
          :old_api => :metadata)
     test '#extract_placeholders does nothing if chunk key is not specified' do |api|

data/test/plugin_helper/http_server/test_route.rb

@@ -20,7 +20,7 @@ unless skip
       test 'use default app if path is not found' do
         router = Fluent::PluginHelper::HttpServer::Router.new
         req = flexmock('request', path: 'path/')
-        assert_equal(router.route!(:get, '/path/', req), [404, { 'Content-Type' => 'text/plain' }, "404 Not Found: #{req.path}\n"])
+        assert_equal(router.route!(:get, '/path/', req), [404, { 'Content-Type' => 'text/plain' }, "404 Not Found\n"])
       end
 
       test 'default app is configurable' do

data/test/plugin_helper/test_child_process.rb

@@ -560,7 +560,7 @@ class ChildProcessTest < Test::Unit::TestCase
       proc_lines = []
       Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
         ran = false
-        @d.child_process_execute(:t14, "ruby", arguments:['-e', 'sleep 10; puts "hello"'], subprocess_name: "sleeeeeeeeeper", mode: [:read]) do |readio|
+        @d.child_process_execute(:t14, "/bin/sh", arguments:['-c', 'sleep 10; echo "hello"'], subprocess_name: "sleeeeeeeeeper", mode: [:read]) do |readio|
           m.lock
           ran = true
           pids << @d.child_process_id

data/test/plugin_helper/test_event_emitter.rb

@@ -1,6 +1,7 @@
 require_relative '../helper'
 require 'fluent/plugin_helper/event_emitter'
 require 'fluent/plugin/base'
+require 'flexmock/test_unit'
 
 class EventEmitterTest < Test::Unit::TestCase
   setup do
@@ -48,4 +49,32 @@ class EventEmitterTest < Test::Unit::TestCase
 
     d1.terminate
   end
+
+  test 'should not have event_emitter_router' do
+    d0 = Dummy0.new
+    assert !d0.respond_to?(:event_emitter_router)
+  end
+
+  test 'should have event_emitter_router' do
+    d = Dummy.new
+    assert d.respond_to?(:event_emitter_router)
+  end
+
+  test 'get router' do
+    router_mock = flexmock('mytest')
+    label_mock = flexmock('mylabel')
+    label_mock.should_receive(:event_router).twice.and_return(router_mock)
+    Fluent::Engine.root_agent.labels['@mytest'] = label_mock
+
+    d = Dummy.new
+    d.configure(config_element('ROOT', '', {'@label' => '@mytest'}))
+    router = d.event_emitter_router("@mytest")
+    assert_equal router_mock, router
+  end
+
+  test 'get root router' do
+    d = Dummy.new
+    router = d.event_emitter_router("@ROOT")
+    assert_equal Fluent::Engine.root_agent.event_router, router
+  end
 end

data/test/plugin_helper/test_http_server_helper.rb

@@ -9,11 +9,18 @@ require 'openssl'
 require 'async'
 
 class HttpHelperTest < Test::Unit::TestCase
-  PORT = unused_port
   NULL_LOGGER = Logger.new(nil)
   CERT_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/without_ca')
   CERT_CA_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/with_ca')
 
+  def setup
+    @port = unused_port
+  end
+
+  def teardown
+    @port = nil
+  end
+
   class Dummy < Fluent::Plugin::TestBase
     helpers :http_server
   end
@@ -147,7 +154,7 @@ class HttpHelperTest < Test::Unit::TestCase
   sub_test_case 'Create a HTTP server' do
     test 'monunt given path' do
       on_driver do |driver|
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
           s.post('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello post'] }
           s.head('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello head'] }
@@ -158,13 +165,13 @@ class HttpHelperTest < Test::Unit::TestCase
           s.options('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello options'] }
         end
 
-        resp = head("http://127.0.0.1:#{PORT}/example/hello")
+        resp = head("http://127.0.0.1:#{@port}/example/hello")
         assert_equal('200', resp.code)
         assert_equal(nil, resp.body)
         assert_equal('text/plain', resp['Content-Type'])
 
         %w[get put post put delete options trace].each do |n|
-          resp = send(n, "http://127.0.0.1:#{PORT}/example/hello")
+          resp = send(n, "http://127.0.0.1:#{@port}/example/hello")
           assert_equal('200', resp.code)
           assert_equal("hello #{n}", resp.body)
           assert_equal('text/plain', resp['Content-Type'])
@@ -174,44 +181,44 @@ class HttpHelperTest < Test::Unit::TestCase
 
     test 'when path does not start with `/` or ends with `/`' do
       on_driver do |driver|
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
           s.get('example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
           s.get('/example/hello2/') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
         end
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        resp = get("http://127.0.0.1:#{@port}/example/hello")
         assert_equal('404', resp.code)
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello2")
+        resp = get("http://127.0.0.1:#{@port}/example/hello2")
         assert_equal('200', resp.code)
       end
     end
 
     test 'when error raised' do
       on_driver do |driver|
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { raise 'error!' }
         end
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        resp = get("http://127.0.0.1:#{@port}/example/hello")
         assert_equal('500', resp.code)
       end
     end
 
     test 'when path is not found' do
       on_driver do |driver|
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
         end
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello/not_found")
+        resp = get("http://127.0.0.1:#{@port}/example/hello/not_found")
         assert_equal('404', resp.code)
       end
     end
 
     test 'params and body' do
       on_driver do |driver|
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') do |req|
             assert_equal(req.query_string, nil)
             assert_equal(req.body, nil)
@@ -237,16 +244,16 @@ class HttpHelperTest < Test::Unit::TestCase
           end
         end
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        resp = get("http://127.0.0.1:#{@port}/example/hello")
         assert_equal('200', resp.code)
 
-        resp = post("http://127.0.0.1:#{PORT}/example/hello", 'this is body')
+        resp = post("http://127.0.0.1:#{@port}/example/hello", 'this is body')
         assert_equal('200', resp.code)
 
-        resp = get("http://127.0.0.1:#{PORT}/example/hello/params?test=true")
+        resp = get("http://127.0.0.1:#{@port}/example/hello/params?test=true")
         assert_equal('200', resp.code)
 
-        resp = post("http://127.0.0.1:#{PORT}/example/hello/params?test=true", 'this is body')
+        resp = post("http://127.0.0.1:#{@port}/example/hello/params?test=true", 'this is body')
         assert_equal('200', resp.code)
       end
     end
@@ -265,11 +272,11 @@ class HttpHelperTest < Test::Unit::TestCase
         test 'can overwrite settings by using tls_context' do
           on_driver_transport({ 'insecure' => 'false' }) do |driver|
             tls = { 'insecure' => 'true' } # overwrite
-            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER, tls_opts: tls) do |s|
+            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER, tls_opts: tls) do |s|
               s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
             end
 
-            resp = secure_get("https://127.0.0.1:#{PORT}/example/hello", verify: false)
+            resp = secure_get("https://127.0.0.1:#{@port}/example/hello", verify: false)
             assert_equal('200', resp.code)
             assert_equal('hello get', resp.body)
           end
@@ -277,17 +284,17 @@ class HttpHelperTest < Test::Unit::TestCase
 
         test 'with insecure in transport section' do
           on_driver_transport({ 'insecure' => 'true' }) do |driver|
-            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
               s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
             end
             omit "TLS connection should be aborted due to `Errno::ECONNABORTED`. Need to debug." if Fluent.windows?
 
-            resp = secure_get("https://127.0.0.1:#{PORT}/example/hello", verify: false)
+            resp = secure_get("https://127.0.0.1:#{@port}/example/hello", verify: false)
             assert_equal('200', resp.code)
             assert_equal('hello get', resp.body)
 
             assert_raise OpenSSL::SSL::SSLError do
-              secure_get("https://127.0.0.1:#{PORT}/example/hello")
+              secure_get("https://127.0.0.1:#{@port}/example/hello")
             end
           end
         end
@@ -306,11 +313,11 @@ class HttpHelperTest < Test::Unit::TestCase
           end
 
           on_driver_transport(opt) do |driver|
-            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
               s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
             end
 
-            resp = secure_get("https://127.0.0.1:#{PORT}/example/hello", cert_path: cert_path)
+            resp = secure_get("https://127.0.0.1:#{@port}/example/hello", cert_path: cert_path)
             assert_equal('200', resp.code)
             assert_equal('hello get', resp.body)
           end
@@ -333,11 +340,11 @@ class HttpHelperTest < Test::Unit::TestCase
           end
 
           on_driver_transport(opt) do |driver|
-            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+            driver.http_server_create_https_server(:http_server_helper_test_tls, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do |s|
               s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
             end
 
-            resp = secure_get("https://127.0.0.1:#{PORT}/example/hello", cert_path: ca_cert_path)
+            resp = secure_get("https://127.0.0.1:#{@port}/example/hello", cert_path: ca_cert_path)
             assert_equal('200', resp.code)
             assert_equal('hello get', resp.body)
           end
@@ -355,7 +362,7 @@ class HttpHelperTest < Test::Unit::TestCase
         end
 
         stub(Fluent::PluginHelper::HttpServer::Server).new(addr: anything, port: anything, logger: anything, default_app: anything) { server }
-        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do
+        driver.http_server_create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: @port, logger: NULL_LOGGER) do
           # nothing
         end
         driver.stop

data/test/plugin_helper/test_metrics.rb

@@ -0,0 +1,137 @@
+require_relative '../helper'
+require 'fluent/plugin_helper/metrics'
+require 'fluent/plugin/base'
+
+class MetricsTest < Test::Unit::TestCase
+  class Dummy < Fluent::Plugin::TestBase
+    helpers :metrics
+    def configure(conf)
+      super
+    end
+  end
+
+  setup do
+    @d = nil
+  end
+
+  teardown do
+    if @d
+      @d.stop unless @d.stopped?
+      @d.shutdown unless @d.shutdown?
+      @d.close unless @d.closed?
+      @d.terminate unless @d.terminated?
+    end
+  end
+
+  test 'can be initialized without any metrics at first' do
+    d = Dummy.new
+    assert_equal 0, d._metrics.size
+  end
+
+  test 'can be configured' do
+    d1 = Dummy.new
+    assert_nothing_raised do
+      d1.configure(config_element())
+    end
+    assert d1.plugin_id
+    assert d1.log
+  end
+
+  test 'creates metrics instances' do
+    d = Dummy.new
+    i = d.metrics_create(namespace: "fluentd_test", subsystem: "unit-test", name: "metrics1", help_text: "metrics testing")
+    d.configure(config_element())
+    assert do
+      d.instance_variable_get(:@plugin_type_or_id).include?("dummy.object")
+    end
+    assert{ i.is_a?(Fluent::Plugin::LocalMetrics) }
+    assert_true i.has_methods_for_counter
+    assert_false i.has_methods_for_gauge
+
+    d = Dummy.new
+    i = d.metrics_create(namespace: "fluentd_test", subsystem: "unit-test", name: "metrics2", help_text: "metrics testing", prefer_gauge: true)
+    d.configure(config_element())
+    assert do
+      d.instance_variable_get(:@plugin_type_or_id).include?("dummy.object")
+    end
+    assert{ i.is_a?(Fluent::Plugin::LocalMetrics) }
+    assert_false i.has_methods_for_counter
+    assert_true i.has_methods_for_gauge
+  end
+
+  test 'calls lifecycle methods for all plugin instances via owner plugin' do
+    @d = d = Dummy.new
+    i1 = d.metrics_create(namespace: "fluentd_test", subsystem: "unit-test", name: "metrics1", help_text: "metrics testing")
+    i2 = d.metrics_create(namespace: "fluentd_test", subsystem: "unit-test", name: "metrics2", help_text: "metrics testing", prefer_gauge: true)
+    i3 = d.metrics_create(namespace: "fluentd_test", subsystem: "unit-test", name: "metrics3", help_text: "metrics testing")
+    d.configure(config_element())
+    assert do
+      d.instance_variable_get(:@plugin_type_or_id).include?("dummy.object")
+    end
+    d.start
+
+    assert i1.started?
+    assert i2.started?
+    assert i3.started?
+
+    assert !i1.stopped?
+    assert !i2.stopped?
+    assert !i3.stopped?
+
+    d.stop
+
+    assert i1.stopped?
+    assert i2.stopped?
+    assert i3.stopped?
+
+    assert !i1.before_shutdown?
+    assert !i2.before_shutdown?
+    assert !i3.before_shutdown?
+
+    d.before_shutdown
+
+    assert i1.before_shutdown?
+    assert i2.before_shutdown?
+    assert i3.before_shutdown?
+
+    assert !i1.shutdown?
+    assert !i2.shutdown?
+    assert !i3.shutdown?
+
+    d.shutdown
+
+    assert i1.shutdown?
+    assert i2.shutdown?
+    assert i3.shutdown?
+
+    assert !i1.after_shutdown?
+    assert !i2.after_shutdown?
+    assert !i3.after_shutdown?
+
+    d.after_shutdown
+
+    assert i1.after_shutdown?
+    assert i2.after_shutdown?
+    assert i3.after_shutdown?
+
+    assert !i1.closed?
+    assert !i2.closed?
+    assert !i3.closed?
+
+    d.close
+
+    assert i1.closed?
+    assert i2.closed?
+    assert i3.closed?
+
+    assert !i1.terminated?
+    assert !i2.terminated?
+    assert !i3.terminated?
+
+    d.terminate
+
+    assert i1.terminated?
+    assert i2.terminated?
+    assert i3.terminated?
+  end
+end