fluentd 0.12.39 → 0.12.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 457250d0787e77f19de0da31390b5f6f597fad12
-  data.tar.gz: c41f52a94f1c1a4728dd3721b32978850dd28a53
+  metadata.gz: 524485c147140fc4851fdaeab2ac208ae866363a
+  data.tar.gz: ba754459fd69e611c6930c0ac6307e47474d2503
 SHA512:
-  metadata.gz: 147e84086641e3651908789e80ad9cac70c3cd0a4dc5d0a70128bdc9e670724b4ba80a01a58abdaa5a66aca4aadbe1eba95e2d267e21d62c79317585faddb5f9
-  data.tar.gz: b51d04dea05b51b558c89d703ada04f1c431874b16dcfcfaaf0e8e84e7b0a51c3f8873d7d1580cd0cccc7a2f108a5fb44bdae45eb662e5227f7ff8fa31ee7076
+  metadata.gz: 722511c8f2827a6a68d4500ffe49ad761886738caed8a4823737b5d162b4cbefaeed4ecce216b144db07f9392df9b2bf4ef40cb1d24a7e750187a58ca6c57af8
+  data.tar.gz: 11eb85ece55f56692e2ecaea32eb881b9abf9d34c5b6d76358833eb5936a395e0dd080daaea9fa990c95e1b3f4bdf5bd5fbfd1aebb0ff2aac35a29bcd4f43449

data/ChangeLog

@@ -1,5 +1,16 @@
 # v0.12
 
+## Release 0.12.40 - 2017/08/25
+
+### Bug fixes
+
+* record_transformer: Don't create new keys if the original record doesn't have `keep_keys` keys
+  https://github.com/fluent/fluentd/pull/1663
+* in_tail: Fix the error when 'tag *' is configured.
+  https://github.com/fluent/fluentd/pull/1664
+* plugin: Fix load order to avoid file not found when plugins have own native extension
+  https://github.com/fluent/fluentd/pull/1670
+
 ## Release 0.12.39 - 2017/07/14
 
 ### Bug fixes

data/lib/fluent/plugin.rb

@@ -169,7 +169,10 @@ module Fluent
       if spec = specs.last
         spec.require_paths.each { |lib|
           file = "#{spec.full_gem_path}/#{lib}/#{path}"
-          require file
+          if File.exist?("#{file}.rb")
+            require file
+            return
+          end
         }
       end
     end

data/lib/fluent/plugin/filter_record_transformer.rb

@@ -28,9 +28,9 @@ module Fluent
     Fluent::Plugin.register_filter('record_transformer', self)
 
     desc 'A comma-delimited list of keys to delete.'
-    config_param :remove_keys, :string, default: nil
+    config_param :remove_keys, :array, default: nil
     desc 'A comma-delimited list of keys to keep.'
-    config_param :keep_keys, :string, default: nil
+    config_param :keep_keys, :array, default: nil
     desc 'Create new Hash to transform incoming data'
     config_param :renew_record, :bool, default: false
     desc 'Specify field name of the record to overwrite the time of events. Its value must be unix time.'
@@ -52,13 +52,8 @@ module Fluent
         end
       end
 
-      if @remove_keys
-        @remove_keys = @remove_keys.split(',')
-      end
-
       if @keep_keys
         raise Fluent::ConfigError, "`renew_record` must be true to use `keep_keys`" unless @renew_record
-        @keep_keys = @keep_keys.split(',')
       end
 
       placeholder_expander_params = {
@@ -128,7 +123,9 @@ module Fluent
       placeholders = @placeholder_expander.prepare_placeholders(placeholder_values)
 
       new_record = @renew_record ? {} : record.dup
-      @keep_keys.each {|k| new_record[k] = record[k]} if @keep_keys and @renew_record
+      @keep_keys.each do |k|
+        new_record[k] = record[k] if record.has_key?(k)
+      end if @keep_keys && @renew_record
       new_record.merge!(expand_placeholders(@map, placeholders))
 
       new_record
@@ -220,7 +217,7 @@ module Fluent
       # @param [String] str
       # @param [Boolean] force_stringify the value must be string, used for hash key
       def expand(str, placeholders, force_stringify = false)
-        if @auto_typecast and !force_stringify
+        if @auto_typecast && !force_stringify
           single_placeholder_matched = str.match(/\A(\${[^}]+}|__[A-Z_]+__)\z/)
           if single_placeholder_matched
             log_if_unknown_placeholder($1, placeholders)
@@ -263,9 +260,9 @@ module Fluent
       def preprocess_map(value, force_stringify = false)
         new_value = nil
         if value.is_a?(String)
-          if @auto_typecast and !force_stringify
+          if @auto_typecast && !force_stringify
             num_placeholders = value.scan('${').size
-            if num_placeholders == 1 and value.start_with?('${') && value.end_with?('}')
+            if num_placeholders == 1 && value.start_with?('${') && value.end_with?('}')
               new_value = value[2..-2] # ${..} => ..
             end
           end

data/lib/fluent/plugin/in_tail.rb

@@ -101,6 +101,7 @@ module Fluent
     def configure_tag
       if @tag.index('*')
         @tag_prefix, @tag_suffix = @tag.split('*')
+        @tag_prefix ||= ''
         @tag_suffix ||= ''
       else
         @tag_prefix = nil

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.39'
+  VERSION = '0.12.40'
 
 end

data/test/plugin/test_filter_record_transformer.rb

@@ -131,6 +131,18 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
       end
     end
 
+    test 'keep_keys that are not present in the original record should not be included in the result record' do
+      config = %[renew_record true\nkeep_keys foo, bar, baz, message]
+      msgs = ['1', '2', nil]
+      es = emit(config, msgs)
+      es.each_with_index do |(t, r), i|
+        assert_equal('bar', r['foo'])
+        assert_equal(msgs[i], r['message'])
+        assert_equal(false, r.has_key?('bar'))
+        assert_equal(false, r.has_key?('baz'))
+      end
+    end
+
     test 'enable_ruby' do
       config = %[
         enable_ruby yes

data/test/plugin/test_in_tail.rb

@@ -820,6 +820,18 @@ class TailInputTest < Test::Unit::TestCase
       engineclass.should_receive(:emit_stream).with('pre.foo.bar.log.post', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end
+
+    config = %[
+      tag *
+      path test/plugin/*/%Y/%m/%Y%m%d-%H%M%S.log,test/plugin/data/log/**/*.log
+      format none
+      read_from_head true
+    ]
+    plugin = create_driver(config, false).instance
+    flexstub(plugin.router) do |engineclass|
+      engineclass.should_receive(:emit_stream).with('foo.bar.log', any).once
+      plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
+    end
   end
 
   # Ensure that no fatal exception is raised when a file is missing and that

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.39
+  version: 0.12.40
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack