fluentd 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6767a4f2dc914fc96e7d5f0118632a48727316d3
-  data.tar.gz: 631b3ffc84b275449c26ceff0fe3d26bb0cc8171
+  metadata.gz: 4727ad0adaf19638e4635a9cc2d4a701c15a51b6
+  data.tar.gz: c81e2d9a52fee23f6906e7e5e06b8c4f47e08a3b
 SHA512:
-  metadata.gz: f3bfce72a5da88d1698c8820cd3b84452962a8505e3736e9e27ccbe55877e5774cc427bbbd30ed50dfca74bb5d6c2aca4f2a259562aadccb43218300bb15d4d6
-  data.tar.gz: d96782300d9d439b35e836e765a4079d256df8bbce494c63309152416283826fe829ec8384fbab1dc658c9cad2643be0b737307743760e5a86ee455c15236e74
+  metadata.gz: b2e986a0d83076e2ea2a17dc1ff5e7c0eafb8c53d82a3d94b043428e0f73a8c28adb2ea02fc3dc8221a561335097a4d7f41c4df2ab902c54d693ccbe92ab30f1
+  data.tar.gz: ec22f2fab0a771bd55f71ff7240149ca99708641e8108bb2595a26980af6b6ee054791692f71c8976f394f44fb451f65db3b6f5309d14ec804fed8f9144fdcff

data/ChangeLog

@@ -1,5 +1,20 @@
 # v0.12
 
+## Release 0.12.5 - 2014/02/09
+
+### New features / Enhancement
+
+* in_tail: Enable multiline mode if format contains 'multiline'
+  https://github.com/fluent/fluentd/pull/545
+* event: Improve EventStream#to_msgpack_stream performance
+  https://github.com/fluent/fluentd/pull/549
+* engine: Add tag information emit log
+
+### Bug fixes
+
+* Update msgpack dependency to avoid incompatible encoding problem
+  https://github.com/fluent/fluentd/pull/550
+
 ## Release 0.12.4 - 2015/01/23
 
 ### New features / Enhancement

data/fluentd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_runtime_dependency("msgpack", [">= 0.5.4", "< 0.6.0"])
+  gem.add_runtime_dependency("msgpack", [">= 0.5.11", "< 0.6.0"])
   gem.add_runtime_dependency("json", [">= 1.4.3"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
   gem.add_runtime_dependency("cool.io", [">= 1.2.2", "< 2.0.0"])

data/lib/fluent/event.rb

@@ -27,11 +27,11 @@ module Fluent
     end
 
     def to_msgpack_stream
-      out = ''
+      out = MessagePack::Packer.new # MessagePack::Packer is fastest way to serialize events
       each {|time,record|
-        [time,record].to_msgpack(out)
+        out.write([time,record])
       }
-      out
+      out.to_s
     end
   end
 
@@ -66,7 +66,7 @@ module Fluent
     end
 
     def dup
-      entries = @entries.map(:dup)
+      entries = @entries.map { |entry| entry.dup } # @entries.map(:dup) doesn't work by ArgumentError
       ArrayEventStream.new(entries)
     end
 

data/lib/fluent/plugin/in_tail.rb

@@ -49,7 +49,7 @@ module Fluent
       configure_parser(conf)
       configure_tag
 
-      @multiline_mode = conf['format'] == 'multiline'
+      @multiline_mode = conf['format'] =~ /multiline/
       @receive_handler = if @multiline_mode
                            method(:parse_multilines)
                          else

data/lib/fluent/root_agent.rb

@@ -215,7 +215,7 @@ module Fluent
       def handle_emits_error(tag, es, e)
         now = Engine.now
         if @suppress_emit_error_log_interval.zero? || now > @next_emit_error_log_time
-          log.warn "emit transaction failed in @ERROR:", :error_class => e.class, :error => e
+          log.warn "emit transaction failed in @ERROR:", :error_class => e.class, :error => e, :tag => tag
           log.warn_backtrace
           @next_emit_error_log_time = now + @suppress_emit_error_log_interval
         end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.4'
+  VERSION = '0.12.5'
 
 end

data/test/test_event.rb

@@ -0,0 +1,168 @@
+require_relative 'helper'
+require 'fluent/test'
+require 'fluent/event'
+
+module EventTest
+  class OneEventStreamTest < ::Test::Unit::TestCase
+    include Fluent
+
+    def setup
+      @time = Engine.now
+      @record = {'k' => 'v', 'n' => 1}
+      @es = OneEventStream.new(@time, @record)
+    end
+
+    test 'repeatable?' do
+      assert_true @es.repeatable?
+    end
+
+    test 'dup' do
+      dupped = @es.dup
+      assert_kind_of OneEventStream, dupped
+      assert_not_equal @es.object_id, dupped.object_id
+    end
+
+    test 'each' do
+      @es.each { |time, record|
+        assert_equal @time, time
+        assert_equal @record, record
+      }
+    end
+
+    test 'to_msgpack_stream' do
+      stream = @es.to_msgpack_stream
+      MessagePack::Unpacker.new.feed_each(stream) { |time, record|
+        assert_equal @time, time
+        assert_equal @record, record
+      }
+    end
+  end
+
+  class ArrayEventStreamTest < ::Test::Unit::TestCase
+    include Fluent
+
+    def setup
+      @times = [Engine.now, Engine.now + 1]
+      @records = [{'k' => 'v1', 'n' => 1}, {'k' => 'v2', 'n' => 2}]
+      @es = ArrayEventStream.new(@times.zip(@records))
+    end
+
+    test 'repeatable?' do
+      assert_true @es.repeatable?
+    end
+
+    test 'dup' do
+      dupped = @es.dup
+      assert_kind_of ArrayEventStream, dupped
+      assert_not_equal @es.object_id, dupped.object_id
+    end
+
+    test 'empty?' do
+      assert_not_empty @es
+      assert_true ArrayEventStream.new([]).empty?
+    end
+
+    test 'each' do
+      i = 0
+      @es.each { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+
+    test 'to_msgpack_stream' do
+      i = 0
+      stream = @es.to_msgpack_stream
+      MessagePack::Unpacker.new.feed_each(stream) { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+  end
+
+  class MultiEventStreamTest < ::Test::Unit::TestCase
+    include Fluent
+
+    def setup
+      @times = [Engine.now, Engine.now + 1]
+      @records = [{'k' => 'v1', 'n' => 1}, {'k' => 'v2', 'n' => 2}]
+      @es = MultiEventStream.new
+      @times.zip(@records).each { |time, record|
+        @es.add(time, record)
+      }
+    end
+
+    test 'repeatable?' do
+      assert_true @es.repeatable?
+    end
+
+    test 'dup' do
+      dupped = @es.dup
+      assert_kind_of MultiEventStream, dupped
+      assert_not_equal @es.object_id, dupped.object_id
+    end
+
+    test 'empty?' do
+      assert_not_empty @es
+      assert_true MultiEventStream.new.empty?
+    end
+
+    test 'each' do
+      i = 0
+      @es.each { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+
+    test 'to_msgpack_stream' do
+      i = 0
+      stream = @es.to_msgpack_stream
+      MessagePack::Unpacker.new.feed_each(stream) { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+  end
+
+  class MessagePackEventStreamTest < ::Test::Unit::TestCase
+    include Fluent
+
+    def setup
+      pk = MessagePack::Packer.new
+      @times = [Engine.now, Engine.now + 1]
+      @records = [{'k' => 'v1', 'n' => 1}, {'k' => 'v2', 'n' => 2}]
+      @times.zip(@records).each { |time, record|
+        pk.write([time, record])
+      }
+      @es = MessagePackEventStream.new(pk.to_s)
+    end
+
+    test 'repeatable?' do
+      assert_true @es.repeatable?
+    end
+
+    test 'each' do
+      i = 0
+      @es.each { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+
+    test 'to_msgpack_stream' do
+      i = 0
+      stream = @es.to_msgpack_stream
+      MessagePack::Unpacker.new.feed_each(stream) { |time, record|
+        assert_equal @times[i], time
+        assert_equal @records[i], record
+        i += 1
+      }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
@@ -428,6 +428,7 @@ files:
 - test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_event.rb
 - test/test_event_router.rb
 - test/test_filter.rb
 - test/test_formatter.rb
@@ -511,6 +512,7 @@ test_files:
 - test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_event.rb
 - test/test_event_router.rb
 - test/test_filter.rb
 - test/test_formatter.rb