fluentd 1.17.0-x64-mingw32 → 1.17.1-x64-mingw32

data/test/test_time_parser.rb

@@ -1,362 +0,0 @@
-require_relative 'helper'
-require 'fluent/test'
-require 'fluent/time'
-
-class TimeParserTest < ::Test::Unit::TestCase
-  def setup
-    Fluent::Test.setup
-  end
-
-  def test_call_with_parse
-    parser = Fluent::TimeParser.new
-
-    assert(parser.parse('2013-09-18 12:00:00 +0900').is_a?(Fluent::EventTime))
-
-    time = event_time('2013-09-18 12:00:00 +0900')
-    assert_equal(time, parser.parse('2013-09-18 12:00:00 +0900'))
-  end
-
-  def test_parse_with_strptime
-    parser = Fluent::TimeParser.new('%d/%b/%Y:%H:%M:%S %z')
-
-    assert(parser.parse('28/Feb/2013:12:00:00 +0900').is_a?(Fluent::EventTime))
-
-    time = event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z')
-    assert_equal(time, parser.parse('28/Feb/2013:12:00:00 +0900'))
-  end
-
-  def test_parse_nsec_with_strptime
-    parser = Fluent::TimeParser.new('%d/%b/%Y:%H:%M:%S:%N %z')
-
-    assert(parser.parse('28/Feb/2013:12:00:00:123456789 +0900').is_a?(Fluent::EventTime))
-
-    time = event_time('28/Feb/2013:12:00:00:123456789 +0900', format: '%d/%b/%Y:%H:%M:%S:%N %z')
-    assert_equal_event_time(time, parser.parse('28/Feb/2013:12:00:00:123456789 +0900'))
-  end
-
-  def test_parse_iso8601
-    parser = Fluent::TimeParser.new('%iso8601')
-
-    assert(parser.parse('2017-01-01T12:00:00+09:00').is_a?(Fluent::EventTime))
-
-    time = event_time('2017-01-01T12:00:00+09:00')
-    assert_equal(time, parser.parse('2017-01-01T12:00:00+09:00'))
-
-    time_with_msec = event_time('2017-01-01T12:00:00.123+09:00')
-    assert_equal(time_with_msec, parser.parse('2017-01-01T12:00:00.123+09:00'))
-  end
-
-  def test_parse_with_invalid_argument
-    parser = Fluent::TimeParser.new
-
-    [[], {}, nil, true, 10000, //, ->{}, '', :symbol].each { |v|
-      assert_raise Fluent::TimeParser::TimeParseError do
-        parser.parse(v)
-      end
-    }
-  end
-
-  def test_parse_time_in_localtime
-    time = with_timezone("UTC+02") do
-      parser = Fluent::TimeParser.new("%Y-%m-%d %H:%M:%S.%N", true)
-      parser.parse("2016-09-02 18:42:31.123456789")
-    end
-    assert_equal_event_time(time, event_time("2016-09-02 18:42:31.123456789 -02:00", format: '%Y-%m-%d %H:%M:%S.%N %z'))
-  end
-
-  def test_parse_time_in_utc
-    time = with_timezone("UTC-09") do
-      parser = Fluent::TimeParser.new("%Y-%m-%d %H:%M:%S.%N", false)
-      parser.parse("2016-09-02 18:42:31.123456789")
-    end
-    assert_equal_event_time(time, event_time("2016-09-02 18:42:31.123456789 UTC", format: '%Y-%m-%d %H:%M:%S.%N %z'))
-  end
-
-  def test_parse_string_with_expected_timezone
-    time = with_timezone("UTC-09") do
-      parser = Fluent::TimeParser.new("%Y-%m-%d %H:%M:%S.%N", nil, "-07:00")
-      parser.parse("2016-09-02 18:42:31.123456789")
-    end
-    assert_equal_event_time(time, event_time("2016-09-02 18:42:31.123456789 -07:00", format: '%Y-%m-%d %H:%M:%S.%N %z'))
-  end
-
-  def test_parse_time_with_expected_timezone_name
-    time = with_timezone("UTC-09") do
-      parser = Fluent::TimeParser.new("%Y-%m-%d %H:%M:%S.%N", nil, "Europe/Zurich")
-      parser.parse("2016-12-02 18:42:31.123456789")
-    end
-    assert_equal_event_time(time, event_time("2016-12-02 18:42:31.123456789 +01:00", format: '%Y-%m-%d %H:%M:%S.%N %z'))
-  end
-
-  sub_test_case 'TimeMixin::Parser' do
-    class DummyForTimeParser
-      include Fluent::Configurable
-      include Fluent::TimeMixin::Parser
-    end
-
-    test 'provides configuration parameters for TimeParser with default values for localtime' do
-      time = with_timezone("UTC+07") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse'))
-
-        assert_nil   i.time_format
-        assert_true  i.localtime
-        assert_false i.utc
-        assert_nil   i.timezone
-
-        parser = i.time_parser_create
-        # time_format unspecified
-        # localtime
-        parser.parse("2016-09-02 18:42:31.012345678")
-      end
-      assert_equal_event_time(event_time("2016-09-02 18:42:31.012345678 -07:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test 'provides configuration parameters for TimeParser, configurable for any time format' do
-      time = with_timezone("UTC+07") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S %N'}))
-        parser = i.time_parser_create
-        # time_format specified
-        # localtime
-        parser.parse("09/02/2016 18-42-31 012345678")
-      end
-      assert_equal_event_time(event_time("2016-09-02 18:42:31.012345678 -07:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test 'provides configuration parameters for TimeParser, configurable for UTC by localtime=false' do
-      time = with_timezone("UTC+07") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S %N', 'localtime' => 'false'}))
-        parser = i.time_parser_create
-        # time_format specified
-        # utc
-        parser.parse("09/02/2016 18-42-31 012345678")
-      end
-      assert_equal_event_time(event_time("2016-09-02 18:42:31.012345678 UTC", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test 'provides configuration parameters for TimeParser, configurable for UTC by utc=true' do
-      time = with_timezone("UTC+07") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S %N', 'utc' => 'true'}))
-        parser = i.time_parser_create
-        # time_format specified
-        # utc
-        parser.parse("09/02/2016 18-42-31 012345678")
-      end
-      assert_equal_event_time(event_time("2016-09-02 18:42:31.012345678 UTC", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test 'provides configuration parameters for TimeParser, configurable for any timezone' do
-      time = with_timezone("UTC+07") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S %N', 'timezone' => '-01:00'}))
-        parser = i.time_parser_create
-        # time_format specified
-        # -01:00
-        parser.parse("09/02/2016 18-42-31 012345678")
-      end
-      assert_equal_event_time(event_time("2016-09-02 18:42:31.012345678 -01:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test 'specifying timezone without time format raises configuration error' do
-      assert_raise Fluent::ConfigError.new("specifying timezone requires time format") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'utc' => 'true'}))
-        i.time_parser_create
-      end
-      assert_raise Fluent::ConfigError.new("specifying timezone requires time format") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'localtime' => 'false'}))
-        i.time_parser_create
-      end
-      assert_raise Fluent::ConfigError.new("specifying timezone requires time format") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'timezone' => '-0700'}))
-        i.time_parser_create
-      end
-    end
-
-    test '#time_parser_create returns TimeParser with specified time format and timezone' do
-      time = with_timezone("UTC-09") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S %N'}))
-        assert_equal '%m/%d/%Y %H-%M-%S %N', i.time_format
-        assert_true i.localtime
-        parser = i.time_parser_create(format: '%Y-%m-%d %H:%M:%S.%N %z')
-        parser.parse("2016-09-05 17:59:38.987654321 -03:00")
-      end
-      assert_equal_event_time(event_time("2016-09-05 17:59:38.987654321 -03:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test '#time_parser_create returns TimeParser with localtime when specified it forcedly besides any configuration parameters' do
-      time = with_timezone("UTC-09") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S', 'utc' => 'true'}))
-        assert_equal '%m/%d/%Y %H-%M-%S', i.time_format
-        assert_true i.utc
-        parser = i.time_parser_create(format: '%Y-%m-%d %H:%M:%S.%N', force_localtime: true)
-        parser.parse("2016-09-05 17:59:38.987654321")
-      end
-      assert_equal_event_time(event_time("2016-09-05 17:59:38.987654321 +09:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-
-      time = with_timezone("UTC-09") do
-        i = DummyForTimeParser.new
-        i.configure(config_element('parse', '', {'time_format' => '%m/%d/%Y %H-%M-%S', 'timezone' => '+0000'}))
-        assert_equal '%m/%d/%Y %H-%M-%S', i.time_format
-        assert_equal '+0000', i.timezone
-        parser = i.time_parser_create(format: '%Y-%m-%d %H:%M:%S.%N', force_localtime: true)
-        parser.parse("2016-09-05 17:59:38.987654321")
-      end
-      assert_equal_event_time(event_time("2016-09-05 17:59:38.987654321 +09:00", format: '%Y-%m-%d %H:%M:%S.%N %z'), time)
-    end
-
-    test '#time_parser_create returns NumericTimeParser to parse time as unixtime when time_type unixtime specified' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '', {'time_type' => 'unixtime'}))
-      parser = i.time_parser_create
-      time = event_time("2016-10-03 20:08:30.123456789 +0100", format: '%Y-%m-%d %H:%M:%S.%N %z')
-      assert_equal_event_time(Fluent::EventTime.new(time.to_i), parser.parse("#{time.sec}"))
-    end
-
-    test '#time_parser_create returns NumericTimeParser to parse time as float when time_type float specified' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '', {'time_type' => 'float'}))
-      parser = i.time_parser_create
-      time = event_time("2016-10-03 20:08:30.123456789 +0100", format: '%Y-%m-%d %H:%M:%S.%N %z')
-      assert_equal_event_time(time, parser.parse("#{time.sec}.#{time.nsec}"))
-    end
-  end
-
-  sub_test_case 'MixedTimeParser fallback' do
-    class DummyForTimeParser
-      include Fluent::Configurable
-      include Fluent::TimeMixin::Parser
-    end
-
-    test 'no time_format_fallbacks failure' do
-      i = DummyForTimeParser.new
-      assert_raise(Fluent::ConfigError.new("time_type is :mixed but time_format and time_format_fallbacks is empty.")) do
-        i.configure(config_element('parse', '', {'time_type' => 'mixed'}))
-      end
-    end
-
-    test 'fallback time format failure' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format_fallbacks' => ['%iso8601']}))
-      parser = i.time_parser_create
-      assert_raise(Fluent::TimeParser::TimeParseError.new("invalid time format: value = INVALID, even though fallbacks: Fluent::TimeParser")) do
-        parser.parse("INVALID")
-      end
-    end
-
-    test 'primary format is unixtime, secondary %iso8601 is used' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => 'unixtime',
-                                  'time_format_fallbacks' => ['%iso8601']}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(time, parser.parse('2021-01-01T12:00:00+0900'))
-    end
-
-    test 'primary format is %iso8601, secondary unixtime is used' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => '%iso8601',
-                                  'time_format_fallbacks' => ['unixtime']}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(time, parser.parse("#{time.sec}"))
-    end
-
-    test 'primary format is %iso8601, no secondary is used' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => '%iso8601'}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(time, parser.parse("2021-01-01T12:00:00+0900"))
-    end
-
-    test 'primary format is unixtime, no secondary is used' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => 'unixtime'}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(time, parser.parse("#{time.sec}"))
-    end
-
-    test 'primary format is %iso8601, raise error because of no appropriate secondary' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => '%iso8601'}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_raise("Fluent::TimeParser::TimeParseError: invalid time format: value = #{time.sec}, even though fallbacks: Fluent::TimeParser") do
-        parser.parse("#{time.sec}")
-      end
-    end
-
-    test 'primary format is unixtime, raise error because of no appropriate secondary' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '',
-                                 {'time_type' => 'mixed',
-                                  'time_format' => 'unixtime'}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_raise("Fluent::TimeParser::TimeParseError: invalid time format: value = #{time}, even though fallbacks: Fluent::NumericTimeParser") do
-        parser.parse("2021-01-01T12:00:00+0900")
-      end
-    end
-
-    test 'fallback to unixtime' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '', {'time_type' => 'mixed',
-                                               'time_format_fallbacks' => ['%iso8601', 'unixtime']}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(Fluent::EventTime.new(time.to_i), parser.parse("#{time.sec}"))
-    end
-
-    test 'fallback to %iso8601' do
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '', {'time_type' => 'mixed',
-                                               'time_format_fallbacks' => ['unixtime', '%iso8601']}))
-      parser = i.time_parser_create
-      time = event_time('2021-01-01T12:00:00+0900')
-      assert_equal_event_time(time, parser.parse('2021-01-01T12:00:00+0900'))
-    end
-  end
-
-  # https://github.com/fluent/fluentd/issues/3195
-  test 'change timezone without zone specifier in a format' do
-    expected = 1607457600 # 2020-12-08T20:00:00Z
-    time1 = time2 = nil
-
-    with_timezone("UTC-05") do # EST
-      i = DummyForTimeParser.new
-      i.configure(config_element('parse', '', {'time_type' => 'string',
-                                               'time_format' => '%Y-%m-%dT%H:%M:%SZ',
-                                               'utc' => true}))
-      parser = i.time_parser_create
-
-      time1 = parser.parse('2020-12-08T20:00:00Z').to_i
-      time2 = with_timezone("UTC-04") do # EDT
-        # to avoid using cache, increment 1 sec
-        parser.parse('2020-12-08T20:00:01Z').to_i
-      end
-    end
-
-    assert_equal([expected, expected + 1], [time1, time2])
-  end
-end

