fluentd 0.12.0.pre.1 → 0.12.0.pre.2

data/test/test_config.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 require 'fluent/config'
 require 'fluent/config/parser'
 require 'fluent/supervisor'

data/test/test_configdsl.rb

@@ -1,6 +1,6 @@
+require 'helper'
 require 'fluent/config/dsl'
 require 'fluent/test'
-require 'helper'
 
 class ConfigDSLTest < Test::Unit::TestCase
   # TEST_CONFIG1 = %[

data/test/test_formatter.rb

@@ -29,6 +29,13 @@ module FormatterTest
     {'message' => 'awesome'}
   end
 
+  def with_timezone(tz)
+    oldtz, ENV['TZ'] = ENV['TZ'], tz
+    yield
+  ensure
+    ENV['TZ'] = oldtz
+  end
+
   class OutFileFormatterTest < ::Test::Unit::TestCase
     include FormatterTest
 
@@ -216,4 +223,220 @@ module FormatterTest
       end
     end
   end
+
+  class TimeFormatterTest < ::Test::Unit::TestCase
+    include FormatterTest
+
+    def setup
+      @time = Time.new(2014, 9, 27, 0, 0, 0, 0).to_i
+      @fmt  = "%Y%m%d %H%M%z"  # YYYYMMDD HHMM[+-]HHMM
+    end
+
+    def format(format, localtime, timezone)
+      formatter = Fluent::TimeFormatter.new(format, localtime, timezone)
+      formatter.format(@time)
+    end
+
+    def test_default_utc_nil
+      assert_equal("2014-09-27T00:00:00Z", format(nil, false, nil))
+    end
+
+    def test_default_utc_pHH_MM
+      assert_equal("2014-09-27T01:30:00+01:30", format(nil, false, "+01:30"))
+    end
+
+    def test_default_utc_nHH_MM
+      assert_equal("2014-09-26T22:30:00-01:30", format(nil, false, "-01:30"))
+    end
+
+    def test_default_utc_pHHMM
+      assert_equal("2014-09-27T02:30:00+02:30", format(nil, false, "+0230"))
+    end
+
+    def test_default_utc_nHHMM
+      assert_equal("2014-09-26T21:30:00-02:30", format(nil, false, "-0230"))
+    end
+
+    def test_default_utc_pHH
+      assert_equal("2014-09-27T03:00:00+03:00", format(nil, false, "+03"))
+    end
+
+    def test_default_utc_nHH
+      assert_equal("2014-09-26T21:00:00-03:00", format(nil, false, "-03"))
+    end
+
+    def test_default_utc_timezone_1
+      # Asia/Tokyo (+09:00) does not have daylight saving time.
+      assert_equal("2014-09-27T09:00:00+09:00", format(nil, false, "Asia/Tokyo"))
+    end
+
+    def test_default_utc_timezone_2
+      # Pacific/Honolulu (-10:00) does not have daylight saving time.
+      assert_equal("2014-09-26T14:00:00-10:00", format(nil, false, "Pacific/Honolulu"))
+    end
+
+    def test_default_utc_timezone_3
+      # America/Argentina/Buenos_Aires (-03:00) does not have daylight saving time.
+      assert_equal("2014-09-26T21:00:00-03:00", format(nil, false, "America/Argentina/Buenos_Aires"))
+    end
+
+    def test_default_utc_timezone_4
+      # Europe/Paris has daylight saving time. Its UTC offset is +01:00 and its
+      # UTC offset in DST is +02:00. In September, Europe/Paris is in DST.
+      assert_equal("2014-09-27T02:00:00+02:00", format(nil, false, "Europe/Paris"))
+    end
+
+    def test_default_utc_timezone_5
+      # Europe/Paris has daylight saving time. Its UTC offset is +01:00 and its
+      # UTC offset in DST is +02:00. In January, Europe/Paris is not in DST.
+      @time = Time.new(2014, 1, 24, 0, 0, 0, 0).to_i
+      assert_equal("2014-01-24T01:00:00+01:00", format(nil, false, "Europe/Paris"))
+    end
+
+    def test_default_utc_invalid
+      assert_equal("2014-09-27T00:00:00Z", format(nil, false, "Invalid"))
+    end
+
+    def test_default_localtime_nil_1
+      with_timezone("UTC-04") do
+        assert_equal("2014-09-27T04:00:00+04:00", format(nil, true, nil))
+      end
+    end
+
+    def test_default_localtime_nil_2
+      with_timezone("UTC+05") do
+        assert_equal("2014-09-26T19:00:00-05:00", format(nil, true, nil))
+      end
+    end
+
+    def test_default_localtime_timezone
+      # 'timezone' takes precedence over 'localtime'.
+      with_timezone("UTC-06") do
+        assert_equal("2014-09-27T07:00:00+07:00", format(nil, true, "+07"))
+      end
+    end
+
+    def test_specific_utc_nil
+      assert_equal("20140927 0000+0000", format(@fmt, false, nil))
+    end
+
+    def test_specific_utc_pHH_MM
+      assert_equal("20140927 0830+0830", format(@fmt, false, "+08:30"))
+    end
+
+    def test_specific_utc_nHH_MM
+      assert_equal("20140926 1430-0930", format(@fmt, false, "-09:30"))
+    end
+
+    def test_specific_utc_pHHMM
+      assert_equal("20140927 1030+1030", format(@fmt, false, "+1030"))
+    end
+
+    def test_specific_utc_nHHMM
+      assert_equal("20140926 1230-1130", format(@fmt, false, "-1130"))
+    end
+
+    def test_specific_utc_pHH
+      assert_equal("20140927 1200+1200", format(@fmt, false, "+12"))
+    end
+
+    def test_specific_utc_nHH
+      assert_equal("20140926 1100-1300", format(@fmt, false, "-13"))
+    end
+
+    def test_specific_utc_timezone_1
+      # Europe/Moscow (+04:00) does not have daylight saving time.
+      assert_equal("20140927 0400+0400", format(@fmt, false, "Europe/Moscow"))
+    end
+
+    def test_specific_utc_timezone_2
+      # Pacific/Galapagos (-06:00) does not have daylight saving time.
+      assert_equal("20140926 1800-0600", format(@fmt, false, "Pacific/Galapagos"))
+    end
+
+    def test_specific_utc_timezone_3
+      # America/Argentina/Buenos_Aires (-03:00) does not have daylight saving time.
+      assert_equal("20140926 2100-0300", format(@fmt, false, "America/Argentina/Buenos_Aires"))
+    end
+
+    def test_specific_utc_timezone_4
+      # America/Los_Angeles has daylight saving time. Its UTC offset is -08:00 and its
+      # UTC offset in DST is -07:00. In September, America/Los_Angeles is in DST.
+      assert_equal("20140926 1700-0700", format(@fmt, false, "America/Los_Angeles"))
+    end
+
+    def test_specific_utc_timezone_5
+      # America/Los_Angeles has daylight saving time. Its UTC offset is -08:00 and its
+      # UTC offset in DST is -07:00. In January, America/Los_Angeles is not in DST.
+      @time = Time.new(2014, 1, 24, 0, 0, 0, 0).to_i
+      assert_equal("20140123 1600-0800", format(@fmt, false, "America/Los_Angeles"))
+    end
+
+    def test_specific_utc_invalid
+      assert_equal("20140927 0000+0000", format(@fmt, false, "Invalid"))
+    end
+
+    def test_specific_localtime_nil_1
+      with_timezone("UTC-07") do
+        assert_equal("20140927 0700+0700", format(@fmt, true, nil))
+      end
+    end
+
+    def test_specific_localtime_nil_2
+      with_timezone("UTC+08") do
+        assert_equal("20140926 1600-0800", format(@fmt, true, nil))
+      end
+    end
+
+    def test_specific_localtime_timezone
+      # 'timezone' takes precedence over 'localtime'.
+      with_timezone("UTC-09") do
+        assert_equal("20140926 1400-1000", format(@fmt, true, "-10"))
+      end
+    end
+  end
+
+  class TimeConfigTest < ::Test::Unit::TestCase
+    include FormatterTest
+
+    def setup
+      @formatter = TextFormatter::LabeledTSVFormatter.new
+      @time      = Time.new(2014, 9, 27, 0, 0, 0, 0).to_i
+    end
+
+    def format(conf)
+      @formatter.configure({'include_time_key' => true}.merge(conf))
+      formatted = @formatter.format("tag", @time, {})
+      # Drop the leading "time:" and the trailing "\n".
+      formatted[5..-2]
+    end
+
+    def test_none
+      with_timezone("UTC-01") do
+        # 'localtime' is true by default.
+        assert_equal("2014-09-27T01:00:00+01:00", format({}))
+      end
+    end
+
+    def test_utc
+      with_timezone("UTC-01") do
+        # 'utc' takes precedence over 'localtime'.
+        assert_equal("2014-09-27T00:00:00Z", format("utc" => true))
+      end
+    end
+
+    def test_timezone
+      with_timezone("UTC-01") do
+        # 'timezone' takes precedence over 'localtime'.
+        assert_equal("2014-09-27T02:00:00+02:00", format("timezone" => "+02"))
+      end
+    end
+
+    def test_utc_timezone
+      with_timezone("UTC-01") do
+        # 'timezone' takes precedence over 'utc'.
+        assert_equal("2014-09-27T09:00:00+09:00", format("utc" => true, "timezone" => "Asia/Tokyo"))
+      end
+    end
+  end
 end

data/test/test_match.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
-
+require 'helper'
 require 'fluent/match'
 
 class MatchTest < Test::Unit::TestCase

data/test/test_mixin.rb

@@ -27,15 +27,17 @@ module MixinTest
     end
 
     @@num = 0
+
     def create_register_output_name
-      "mixin_text_#{@@num+=1}"
+      @@num += 1
+      "mixin_text_#{@@num}"
     end
 
     def format_check(hash, tagname = 'test')
       mock(Checker).format_check(tagname, @time.to_i, hash)
     end
 
-    def create_driver(include_klass, conf = '', tag = "test")
+    def create_driver(include_klass, conf = '', tag = "test", &block)
       register_output_name = create_register_output_name
       include_klasses = [include_klass].flatten
 
@@ -51,6 +53,11 @@ module MixinTest
         def write(chunk); end
       }
 
+      if block
+        Utils.const_set("MixinTestClass#{@@num}", klass)
+        klass.module_eval(&block)
+      end
+
       Fluent::Test::BufferedOutputTestDriver.new(klass, tag) {
       }.configure("type #{register_output_name}" + conf)
     end
@@ -110,6 +117,19 @@ module MixinTest
       d.emit({'a' => 1})
       d.run
     end
+
+    sub_test_case "mixin" do
+      data(
+        'true' => true,
+        'false' => false)
+      test 'include_tag_key' do |param|
+        d = create_driver(Fluent::SetTagKeyMixin) {
+          config_set_default :include_tag_key, param
+        }
+
+        assert_equal(param, d.instance.include_tag_key)
+      end
+    end
   end
 
   class SetTimeKeyMixinText < Test::Unit::TestCase
@@ -155,6 +175,58 @@ module MixinTest
       d.emit({'a' => 1})
       d.run
     end
+
+    def test_timezone_1
+      format_check({
+        'time' => "2010-05-03T17:02:01-10:00",
+        'a' => 1
+      })
+
+      d = create_driver(Fluent::SetTimeKeyMixin, %[
+      include_time_key true
+      timezone Pacific/Honolulu
+      ])
+
+      d.emit({'a' => 1})
+      d.run
+    end
+
+    def test_timezone_2
+      format_check({
+        'time' => "2010-05-04T08:32:01+05:30",
+        'a' => 1
+      })
+
+      d = create_driver(Fluent::SetTimeKeyMixin, %[
+      include_time_key true
+      timezone +05:30
+      ])
+
+      d.emit({'a' => 1})
+      d.run
+    end
+
+    def test_timezone_invalid
+      assert_raise(Fluent::ConfigError) do
+        d = create_driver(Fluent::SetTimeKeyMixin, %[
+        include_time_key true
+        timezone Invalid/Invalid
+        ])
+      end
+    end
+
+    sub_test_case "mixin" do
+      data(
+        'true' => true,
+        'false' => false)
+      test 'include_time_key' do |param|
+        d = create_driver(Fluent::SetTimeKeyMixin) {
+          config_set_default :include_time_key, param
+        }
+
+        assert_equal(param, d.instance.include_time_key)
+      end
+    end
   end
 
   class HandleTagMixinTest < Test::Unit::TestCase

data/test/test_parser.rb

@@ -34,7 +34,7 @@ module ParserTest
       parser = TextParser::TimeParser.new(nil)
 
       [[], {}, nil, true, 10000].each { |v|
-        assert_raise ArgumentError do
+        assert_raise Fluent::TextParser::ParserError do
           parser.parse(v)
         end
       }
@@ -288,6 +288,12 @@ module ParserTest
         assert_nil time, "parser return nil w/o time and if specified so"
       }
     end
+
+    def test_call_with_invalid_time
+      assert_raise Fluent::TextParser::ParserError do
+        @parser.call('{"time":[],"k":"v"}') { |time, record| }
+      end
+    end
   end
 
   class NginxParserTest < ::Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.1
+  version: 0.12.0.pre.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -112,6 +112,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: string-scrub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,20 +196,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +238,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 description: Fluentd is an open source data collector designed to scale and simplify
   log management. It can collect, process and ship many kinds of data in near real-time.
 email:
@@ -244,6 +286,7 @@ files:
 - example/out_copy.conf
 - example/out_file.conf
 - example/out_forward.conf
+- example/v1_literal_example.conf
 - fluent.conf
 - fluentd.gemspec
 - lib/fluent/agent.rb
@@ -281,8 +324,9 @@ files:
 - lib/fluent/plugin.rb
 - lib/fluent/plugin/buf_file.rb
 - lib/fluent/plugin/buf_memory.rb
-- lib/fluent/plugin/buf_zfile.rb
 - lib/fluent/plugin/exec_util.rb
+- lib/fluent/plugin/filter_grep.rb
+- lib/fluent/plugin/filter_record_transformer.rb
 - lib/fluent/plugin/in_debug_agent.rb
 - lib/fluent/plugin/in_exec.rb
 - lib/fluent/plugin/in_forward.rb
@@ -317,16 +361,16 @@ files:
 - lib/fluent/test/base.rb
 - lib/fluent/test/input_test.rb
 - lib/fluent/test/output_test.rb
+- lib/fluent/timezone.rb
 - lib/fluent/version.rb
-- spec/config/config_parser_spec.rb
-- spec/config/configurable_spec.rb
-- spec/config/configure_proxy_spec.rb
-- spec/config/dsl_spec.rb
-- spec/config/helper.rb
-- spec/config/literal_parser_spec.rb
-- spec/config/section_spec.rb
-- spec/config/system_config_spec.rb
-- spec/spec_helper.rb
+- test/config/assertions.rb
+- test/config/test_config_parser.rb
+- test/config/test_configurable.rb
+- test/config/test_configure_proxy.rb
+- test/config/test_dsl.rb
+- test/config/test_literal_parser.rb
+- test/config/test_section.rb
+- test/config/test_system_config.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -334,6 +378,10 @@ files:
 - test/plugin/data/log/bar
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/test.log
+- test/plugin/test_buf_file.rb
+- test/plugin/test_buf_memory.rb
+- test/plugin/test_filter_grep.rb
+- test/plugin/test_filter_record_transformer.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
@@ -356,6 +404,7 @@ files:
 - test/scripts/exec_script.rb
 - test/scripts/fluent/plugin/formatter_known.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
 - test/test_formatter.rb
@@ -387,15 +436,14 @@ signing_key:
 specification_version: 4
 summary: Fluentd event collector
 test_files:
-- spec/config/config_parser_spec.rb
-- spec/config/configurable_spec.rb
-- spec/config/configure_proxy_spec.rb
-- spec/config/dsl_spec.rb
-- spec/config/helper.rb
-- spec/config/literal_parser_spec.rb
-- spec/config/section_spec.rb
-- spec/config/system_config_spec.rb
-- spec/spec_helper.rb
+- test/config/assertions.rb
+- test/config/test_config_parser.rb
+- test/config/test_configurable.rb
+- test/config/test_configure_proxy.rb
+- test/config/test_dsl.rb
+- test/config/test_literal_parser.rb
+- test/config/test_section.rb
+- test/config/test_system_config.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -403,6 +451,10 @@ test_files:
 - test/plugin/data/log/bar
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/test.log
+- test/plugin/test_buf_file.rb
+- test/plugin/test_buf_memory.rb
+- test/plugin/test_filter_grep.rb
+- test/plugin/test_filter_record_transformer.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
@@ -425,6 +477,7 @@ test_files:
 - test/scripts/exec_script.rb
 - test/scripts/fluent/plugin/formatter_known.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
 - test/test_formatter.rb