fluentd 1.8.0.rc3 → 1.8.0

data/test/plugin/out_forward/test_load_balancer.rb

@@ -5,7 +5,7 @@ require 'fluent/plugin/out_forward/load_balancer'
 
 class LoadBalancerTest < Test::Unit::TestCase
   sub_test_case 'select_healthy_node' do
-    test 'select healty node' do
+    test 'select healthy node' do
       lb = Fluent::Plugin::ForwardOutput::LoadBalancer.new($log)
       n1 = flexmock('node', :'standby?' => false, :'available?' => false, weight: 1)
       n2 = flexmock('node', :'standby?' => false, :'available?' => true, weight: 1)

data/test/plugin/test_in_monitor_agent.rb

@@ -496,7 +496,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
   tag monitor
 ")
       d.instance.start
-      expected_response_regex = %r{pid:\d+\tppid:\d+\tconfig_path:#{@filepath}\tpid_file:\tplugin_dirs:/etc/fluent/plugin\tlog_path:}
+      expected_response_regex = %r{pid:\d+\tppid:\d+\tversion:#{Fluent::VERSION}\tconfig_path:#{@filepath}\tpid_file:\tplugin_dirs:/etc/fluent/plugin\tlog_path:}
       assert_match(expected_response_regex,
                    get("http://127.0.0.1:#{@port}/api/config").body)
     end
@@ -514,6 +514,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       assert_nil(res["pid_file"])
       assert_equal(["/etc/fluent/plugin"], res["plugin_dirs"])
       assert_nil(res["log_path"])
+      assert_equal(Fluent::VERSION, res["version"])
     end
 
     test "/api/config.json?debug=1" do

data/test/plugin/test_out_stdout.rb

@@ -37,6 +37,25 @@ class StdoutOutputTest < Test::Unit::TestCase
       end
     end
 
+    test 'configure with time_format' do
+      d = create_driver(CONFIG + <<-CONF)
+        <format>
+          @type stdout
+          time_format %Y-%m-%dT%H:%M:%S.%L%z
+        </format>
+      CONF
+
+      time = event_time
+      out = capture_log do
+        d.run(default_tag: 'test') do
+          d.feed(time, {'test' => 'test'})
+        end
+      end
+
+      t = Time.at(time).localtime.strftime("%Y-%m-%dT%H:%M:%S.%L%z")
+      assert_equal "#{t} test: {\"test\":\"test\"}\n", out
+    end
+
     test 'emit with default configuration' do
       d = create_driver
       time = event_time()
@@ -157,6 +176,23 @@ class StdoutOutputTest < Test::Unit::TestCase
     end
   end
 
+  data(
+    'utc and !localtime' => "utc true\nlocaltime false",
+    '!utc and localtime' => "utc false\nlocaltime true")
+  test 'success when configure with localtime and utc' do |c|
+    assert_nothing_raised do
+      create_driver(CONFIG + c)
+    end
+  end
+
+  data('utc and localtime' => "utc true\nlocaltime true",
+       '!utc and !localtime' => "utc false\nlocaltime false")
+  test 'raise an error when configure with localtime and utc' do |c|
+    assert_raise(Fluent::ConfigError.new('both of utc and localtime are specified, use only one of them')) do
+      create_driver(CONFIG + c)
+    end
+  end
+
   # Capture the log output of the block given
   def capture_log(&block)
     tmp = $log
@@ -167,4 +203,3 @@ class StdoutOutputTest < Test::Unit::TestCase
     $log = tmp
   end
 end
-

data/test/plugin/test_output.rb

@@ -378,6 +378,30 @@ class OutputTest < Test::Unit::TestCase
       assert { logs.any? { |log| log.include?("${chunk_id} is not allowed in this plugin") } }
     end
 
+    test '#extract_placeholders logs warn message with not replaced key' do
+      @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
+      tmpl = "/mypath/${key1}/test"
+      t = event_time('2016-04-11 20:30:00 +0900')
+      v = { key1: "value1" }
+      m = create_metadata(timekey: t, tag: 'fluentd.test.output', variables: v)
+      @i.extract_placeholders(tmpl, m)
+      logs = @i.log.out.logs
+
+      assert { logs.any? { |log| log.include?("chunk key placeholder 'key1' not replaced. template:#{tmpl}") } }
+    end
+
+    test '#extract_placeholders logs warn message with not replaced key if variables exist and chunk_key is not empty' do
+      @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'key1')]))
+      tmpl = "/mypath/${key1}/${key2}/test"
+      t = event_time('2016-04-11 20:30:00 +0900')
+      v = { key1: "value1" }
+      m = create_metadata(timekey: t, tag: 'fluentd.test.output', variables: v)
+      @i.extract_placeholders(tmpl, m)
+      logs = @i.log.out.logs
+
+      assert { logs.any? { |log| log.include?("chunk key placeholder 'key2' not replaced. template:#{tmpl}") } }
+    end
+
     sub_test_case '#placeholder_validators' do
       test 'returns validators for time, tag and keys when a template has placeholders even if plugin is not configured with these keys' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