data/test/test_tls.rb

@@ -1,65 +0,0 @@
-require_relative 'helper'
-require 'fluent/tls'
-
-class UniqueIdTest < Test::Unit::TestCase
-  TEST_TLS1_1_CASES = {
-    'New TLS v1.1' => :'TLS1_1',
-    'Old TLS v1.1' => :'TLSv1_1',
-  }
-  TEST_TLS1_2_CASES = {
-    'New TLS v1.2' => :'TLS1_2',
-    'Old TLS v1.2' => :'TLSv1_2'
-  } 
-  TEST_TLS_CASES = TEST_TLS1_1_CASES.merge(TEST_TLS1_2_CASES)
-
-  sub_test_case 'constants' do
-    test 'default version' do
-      assert_equal :'TLSv1_2', Fluent::TLS::DEFAULT_VERSION
-    end
-
-    data(TEST_TLS_CASES)
-    test 'supported versions' do |ver|
-      assert_include Fluent::TLS::SUPPORTED_VERSIONS, ver
-    end
-
-    test 'default ciphers' do
-      assert_equal "ALL:!aNULL:!eNULL:!SSLv2", Fluent::TLS::CIPHERS_DEFAULT
-    end
-  end
-
-  sub_test_case 'set_version_to_context' do
-    setup do
-      @ctx = OpenSSL::SSL::SSLContext.new
-    end
-
-    # TODO: After openssl module supports min_version/max_version accessor, add assert for it.
-
-    data(TEST_TLS_CASES)
-    test 'with version' do |ver|
-      assert_nothing_raised {
-        Fluent::TLS.set_version_to_context(@ctx, ver, nil, nil)
-      }
-    end
-
-    data(TEST_TLS_CASES)
-    test 'can specify old/new syntax to min_version/max_version' do |ver|
-      omit "min_version=/max_version= is not supported" unless Fluent::TLS::MIN_MAX_AVAILABLE
-
-      assert_nothing_raised {
-        Fluent::TLS.set_version_to_context(@ctx, Fluent::TLS::DEFAULT_VERSION, ver, ver)
-      }
-    end
-
-    test 'raise ConfigError when either one of min_version/max_version is not specified' do
-      omit "min_version=/max_version= is not supported" unless Fluent::TLS::MIN_MAX_AVAILABLE
-
-      ver = Fluent::TLS::DEFAULT_VERSION
-      assert_raise(Fluent::ConfigError) {
-        Fluent::TLS.set_version_to_context(@ctx, ver, ver, nil)
-      }
-      assert_raise(Fluent::ConfigError) {
-        Fluent::TLS.set_version_to_context(@ctx, ver, nil, ver)
-      }
-    end
-  end
-end

data/test/test_unique_id.rb

@@ -1,47 +0,0 @@
-require_relative 'helper'
-require 'fluent/plugin/base'
-require 'fluent/unique_id'
-
-module UniqueIdTestEnv
-  class Dummy < Fluent::Plugin::Base
-    include Fluent::UniqueId::Mixin
-  end
-end
-
-class UniqueIdTest < Test::Unit::TestCase
-  sub_test_case 'module used directly' do
-    test '.generate generates 128bit length unique id (16bytes)' do
-      assert_equal 16, Fluent::UniqueId.generate.bytesize
-      ary = []
-      100_000.times do
-        ary << Fluent::UniqueId.generate
-      end
-      assert_equal 100_000, ary.uniq.size
-    end
-
-    test '.hex dumps 16bytes id into 32 chars' do
-      assert_equal 32, Fluent::UniqueId.hex(Fluent::UniqueId.generate).size
-      assert(Fluent::UniqueId.hex(Fluent::UniqueId.generate) =~ /^[0-9a-z]{32}$/)
-    end
-  end
-
-  sub_test_case 'mixin' do
-    setup do
-      @i = UniqueIdTestEnv::Dummy.new
-    end
-
-    test '#generate_unique_id generates 128bit length id (16bytes)' do
-      assert_equal 16, @i.generate_unique_id.bytesize
-      ary = []
-      100_000.times do
-        ary << @i.generate_unique_id
-      end
-      assert_equal 100_000, ary.uniq.size
-    end
-
-    test '#dump_unique_id_hex dumps 16bytes id into 32 chars' do
-      assert_equal 32, @i.dump_unique_id_hex(@i.generate_unique_id).size
-      assert(@i.dump_unique_id_hex(@i.generate_unique_id) =~ /^[0-9a-z]{32}$/)
-    end
-  end
-end

