fluentd 0.12.20 → 0.12.21

data/lib/fluent/test.rb

@@ -15,7 +15,7 @@
 #
 
 require 'test/unit'
-require 'fluent/load'
+require 'fluent/env' # for Fluent.windows?
 require 'fluent/test/base'
 require 'fluent/test/input_test'
 require 'fluent/test/output_test'

data/lib/fluent/test/base.rb

@@ -14,11 +14,15 @@
 #    limitations under the License.
 #
 
+require 'fluent/engine'
+require 'fluent/system_config'
+require 'fluent/config'
+
 module Fluent
   module Test
     def self.setup
       Fluent.__send__(:remove_const, :Engine)
-      engine = Fluent.const_set(:Engine, EngineClass.new).init
+      engine = Fluent.const_set(:Engine, EngineClass.new).init(SystemConfig.new)
 
       engine.define_singleton_method(:now=) {|n|
         @now = n.to_i
@@ -47,6 +51,7 @@ module Fluent
         end
         @instance.router = Engine.root_agent.event_router
         @instance.log = TestLogger.new
+        Engine.root_agent.instance_variable_set(:@log, @instance.log)
 
         @config = Config.new
       end

data/lib/fluent/test/filter_test.rb

@@ -14,6 +14,10 @@
 #    limitations under the License.
 #
 
+require 'fluent/test/base'
+require 'fluent/event'
+require 'fluent/filter'
+
 module Fluent
   module Test
     class FilterTestDriver < TestDriver

data/lib/fluent/test/formatter_test.rb

@@ -14,10 +14,11 @@
 #    limitations under the License.
 #
 
+require 'fluent/formatter'
+require 'fluent/config'
+
 module Fluent
   module Test
-    require 'fluent/config'
-
     class FormatterTestDriver
       def initialize(klass_or_str, proc=nil, &block)
         if klass_or_str.is_a?(Class)

data/lib/fluent/test/input_test.rb

@@ -14,6 +14,12 @@
 #    limitations under the License.
 #
 
+require 'fluent/input'
+require 'fluent/buffer'
+require 'fluent/engine'
+require 'fluent/time'
+require 'fluent/test/base'
+
 module Fluent
   class FileBuffer < BasicBuffer
     def self.clear_buffer_paths

data/lib/fluent/test/output_test.rb

@@ -14,6 +14,10 @@
 #    limitations under the License.
 #
 
+require 'fluent/engine'
+require 'fluent/event'
+require 'fluent/test/input_test'
+
 module Fluent
   module Test
     class TestOutputChain

data/lib/fluent/test/parser_test.rb

@@ -14,10 +14,11 @@
 #    limitations under the License.
 #
 
+require 'fluent/parser'
+require 'fluent/config'
+
 module Fluent
   module Test
-    require 'fluent/config'
-
     class ParserTestDriver
       def initialize(klass_or_str, format=nil, conf={}, &block)
         if klass_or_str.is_a?(Class)

data/lib/fluent/timezone.rb

@@ -16,6 +16,8 @@
 
 require 'tzinfo'
 
+require 'fluent/config/error'
+
 module Fluent
   class Timezone
     # [+-]HH:MM, [+-]HHMM, [+-]HH

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.20'
+  VERSION = '0.12.21'
 
 end

data/test/config/test_configurable.rb

@@ -7,14 +7,14 @@ module ConfigurableSpec
   class Base1
     include Fluent::Configurable
 
-    config_param :node, :string, :default => "node"
-    config_param :flag1, :bool, :default => false
-    config_param :flag2, :bool, :default => true
+    config_param :node, :string, default: "node"
+    config_param :flag1, :bool, default: false
+    config_param :flag2, :bool, default: true
 
     config_param :name1, :string
     config_param :name2, :string
-    config_param :name3, :string, :default => "base1"
-    config_param :name4, :string, :default => "base1"
+    config_param :name3, :string, default: "base1"
+    config_param :name4, :string, default: "base1"
 
     config_param :opt1, :enum, list: [:foo, :bar, :baz]
     config_param :opt2, :enum, list: [:foo, :bar, :baz], default: :foo
@@ -29,7 +29,7 @@ module ConfigurableSpec
     config_set_default :name4, "base2"
     config_set_default :opt1, :bar
     config_param :name5, :string
-    config_param :name6, :string, :default => "base2"
+    config_param :name6, :string, default: "base2"
     config_param :opt3, :enum, list: [:a, :b]
 
     def get_all
@@ -41,7 +41,7 @@ module ConfigurableSpec
   class Base3 < Base2
     config_set_default :opt3, :a
     config_section :node do
-      config_param :name, :string, :default => "node"
+      config_param :name, :string, default: "node"
       config_param :type, :string
     end
     config_section :branch, required: true, multi: true do
@@ -65,8 +65,8 @@ module ConfigurableSpec
     config_set_default :opt3, :a
     config_section :node, param_name: :nodes do
       config_argument :num, :integer
-      config_param :name, :string, :default => "node"
-      config_param :type, :string, :default => "b4"
+      config_param :name, :string, default: "node"
+      config_param :type, :string, default: "b4"
     end
     config_section :description1, required: false, multi: false do
       config_argument :note, :string, default: "desc1"
@@ -151,11 +151,11 @@ module ConfigurableSpec
     include Fluent::Configurable
 
     config_param :normal_param, :string
-    config_param :secret_param, :string, :secret => true
+    config_param :secret_param, :string, secret: true
 
     config_section :section  do
       config_param :normal_param2, :string
-      config_param :secret_param2, :string, :secret => true
+      config_param :secret_param2, :string, secret: true
     end
   end
 end

data/test/config/test_configure_proxy.rb

@@ -127,7 +127,7 @@ module Fluent::Config
         test 'does not permit description specification twice' do
           @proxy.desc("description1")
           assert_raise(ArgumentError) do
-            @proxy.config_param(:name, :string, :desc => "description2")
+            @proxy.config_param(:name, :string, desc: "description2")
           end
         end
       end

data/test/config/test_system_config.rb

@@ -2,7 +2,7 @@ require_relative '../helper'
 require 'fluent/configurable'
 require 'fluent/config/element'
 require 'fluent/config/section'
-require 'fluent/supervisor'
+require 'fluent/system_config'
 
 module Fluent::Config
   class FakeLoggerInitializer
@@ -36,7 +36,7 @@ module Fluent::Config
         </system>
       EOS
       s = FakeSupervisor.new
-      sc = Fluent::Supervisor::SystemConfig.new(conf)
+      sc = Fluent::SystemConfig.new(conf)
       sc.apply(s)
       assert_nil(sc.log_level)
       assert_nil(sc.suppress_repeated_stacktrace)
@@ -63,7 +63,7 @@ module Fluent::Config
           </system>
         EOS
         s = FakeSupervisor.new
-        sc = Fluent::Supervisor::SystemConfig.new(conf)
+        sc = Fluent::SystemConfig.new(conf)
         sc.apply(s)
         assert_not_nil(sc.instance_variable_get("@#{k}"))
         key = (k == 'emit_error_log_interval' ? 'suppress_interval' : k)
@@ -74,7 +74,7 @@ module Fluent::Config
     {'foo' => 'bar', 'hoge' => 'fuga'}.each { |k, v|
       test "should not affect settable parameters with unknown #{k} parameter" do
         s = FakeSupervisor.new
-        sc = Fluent::Supervisor::SystemConfig.new({k => v})
+        sc = Fluent::SystemConfig.new({k => v})
         sc.apply(s)
         assert_nil(s.instance_variable_get(:@log_level))
         assert_nil(s.instance_variable_get(:@suppress_repeated_stacktrace))
@@ -91,7 +91,7 @@ module Fluent::Config
         </system>
       EOS
       s = FakeSupervisor.new
-      sc = Fluent::Supervisor::SystemConfig.new(conf)
+      sc = Fluent::SystemConfig.new(conf)
       sc.apply(s)
       assert_equal(Fluent::Log::LEVEL_WARN, s.instance_variable_get("@log").level)
     end

data/test/config/test_types.rb

@@ -60,4 +60,74 @@ class TestConfigTypes < ::Test::Unit::TestCase
       assert_nil Config.bool_value(10)
     end
   end
+
+  sub_test_case 'type converters for config_param definitions' do
+    test 'string' do
+      assert_equal 'test', Config::STRING_TYPE.call('test', {})
+      assert_equal '1', Config::STRING_TYPE.call('1', {})
+      assert_equal '   ', Config::STRING_TYPE.call('   ', {})
+    end
+
+    test 'enum' do
+      assert_equal :val, Config::ENUM_TYPE.call('val', {list: [:val, :value, :v]})
+      assert_equal :v, Config::ENUM_TYPE.call('v', {list: [:val, :value, :v]})
+      assert_equal :value, Config::ENUM_TYPE.call('value', {list: [:val, :value, :v]})
+      assert_raises(Fluent::ConfigError){ Config::ENUM_TYPE.call('x', {list: [:val, :value, :v]}) }
+      assert_raises(RuntimeError){ Config::ENUM_TYPE.call('val', {}) }
+      assert_raises(RuntimeError){ Config::ENUM_TYPE.call('val', {list: ["val", "value", "v"]}) }
+    end
+
+    test 'integer' do
+      assert_equal 1, Config::INTEGER_TYPE.call('1', {})
+      assert_equal 1, Config::INTEGER_TYPE.call('1.0', {})
+      assert_equal 1000, Config::INTEGER_TYPE.call('1_000', {})
+      assert_equal 1, Config::INTEGER_TYPE.call('1x', {})
+    end
+
+    test 'float' do
+      assert_equal 1.0, Config::FLOAT_TYPE.call('1', {})
+      assert_equal 1.0, Config::FLOAT_TYPE.call('1.0', {})
+      assert_equal 1.0, Config::FLOAT_TYPE.call('1.00', {})
+      assert_equal 1.0, Config::FLOAT_TYPE.call('1e0', {})
+    end
+
+    test 'size' do
+      assert_equal 1000, Config::SIZE_TYPE.call('1000', {})
+      assert_equal 1024, Config::SIZE_TYPE.call('1k', {})
+      assert_equal 1024*1024, Config::SIZE_TYPE.call('1m', {})
+    end
+
+    test 'bool' do
+      assert_equal true, Config::BOOL_TYPE.call('true', {})
+      assert_equal true, Config::BOOL_TYPE.call('yes', {})
+      assert_equal false, Config::BOOL_TYPE.call('no', {})
+      assert_equal false, Config::BOOL_TYPE.call('false', {})
+
+      assert_equal nil, Config::BOOL_TYPE.call('TRUE', {})
+      assert_equal nil, Config::BOOL_TYPE.call('True', {})
+      assert_equal nil, Config::BOOL_TYPE.call('Yes', {})
+      assert_equal nil, Config::BOOL_TYPE.call('No', {})
+
+      assert_equal true, Config::BOOL_TYPE.call('', {})
+      assert_equal nil, Config::BOOL_TYPE.call('unexpected_string', {})
+    end
+
+    test 'time' do
+      assert_equal 0, Config::TIME_TYPE.call('0', {})
+      assert_equal 1.0, Config::TIME_TYPE.call('1', {})
+      assert_equal 1.01, Config::TIME_TYPE.call('1.01', {})
+      assert_equal 1, Config::TIME_TYPE.call('1s', {})
+      assert_equal 60, Config::TIME_TYPE.call('1m', {})
+      assert_equal 3600, Config::TIME_TYPE.call('1h', {})
+      assert_equal 86400, Config::TIME_TYPE.call('1d', {})
+    end
+
+    test 'hash' do
+      assert_equal({"x"=>"v","k"=>1}, Config::HASH_TYPE.call('{"x":"v","k":1}', {}))
+    end
+
+    test 'array' do
+      assert_equal(["1","2",1], Config::ARRAY_TYPE.call('["1","2",1]', {}))
+    end
+  end
 end

data/test/plugin/test_filter_record_transformer.rb

@@ -351,41 +351,41 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
           { "source" => nil },
         ]
         expected_results = [
-          { :single      => "string",
-            :multiple    => "stringstring",
-            :with_prefix => "prefix-string",
-            :with_suffix => "string-suffix",
-            :with_quote  => %Q{source[""]} },
-          { :single      => 123.to_s,
-            :multiple    => "#{123.to_s}#{123.to_s}",
-            :with_prefix => "prefix-#{123.to_s}",
-            :with_suffix => "#{123.to_s}-suffix",
-            :with_quote  => %Q{source[""]} },
-          { :single      => [1, 2].to_s,
-            :multiple    => "#{[1, 2].to_s}#{[1, 2].to_s}",
-            :with_prefix => "prefix-#{[1, 2].to_s}",
-            :with_suffix => "#{[1, 2].to_s}-suffix",
-            :with_quote  => %Q{source[""]} },
-          { :single      => {a:1, b:2}.to_s,
-            :multiple    => "#{{a:1, b:2}.to_s}#{{a:1, b:2}.to_s}",
-            :with_prefix => "prefix-#{{a:1, b:2}.to_s}",
-            :with_suffix => "#{{a:1, b:2}.to_s}-suffix",
-            :with_quote  => %Q{source[""]} },
-          { :single      => nil.to_s,
-            :multiple    => "#{nil.to_s}#{nil.to_s}",
-            :with_prefix => "prefix-#{nil.to_s}",
-            :with_suffix => "#{nil.to_s}-suffix",
-            :with_quote  => %Q{source[""]} },
+          { single: "string",
+            multiple: "stringstring",
+            with_prefix: "prefix-string",
+            with_suffix: "string-suffix",
+            with_quote: %Q{source[""]} },
+          { single: 123.to_s,
+            multiple: "#{123.to_s}#{123.to_s}",
+            with_prefix: "prefix-#{123.to_s}",
+            with_suffix: "#{123.to_s}-suffix",
+            with_quote: %Q{source[""]} },
+          { single: [1, 2].to_s,
+            multiple: "#{[1, 2].to_s}#{[1, 2].to_s}",
+            with_prefix: "prefix-#{[1, 2].to_s}",
+            with_suffix: "#{[1, 2].to_s}-suffix",
+            with_quote: %Q{source[""]} },
+          { single: {a:1, b:2}.to_s,
+            multiple: "#{{a:1, b:2}.to_s}#{{a:1, b:2}.to_s}",
+            with_prefix: "prefix-#{{a:1, b:2}.to_s}",
+            with_suffix: "#{{a:1, b:2}.to_s}-suffix",
+            with_quote: %Q{source[""]} },
+          { single: nil.to_s,
+            multiple: "#{nil.to_s}#{nil.to_s}",
+            with_prefix: "prefix-#{nil.to_s}",
+            with_suffix: "#{nil.to_s}-suffix",
+            with_quote: %Q{source[""]} },
         ]
         actual_results = []
         es = emit(config, msgs)
         es.each_with_index do |(t, r), i|
           actual_results << {
-            :single      => r["single"],
-            :multiple    => r["multiple"],
-            :with_prefix => r["with_prefix"],
-            :with_suffix => r["with_suffix"],
-            :with_quote  => r["with_quote"],
+            single: r["single"],
+            multiple: r["multiple"],
+            with_prefix: r["with_prefix"],
+            with_suffix: r["with_suffix"],
+            with_quote: r["with_quote"],
           }
         end
         assert_equal(expected_results, actual_results)
@@ -410,35 +410,35 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
           { "source" => nil },
         ]
         expected_results = [
-          { :single      => "string",
-            :multiple    => "stringstring",
-            :with_prefix => "prefix-string",
-            :with_suffix => "string-suffix" },
-          { :single      => 123,
-            :multiple    => "#{123.to_s}#{123.to_s}",
-            :with_prefix => "prefix-#{123.to_s}",
-            :with_suffix => "#{123.to_s}-suffix" },
-          { :single      => [1, 2],
-            :multiple    => "#{[1, 2].to_s}#{[1, 2].to_s}",
-            :with_prefix => "prefix-#{[1, 2].to_s}",
-            :with_suffix => "#{[1, 2].to_s}-suffix" },
-          { :single      => {a:1, b:2},
-            :multiple    => "#{{a:1, b:2}.to_s}#{{a:1, b:2}.to_s}",
-            :with_prefix => "prefix-#{{a:1, b:2}.to_s}",
-            :with_suffix => "#{{a:1, b:2}.to_s}-suffix" },
-          { :single      => nil,
-            :multiple    => "#{nil.to_s}#{nil.to_s}",
-            :with_prefix => "prefix-#{nil.to_s}",
-            :with_suffix => "#{nil.to_s}-suffix" },
+          { single: "string",
+            multiple: "stringstring",
+            with_prefix: "prefix-string",
+            with_suffix: "string-suffix" },
+          { single: 123,
+            multiple: "#{123.to_s}#{123.to_s}",
+            with_prefix: "prefix-#{123.to_s}",
+            with_suffix: "#{123.to_s}-suffix" },
+          { single: [1, 2],
+            multiple: "#{[1, 2].to_s}#{[1, 2].to_s}",
+            with_prefix: "prefix-#{[1, 2].to_s}",
+            with_suffix: "#{[1, 2].to_s}-suffix" },
+          { single: {a:1, b:2},
+            multiple: "#{{a:1, b:2}.to_s}#{{a:1, b:2}.to_s}",
+            with_prefix: "prefix-#{{a:1, b:2}.to_s}",
+            with_suffix: "#{{a:1, b:2}.to_s}-suffix" },
+          { single: nil,
+            multiple: "#{nil.to_s}#{nil.to_s}",
+            with_prefix: "prefix-#{nil.to_s}",
+            with_suffix: "#{nil.to_s}-suffix" },
         ]
         actual_results = []
         es = emit(config, msgs)
         es.each_with_index do |(t, r), i|
           actual_results << {
-            :single      => r["single"],
-            :multiple    => r["multiple"],
-            :with_prefix => r["with_prefix"],
-            :with_suffix => r["with_suffix"],
+            single: r["single"],
+            multiple: r["multiple"],
+            with_prefix: r["with_prefix"],
+            with_suffix: r["with_suffix"],
           }
         end
         assert_equal(expected_results, actual_results)
@@ -508,6 +508,23 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
       end
     end
 
+    test 'auto_typecast placeholder containing {} (enable_ruby yes)' do
+      config = %[
+        tag tag
+        enable_ruby yes
+        auto_typecast yes
+        <record>
+          foo ${record.map{|k,v|v}}
+        </record>
+      ]
+      d = create_driver(config)
+      message = {"@timestamp" => "foo"}
+      es = d.run { d.emit(message, @time) }.filtered
+      es.each do |t, r|
+        assert_equal([message["@timestamp"]], r['foo'])
+      end
+    end
+
     test 'expand fields starting with @ (enable_ruby yes)' do
       config = %[
         enable_ruby yes
@@ -522,7 +539,7 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
         assert_equal(message["@timestamp"], r['foo'])
       end
     end
-  end
+  end # test placeholders
 
   test "compatibility test (enable_ruby yes)" do
     config = %[