fluentd 0.14.7 → 0.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99bac7f1329f22434907c02e8d382ca2774988e
-  data.tar.gz: fe3cb1733cc27f065397c5135f4f3c579dec81fe
+  metadata.gz: 830d1ce6df9602f508f6f28f57197d5ed8fc3979
+  data.tar.gz: 0f0f897b0a13526974df16bbfa55abde73929c68
 SHA512:
-  metadata.gz: bc21095fbec80e1ff718ef9179f84081a20d4688b33ee2f7b81821f56501cd5f3645dab77bb6ef98ad175118b5825d1e3ba261ed9baa19ab93214145a515472b
-  data.tar.gz: e2d3978c237c3101ce10146b2afe7ad5f8ffaf180c6d49c5f97cc483e6169ecc2802a2944647b25183cf4dbf81879704a0f61dffab0ac7cdd5b4488269cc30bf
+  metadata.gz: 6f3675e97aac37d204dbe2501ff6ec1629d0aec10d2ed534b6af4ebd5160153e459e9fb9707203f9b09142cf068cbd65272f57d4be214a590fe09109503270a9
+  data.tar.gz: fcdc64eed9af5917723efd395ac292e9200fffb0276c5c6471a8a86c19f513ec9515abd9f3d66650232ac4f60e51bf4c4627a2f6376ef3c1032a4903c804264b

data/ChangeLog

@@ -1,15 +1,26 @@
 # v0.14
 
+## Release v0.14.8 - 2016/10/13
+
+### Bug fixes
+
+* Add msgpack_each to buffer chunks in compat-layer output plugins
+  https://github.com/fluent/fluentd/pull/1273
+
 ## Release v0.14.7 - 2016/10/07
 
 ### New features / Enhancement
 
+* Support data compression in buffer plugins
+  https://github.com/fluent/fluentd/pull/1172
 * in_forward: support to transfer compressed data
   https://github.com/fluent/fluentd/pull/1179
 * out_stdout: fix to show nanosecond resolution time
   https://github.com/fluent/fluentd/pull/1249
 * Add option to rotate Fluentd daemon's log
   https://github.com/fluent/fluentd/pull/1235
+* Add extract plugin helper, with symmetric time parameter support in parser/formatter and inject/extract
+  https://github.com/fluent/fluentd/pull/1207
 * Add a feature to parse/format numeric time (unix time [+ subsecond value])
   https://github.com/fluent/fluentd/pull/1254
 * Raise configuration errors for inconsistent <label> configurations
@@ -22,6 +33,8 @@
   https://github.com/fluent/fluentd/pull/1227
 * Add some features to write plugins more easily
   https://github.com/fluent/fluentd/pull/1256
+* Add a tool to load dumped events from file
+  https://github.com/fluent/fluentd/pull/1165
 
 ### Bug fixes
 

data/lib/fluent/compat/output.rb

@@ -26,6 +26,7 @@ require 'fluent/compat/record_filter_mixin'
 require 'fluent/compat/output_chain'
 require 'fluent/timezone'
 require 'fluent/mixin'
+require 'fluent/event'
 require 'fluent/process' # to load Fluent::DetachProcessMixin
 
 require 'fluent/plugin_helper/compat_parameters'
@@ -123,6 +124,7 @@ module Fluent
       # prepend this module to BufferedOutput (including ObjectBufferedOutput) plugin singleton class
       def write(chunk)
         chunk.extend(ChunkSizeCompatMixin)
+        chunk.extend(ChunkMessagePackEventStreamer)
         chunk.extend(AddKeyToChunkMixin) if chunk.metadata.variables && chunk.metadata.variables.has_key?(:key)
         super
       end
@@ -132,6 +134,7 @@ module Fluent
       # prepend this module to TimeSlicedOutput plugin singleton class
       def write(chunk)
         chunk.extend(ChunkSizeCompatMixin)
+        chunk.extend(ChunkMessagePackEventStreamer)
         chunk.extend(AddTimeSliceKeyToChunkMixin)
         chunk.time_slice_format = @time_slice_format
         chunk.timekey = @_timekey

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.7'
+  VERSION = '0.14.8'
 
 end

data/test/plugin/test_output_as_buffered.rb

@@ -1,6 +1,7 @@
 require_relative '../helper'
 require 'fluent/plugin/output'
 require 'fluent/plugin/buffer'
+require 'fluent/output'
 require 'fluent/event'
 
 require 'json'
@@ -126,6 +127,28 @@ module FluentPluginOutputAsBufferedTest
       @try_write ? @try_write.call(chunk) : nil
     end
   end
+  module OldPluginMethodMixin
+    def initialize
+      super
+      @format = nil
+      @write = nil
+    end
+    def register(name, &block)
+      instance_variable_set("@#{name}", block)
+    end
+    def format(tag, time, record)
+      @format ? @format.call(tag, time, record) : [tag, time, record].to_json
+    end
+    def write(chunk)
+      @write ? @write.call(chunk) : nil
+    end
+  end
+  class DummyOldBufferedOutput < Fluent::BufferedOutput
+    include OldPluginMethodMixin
+  end
+  class DummyOldObjectBufferedOutput < Fluent::ObjectBufferedOutput
+    include OldPluginMethodMixin
+  end
 end
 
 class BufferedOutputTest < Test::Unit::TestCase
@@ -138,6 +161,8 @@ class BufferedOutputTest < Test::Unit::TestCase
     when :standard then FluentPluginOutputAsBufferedTest::DummyStandardBufferedOutput.new
     when :custom   then FluentPluginOutputAsBufferedTest::DummyCustomFormatBufferedOutput.new
     when :full     then FluentPluginOutputAsBufferedTest::DummyFullFeatureOutput.new
+    when :old_buf  then FluentPluginOutputAsBufferedTest::DummyOldBufferedOutput.new
+    when :old_obj  then FluentPluginOutputAsBufferedTest::DummyOldObjectBufferedOutput.new
     else
       raise ArgumentError, "unknown type: #{type}"
     end
@@ -346,6 +371,37 @@ class BufferedOutputTest < Test::Unit::TestCase
         assert_equal events, each_pushed.map{|tag,time,record| [time,record]}
       end
     end
+
+    data(:BufferedOutput => :old_buf,
+         :ObjectBufferedOutput => :old_obj)
+    test 'old plugin types can iterate chunk by msgpack_each in #write' do |plugin_type|
+      events_from_chunk = []
+      # event_emitter helper requires Engine.root_agent for routing
+      ra = Fluent::RootAgent.new(log: $log)
+      stub(Fluent::Engine).root_agent { ra }
+      @i = create_output(plugin_type)
+      @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '', @hash)]))
+      @i.register(:format) { |tag, time, record| [time, record].to_msgpack }
+      @i.register(:write) { |chunk| e = []; chunk.msgpack_each { |t, r| e << [t, r] }; events_from_chunk << [:write, e]; }
+      @i.start
+      @i.after_start
+
+      events = [
+        [event_time('2016-10-05 16:16:16 -0700'), {"message" => "yaaaaaaaaay!"}],
+        [event_time('2016-10-05 16:16:17 -0700'), {"message" => "yoooooooooy!"}],
+      ]
+
+      @i.emit_events("test.tag", Fluent::ArrayEventStream.new(events))
+      @i.emit_events("test.tag", Fluent::ArrayEventStream.new(events))
+
+      waiting(5) { sleep 0.1 until events_from_chunk.size == 2 }
+
+      assert_equal 2, events_from_chunk.size
+      2.times.each do |i|
+        assert_equal :write, events_from_chunk[i][0]
+        assert_equal events, events_from_chunk[i][1]
+      end
+    end
   end
 
   sub_test_case 'buffered output configured with many chunk keys' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -787,4 +787,3 @@ test_files:
 - test/test_time_formatter.rb
 - test/test_time_parser.rb
 - test/test_unique_id.rb
-has_rdoc: false