data/test/test_variable_store.rb

@@ -1,65 +0,0 @@
-require_relative 'helper'
-require 'fluent/variable_store'
-
-class VariableStoreTest < Test::Unit::TestCase
-  def setup
-  end
-
-  def teardown
-    Fluent::VariableStore.try_to_reset do
-      # nothing
-    end
-  end
-
-  sub_test_case '#fetch_or_build' do
-    test 'fetch same object when the same key is passed' do
-      c1 = Fluent::VariableStore.fetch_or_build(:test)
-      c2 = Fluent::VariableStore.fetch_or_build(:test)
-
-      assert_equal c1, c2
-      assert_equal c1.object_id, c2.object_id
-
-      c3 = Fluent::VariableStore.fetch_or_build(:test2)
-      assert_not_equal c1.object_id, c3.object_id
-    end
-
-    test 'can be passed a default value' do
-      c1 = Fluent::VariableStore.fetch_or_build(:test, default_value: Set.new)
-      c2 = Fluent::VariableStore.fetch_or_build(:test)
-
-      assert_kind_of Set, c1
-      assert_equal c1, c2
-      assert_equal c1.object_id, c2.object_id
-    end
-  end
-
-  sub_test_case '#try_to_reset' do
-    test 'reset all values' do
-      c1 = Fluent::VariableStore.fetch_or_build(:test)
-      c1[:k1] = 1
-      assert_equal 1, c1[:k1]
-
-      Fluent::VariableStore.try_to_reset do
-        # nothing
-      end
-
-      c1 = Fluent::VariableStore.fetch_or_build(:test)
-      assert_nil c1[:k1]
-    end
-
-    test 'rollback resetting if error raised' do
-      c1 = Fluent::VariableStore.fetch_or_build(:test)
-      c1[:k1] = 1
-      assert_equal 1, c1[:k1]
-
-      assert_raise(RuntimeError.new('pass')) do
-        Fluent::VariableStore.try_to_reset do
-          raise 'pass'
-        end
-      end
-
-      c1 = Fluent::VariableStore.fetch_or_build(:test)
-      assert_equal 1, c1[:k1]
-    end
-  end
-end