@@ -870,7 +894,7 @@ class OutputTest < Test::Unit::TestCase
 
   test 'raises an error if timekey is less than equal 0' do
     i = create_output(:delayed)
-    assert_raise Fluent::ConfigError.new('timekey should be greater than 0. current timekey: 0.0') do
+    assert_raise Fluent::ConfigError.new("<buffer ...> argument includes 'time', but timekey is not configured") do
       i.configure(config_element('ROOT','',{},[config_element('buffer', 'time', { "timekey" => nil })]))
     end
 

data/test/test_logger_initializer.rb

@@ -0,0 +1,26 @@
+require_relative 'helper'
+require 'fluent/supervisor'
+require 'fileutils'
+
+class LoggerInitializerTest < ::Test::Unit::TestCase
+  TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/logger_initializer#{ENV['TEST_ENV_NUMBER']}")
+
+  teardown do
+    begin
+      FileUtils.rm_rf(TMP_DIR)
+    rescue => _
+    end
+  end
+
+  test 'when path is given' do
+    path = File.join(TMP_DIR, 'fluent_with_path.log')
+
+    assert_false File.exist?(TMP_DIR)
+    logger = Fluent::Supervisor::LoggerInitializer.new(path, Fluent::Log::LEVEL_DEBUG, nil, nil, {})
+
+    assert_nothing_raised do
+      logger.init(:supervisor, 0)
+    end
+    assert_true File.exist?(TMP_DIR)
+  end
+end

data/test/test_supervisor.rb

@@ -372,46 +372,6 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal Fluent::Log::LEVEL_INFO, se_config[:log_level]
   end
 
-  def test_load_config_with_multibyte_string
-    tmp_path = "#{TMP_DIR}/dir/test_multibyte_config.conf"
-    conf_str = %[
-<source>
-  @type forward
-  @id forward_input
-  @label @INPUT
-</source>
-<label @INPUT>
-  <filter>
-    @type record_transformer
-    <record>
-      message こんにちは. ${record["name"]} has made a order of ${record["item"]} just now.
-    </record>
-  </filter>
-  <match>
-    @type stdout
-  </match>
-</label>
-]
-    FileUtils.mkdir_p(File.dirname(tmp_path))
-    File.open(tmp_path, "w:utf-8") {|file| file.write(conf_str) }
-
-    params = {}
-    params['workers'] = 1
-    params['use_v1_config'] = true
-    params['log_path'] = 'test/tmp/supervisor/log'
-    params['suppress_repeated_stacktrace'] = true
-    params['log_level'] = Fluent::Log::LEVEL_INFO
-    params['conf_encoding'] = 'utf-8'
-    load_config_proc =  Proc.new { Fluent::Supervisor.load_config(tmp_path, params) }
-
-    se_config = load_config_proc.call
-    conf = se_config[:fluentd_conf]
-    label = conf.elements.detect {|e| e.name == "label" }
-    filter = label.elements.detect {|e| e.name == "filter" }
-    record_transformer = filter.elements.detect {|e| e.name = "record_transformer" }
-    assert_equal(Encoding::UTF_8, record_transformer["message"].encoding)
-  end
-
   def test_logger
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)
@@ -448,6 +408,32 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal 10, $log.out.instance_variable_get(:@shift_size)
   end
 
+  def test_inline_config
+    opts = Fluent::Supervisor.default_options
+    opts[:inline_config] = '-'
+    sv = Fluent::Supervisor.new(opts)
+    assert_equal '-', sv.instance_variable_get(:@inline_config)
+
+    inline_config = '<match *>\n@type stdout\n</match>'
+    stub(STDIN).read { inline_config }
+    stub(sv).read_config        # to skip
+    stub(sv).build_system_config { Fluent::SystemConfig.new } # to skip
+
+    sv.configure
+    assert_equal inline_config, sv.instance_variable_get(:@inline_config)
+  end
+
+  def test_log_level_affects
+    opts = Fluent::Supervisor.default_options
+    sv = Fluent::Supervisor.new(opts)
+
+    c = Fluent::Config::Element.new('system', '', { 'log_level' => 'error' }, [])
+    stub(sv).read_config { config_element('ROOT', '', {}, [c]) }
+
+    sv.configure
+    assert_equal Fluent::Log::LEVEL_ERROR, $log.level
+  end
+
   def create_debug_dummy_logger
     dl_opts = {}
     dl_opts[:log_level] = ServerEngine::DaemonLogger::DEBUG

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.8.0.rc3
+  version: 1.8.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -808,6 +808,7 @@ files:
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb
+- test/test_logger_initializer.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb
@@ -837,9 +838,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -1011,6 +1012,7 @@ test_files:
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb
+- test/test_logger_initializer.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb