fluentd 0.10.55 → 0.10.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6c7392b51882506144d22dbef860923ca396a8
-  data.tar.gz: 57b91cf45454978c20ae3a497502c2b41580d29d
+  metadata.gz: 15aab20b26be1dd37d9f185c97971a38767f30a6
+  data.tar.gz: 782800a38871c60c45a69a36e96f8577488809fb
 SHA512:
-  metadata.gz: 09247456a29976eec30ca20b77f69bc5179a82fdbe1052133234e7b926bb8fd403bf951ea478d0fc0a9f4ba54cbfded565bf653717b350178ada538c08baac6c
-  data.tar.gz: 8f9dd61a23a67c4e90b937cdfa5d7ed881f54853ae1fe9b942f0b19e648472f8714d394af6ed21e5848b9a0a245af86974d55a28760da3c759a5e3eadf7ad671
+  metadata.gz: ed67bd0d60ed78502d18d10920343db5f78cd8b99ba012b1547d3eef1550e49d1bf0456f88cf5ede4e066a03867821007ef1dd65a19a10ddce5f9e4f8478a7d8
+  data.tar.gz: 359d689bc9ec1b8f158759a1b8a876f5b14858d845263a8b2fd32dff39c7edafb408003875dd4089c6a29d1c6bf58be38843c99e17bba1a7ff15d1ccdd90c3c9

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.10.56 - 2014/10/30
+
+* config: Add Fluent::Config::Section#object_id to avoid NoMethodError by object dump tools
+* mixin: Fix SetTagKeyMixin and SetTimeKeyMixin which ignores config_set_default since 0.10.53
+* input/output: Support 'timezone' configuration parameter (e.g. "+09:00" for JST).
+* log: Use plugin_id instead of object_id in log message for consistency with in_monitor_agent
+
 Release 0.10.55 - 2014/10/17
 
 * config: Relax '@' handling in the plugin configuration for backward compatibility

data/fluentd.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("cool.io", [">= 1.1.1", "!= 1.2.0", "< 2.0.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"])
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])
+  gem.add_runtime_dependency("tzinfo", [">= 1.0.0"])
+  gem.add_runtime_dependency("tzinfo-data", [">= 1.0.0"])
 
   gem.add_development_dependency("rake", [">= 0.9.2"])
   gem.add_development_dependency("flexmock")

data/lib/fluent/config/section.rb

@@ -14,6 +14,8 @@ module Fluent
         @params = params
       end
 
+      alias :object_id :__id__
+
       def inspect
         "<Fluent::Config::Section #{@params.to_json}>"
       end

data/lib/fluent/formatter.rb

@@ -28,6 +28,7 @@ module Fluent
           config_param :include_tag_key, :bool, :default => false
           config_param :tag_key, :string, :default => 'tag'
           config_param :localtime, :bool, :default => true
+          config_param :timezone, :string, :default => nil
         }
       end
 
@@ -37,7 +38,7 @@ module Fluent
         if conf['utc']
           @localtime = false
         end
-        @timef = TimeFormatter.new(@time_format, @localtime)
+        @timef = TimeFormatter.new(@time_format, @localtime, @timezone)
       end
 
       def filter_record(tag, time, record)

data/lib/fluent/mixin.rb

@@ -17,12 +17,21 @@
 #
 module Fluent
   class TimeFormatter
-    def initialize(format, localtime)
+    require 'fluent/timezone'
+
+    def initialize(format, localtime, timezone = nil)
       @tc1 = 0
       @tc1_str = nil
       @tc2 = 0
       @tc2_str = nil
 
+      if formatter = Fluent::Timezone.formatter(timezone, format)
+        define_singleton_method(:format_nocache) {|time|
+          formatter.call(time)
+        }
+        return
+      end
+
       if format
         if localtime
           define_singleton_method(:format_nocache) {|time|
@@ -113,15 +122,16 @@ module Fluent
   end
 
   module SetTimeKeyMixin
+    require 'fluent/timezone'
     include RecordFilterMixin
 
-    attr_accessor :include_time_key, :time_key, :localtime
+    attr_accessor :include_time_key, :time_key, :localtime, :timezone
 
     def configure(conf)
-      super
-
       @include_time_key = false
 
+      super
+
       if s = conf['include_time_key']
         include_time_key = Config.bool_value(s)
         raise ConfigError, "Invalid boolean expression '#{s}' for include_time_key parameter" if include_time_key.nil?
@@ -139,7 +149,12 @@ module Fluent
           @localtime = false
         end
 
-        @timef = TimeFormatter.new(@time_format, @localtime)
+        if conf['timezone']
+          @timezone = conf['timezone']
+          Fluent::Timezone.validate!(@timezone)
+        end
+
+        @timef = TimeFormatter.new(@time_format, @localtime, @timezone)
       end
     end
 
@@ -156,10 +171,10 @@ module Fluent
     attr_accessor :include_tag_key, :tag_key
 
     def configure(conf)
-      super
-
       @include_tag_key = false
 
+      super
+
       if s = conf['include_tag_key']
         include_tag_key = Config.bool_value(s)
         raise ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter" if include_tag_key.nil?

data/lib/fluent/output.rb

@@ -316,7 +316,7 @@ module Fluent
           @num_errors = 0
           # Note: don't notify to other threads to prevent
           #       burst to recovered server
-          $log.warn "retry succeeded.", :instance=>object_id
+          $log.warn "retry succeeded.", :plugin_id=>plugin_id
         end
 
         if has_next
@@ -341,20 +341,20 @@ module Fluent
         end
 
         if @disable_retry_limit || error_count < @retry_limit
-          $log.warn "temporarily failed to flush the buffer.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
+          $log.warn "temporarily failed to flush the buffer.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
           $log.warn_backtrace e.backtrace
 
         elsif @secondary
           if error_count == @retry_limit
-            $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
+            $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
             $log.warn "retry count exceededs limit. falling back to secondary output."
             $log.warn_backtrace e.backtrace
             retry  # retry immediately
           elsif error_count <= @retry_limit + @secondary_limit
-            $log.warn "failed to flush the buffer, next retry will be with secondary output.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
+            $log.warn "failed to flush the buffer, next retry will be with secondary output.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
             $log.warn_backtrace e.backtrace
           else
-            $log.warn "failed to flush the buffer.", :error_class=>e.class, :error=>e.to_s, :instance=>object_id
+            $log.warn "failed to flush the buffer.", :error_class=>e.class, :error=>e.to_s, :plugin_id=>plugin_id
             $log.warn "secondary retry count exceededs limit."
             $log.warn_backtrace e.backtrace
             write_abort
@@ -362,7 +362,7 @@ module Fluent
           end
 
         else
-          $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
+          $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
           $log.warn "retry count exceededs limit."
           $log.warn_backtrace e.backtrace
           write_abort
@@ -453,6 +453,8 @@ module Fluent
 
 
   class TimeSlicedOutput < BufferedOutput
+    require 'fluent/timezone'
+
     def initialize
       super
       @localtime = true
@@ -461,6 +463,7 @@ module Fluent
 
     config_param :time_slice_format, :string, :default => '%Y%m%d'
     config_param :time_slice_wait, :time, :default => 10*60
+    config_param :timezone, :string, :default => nil
     config_set_default :buffer_type, 'file'  # overwrite default buffer_type
     config_set_default :buffer_chunk_limit, 256*1024*1024  # overwrite default buffer_chunk_limit
     config_set_default :flush_interval, nil
@@ -470,14 +473,20 @@ module Fluent
     def configure(conf)
       super
 
-      # TODO timezone
       if conf['utc']
         @localtime = false
       elsif conf['localtime']
         @localtime = true
       end
 
-      if @localtime
+      if conf['timezone']
+        @timezone = conf['timezone']
+        Fluent::Timezone.validate!(@timezone)
+      end
+
+      if @timezone
+        @time_slicer = Timezone.formatter(@timezone, @time_slice_format)
+      elsif @localtime
         @time_slicer = Proc.new {|time|
           Time.at(time).strftime(@time_slice_format)
         }

data/lib/fluent/plugin/in_exec.rb

@@ -22,6 +22,7 @@ module Fluent
     def initialize
       super
       require 'fluent/plugin/exec_util'
+      require 'fluent/timezone'
     end
 
     SUPPORTED_FORMAT = {
@@ -54,6 +55,11 @@ module Fluent
         @localtime = false
       end
 
+      if conf['timezone']
+        @timezone = conf['timezone']
+        Fluent::Timezone.validate!(@timezone)
+      end
+
       if !@tag && !@tag_key
         raise ConfigError, "'tag' or 'tag_key' option is required on exec input"
       end

data/lib/fluent/plugin/out_exec.rb

@@ -58,7 +58,7 @@ module Fluent
 
       if @time_key
         if @time_format
-          tf = TimeFormatter.new(@time_format, @localtime)
+          tf = TimeFormatter.new(@time_format, @localtime, @timezone)
           @time_format_proc = tf.method(:format)
         else
           @time_format_proc = Proc.new { |time| time.to_s }

data/lib/fluent/plugin/out_exec_filter.rb

@@ -24,6 +24,7 @@ module Fluent
 
     def initialize
       super
+      require 'fluent/timezone'
     end
 
     config_param :command, :string
@@ -61,6 +62,7 @@ module Fluent
     config_param :time_format, :string, :default => nil
 
     config_param :localtime, :bool, :default => true
+    config_param :timezone, :string, :default => nil
     config_param :num_children, :integer, :default => 1
 
     # nil, 'none' or 0: no respawn, 'inf' or -1: infinite times, positive integer: try to respawn specified times only
@@ -98,13 +100,18 @@ module Fluent
         @localtime = false
       end
 
+      if conf['timezone']
+        @timezone = conf['timezone']
+        Fluent::Timezone.validate!(@timezone)
+      end
+
       if !@tag && !@out_tag_key
         raise ConfigError, "'tag' or 'out_tag_key' option is required on exec_filter output"
       end
 
       if @in_time_key
         if f = @in_time_format
-          tf = TimeFormatter.new(f, @localtime)
+          tf = TimeFormatter.new(f, @localtime, @timezone)
           @time_format_proc = tf.method(:format)
         else
           @time_format_proc = Proc.new {|time| time.to_s }

data/lib/fluent/plugin/out_forward.rb

@@ -87,7 +87,7 @@ module Fluent
         node_conf = NodeConfig.new(name, host, port, weight, standby, failure,
           @phi_threshold, recover_sample_size, @expire_dns_cache, @phi_failure_detector)
         @nodes << Node.new(log, node_conf)
-        log.info "adding forwarding server '#{name}'", :host=>host, :port=>port, :weight=>weight
+        log.info "adding forwarding server '#{name}'", :host=>host, :port=>port, :weight=>weight, :plugin_id=>plugin_id
       }
     end
 

data/lib/fluent/timezone.rb

@@ -0,0 +1,131 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'tzinfo'
+
+module Fluent
+  class Timezone
+    # [+-]HH:MM, [+-]HHMM, [+-]HH
+    NUMERIC_PATTERN = %r{\A[+-]\d\d(:?\d\d)?\z}
+
+    # Region/Zone, Region/Zone/Zone
+    NAME_PATTERN = %r{\A[^/]+/[^/]+(/[^/]+)?\z}
+
+    # Validate the format of the specified timezone.
+    #
+    # Valid formats are as follows. Note that timezone abbreviations
+    # such as PST and JST are not supported intentionally.
+    #
+    #   1. [+-]HH:MM         (e.g. "+09:00")
+    #   2. [+-]HHMM          (e.g. "+0900")
+    #   3. [+-]HH            (e.g. "+09")
+    #   4. Region/Zone       (e.g. "Asia/Tokyo")
+    #   5. Region/Zone/Zone  (e.g. "America/Argentina/Buenos_Aires")
+    #
+    # In the 4th and 5th cases, it is checked whether the specified
+    # timezone exists in the timezone database.
+    #
+    # When the given timezone is valid, true is returned. Otherwise,
+    # false is returned. When nil is given, false is returned.
+    def self.validate(timezone)
+      # If the specified timezone is nil.
+      if timezone.nil?
+        # Invalid.
+        return false
+      end
+
+      # [+-]HH:MM, [+-]HHMM, [+-]HH
+      if NUMERIC_PATTERN === timezone
+        # Valid. It can be parsed by Time.zone_offset method.
+        return true
+      end
+
+      # Region/Zone, Region/Zone/Zone
+      if NAME_PATTERN === timezone
+        begin
+          # Get a Timezone instance for the specified timezone.
+          TZInfo::Timezone.get(timezone)
+        rescue
+          # Invalid. The string does not exist in the timezone database.
+          return false
+        else
+          # Valid. The string was found in the timezone database.
+          return true
+        end
+      else
+        # Invalid. Timezone abbreviations are not supported.
+        return false
+      end
+    end
+
+    # Validate the format of the specified timezone.
+    #
+    # The implementation of this method calls validate(timezone) method
+    # to check whether the given timezone is valid. When invalid, this
+    # method raises a ConfigError.
+    def self.validate!(timezone)
+      unless validate(timezone)
+        raise ConfigError, "Unsupported timezone '#{timezone}'"
+      end
+    end
+
+    # Create a formatter for a timezone and optionally a format.
+    #
+    # An Proc object is returned. If the given timezone is invalid,
+    # nil is returned.
+    def self.formatter(timezone, format = nil)
+      if timezone.nil?
+        return nil
+      end
+
+      # [+-]HH:MM, [+-]HHMM, [+-]HH
+      if NUMERIC_PATTERN === timezone
+        offset = Time.zone_offset(timezone)
+
+        if format
+          return Proc.new {|time|
+            Time.at(time).localtime(offset).strftime(format)
+          }
+        else
+          return Proc.new {|time|
+            Time.at(time).localtime(offset).iso8601
+          }
+        end
+      end
+
+      # Region/Zone, Region/Zone/Zone
+      if NAME_PATTERN === timezone
+        begin
+          tz = TZInfo::Timezone.get(timezone)
+        rescue
+          return nil
+        end
+
+        if format
+          return Proc.new {|time|
+            Time.at(time).localtime(tz.period_for_utc(time).utc_total_offset).strftime(format)
+          }
+        else
+          return Proc.new {|time|
+            Time.at(time).localtime(tz.period_for_utc(time).utc_total_offset).iso8601
+          }
+        end
+      end
+
+      return nil
+    end
+  end
+end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.55'
+  VERSION = '0.10.56'
 
 end

data/test/config/test_section.rb

@@ -45,6 +45,16 @@ module Fluent::Config
           end
         end
 
+        sub_test_case '#object_id' do
+          test 'returns its object id' do
+            s1 = Fluent::Config::Section.new({})
+            assert s1.object_id
+            s2 = Fluent::Config::Section.new({})
+            assert s2.object_id
+            assert_not_equal s1.object_id, s2.object_id
+          end
+        end
+
         sub_test_case '#to_h' do
           test 'returns internal hash itself' do
             hash = {

data/test/plugin/test_out_file.rb

@@ -63,6 +63,41 @@ class FileOutputTest < Test::Unit::TestCase
     d.run
   end
 
+  def test_timezone_1
+    d = create_driver %[
+      path #{TMP_DIR}/out_file_test
+      timezone Asia/Taipei
+    ]
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+
+    d.emit({"a"=>1}, time)
+    d.expect_format %[2011-01-02T21:14:15+08:00\ttest\t{"a":1}\n]
+    d.run
+  end
+
+  def test_timezone_2
+    d = create_driver %[
+      path #{TMP_DIR}/out_file_test
+      timezone -03:30
+    ]
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+
+    d.emit({"a"=>1}, time)
+    d.expect_format %[2011-01-02T09:44:15-03:30\ttest\t{"a":1}\n]
+    d.run
+  end
+
+  def test_timezone_invalid
+    assert_raise(Fluent::ConfigError) do
+      create_driver %[
+        path #{TMP_DIR}/out_file_test
+        timezone Invalid/Invalid
+      ]
+    end
+  end
+
   def check_gzipped_result(path, expect)
     # Zlib::GzipReader has a bug of concatenated file: https://bugs.ruby-lang.org/issues/9790
     # Following code from https://www.ruby-forum.com/topic/971591#979520

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_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.55
+  version: 0.10.56
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -142,6 +142,34 @@ 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +361,7 @@ 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/spec_helper.rb
 - test/config/assertions.rb