fluent-logger 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb70f375d56167d4fa69310f24457f9697947fa9
-  data.tar.gz: 25ceec5e3dd80f84368cb28bc0f092d7dbd0766f
+  metadata.gz: bdb2dae218ea13bfb25a80b51940a17ec0fbd093
+  data.tar.gz: 14ab578fbe8291d111e7d6e232ca888ff946cb4c
 SHA512:
-  metadata.gz: 571ef4468e47a4917e6525719594baa7f478f1a2d4b676b5d669a04f9b344bf86cc3edee7d4da1b21d9e2cdd357c4bd829ce03616761efa62ab322e2e52ef054
-  data.tar.gz: 803ed86c13a44b1b823b2d70ed0d2e60eae9c2e388a9d414751b8301ac6603a218254cad5ebc1c49d4febe410b5c6378d5a18797ca6a8f74bfdd0db502b5870b
+  metadata.gz: d4041f0c836aa5c91aa34e166d7073decb3f2ab795b0a60f408a09c79fd75a81fde148b20fbd1ceb3328b9e9e2cc18fdd872e42ecebab9e49255705c43e7f700
+  data.tar.gz: 51ae53391e0484ff2ca8dc62c1213c4c4016d1bcbd366de7f4e013341ca09ac0e53a816b7bec2f46d5cfbe092eb2ab716b68ab4b7b885f6bb7fc28a3833726ed

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.7.0 - 2017/04/12
+
+  * Add nanosecond_precision parameter for v0.14
+  * Update msgpack dependency to v1.0
+
 Release 0.6.3 - 2017/03/29
 
   * Add pending_bytesize method

data/README.md

@@ -126,7 +126,20 @@ Fluent::Logger::ConsoleLogger.open(io)
 Fluent::Logger::NullLogger.open
 ```
 
-## Buffer overflow
+## Tips
+
+### Use nanosecond-precision time
+
+To send events with nanosecond-precision time (Fluent 0.14 and up), specify `nanosecond_precision` to `FluentLogger` constructor.
+
+```rb
+log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224, :nanosecond_precision => true)
+# Use nanosecond time instead
+log.post("myapp.access", {"agent" => "foo"})
+log.post_with_time("myapp.access", {"agent" => "foo"}, Time.now) # Need Time object for post_with_time
+```
+
+### Buffer overflow
 
 You can inject your own custom proc to handle buffer overflow in the event of connection failure. This will mitigate the loss of data instead of simply throwing data away.
 
@@ -156,9 +169,9 @@ Fluent::Logger::FluentLogger.new(nil,
 
 |name|description|
 |---|---|
-|Web site|http://fluentd.org/|
-|Documents|http://docs.fluentd.org/|
-|Source repository|https://github.com/fluent/fluent-logger-ruby|
+|Web site|http://fluentd.org/ |
+|Documents|http://docs.fluentd.org/ |
+|Source repository|https://github.com/fluent/fluent-logger-ruby |
 |Author|Sadayuki Furuhashi|
 |Copyright|(c) 2011 FURUHASHI Sadayuki|
 |License|Apache License, Version 2.0|

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/fluent-logger.gemspec

@@ -30,7 +30,7 @@ EOF
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "msgpack", ">= 0.5.6", "< 2"
+  gem.add_dependency "msgpack", ">= 1.0.0", "< 2"
   gem.add_development_dependency 'rake', '>= 0.9.2'
   gem.add_development_dependency 'rspec', '>= 3.0.0'
   gem.add_development_dependency 'rspec-its', '>= 1.1.0'

data/lib/fluent/logger/fluent_logger.rb

@@ -23,6 +23,30 @@ require 'json'
 
 module Fluent
   module Logger
+    class EventTime
+      TYPE = 0
+
+      def initialize(raw_time)
+        @time = raw_time
+      end
+
+      def to_msgpack(io = nil)
+        @time.to_i.to_msgpack(io)
+      end
+
+      def to_msgpack_ext
+        [@time.to_i, @time.nsec].pack('NN')
+      end
+
+      def self.from_msgpack_ext(data)
+        new(*data.unpack('NN'))
+      end
+
+      def to_json(*args)
+        @time.to_i
+      end
+    end
+
     class FluentLogger < LoggerBase
       BUFFER_LIMIT = 8*1024*1024
       RECONNECT_WAIT = 0.5
@@ -55,6 +79,13 @@ module Fluent
         @host = options[:host]
         @port = options[:port]
         @socket_path = options[:socket_path]
+        @nanosecond_precision = options[:nanosecond_precision]
+
+        @factory = MessagePack::Factory.new
+        if @nanosecond_precision
+          @factory.register_type(EventTime::TYPE, EventTime)
+        end
+        @packer = @factory.packer
 
         @mon = Monitor.new
         @pending = nil
@@ -98,7 +129,11 @@ module Fluent
       def post_with_time(tag, map, time)
         @logger.debug { "event: #{tag} #{map.to_json}" rescue nil } if @logger.debug?
         tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
-        write [tag, time.to_i, map]
+        if @nanosecond_precision && time.is_a?(Time)
+          write [tag, EventTime.new(time), map]
+        else
+          write [tag, time.to_i, map]
+        end
       end
 
       def close
@@ -147,7 +182,11 @@ module Fluent
 
       def to_msgpack(msg)
         begin
-          msg.to_msgpack
+          @mon.synchronize {
+            res = @packer.pack(msg).to_s
+            @packer.clear
+            res
+          }
         rescue NoMethodError
           JSON.parse(JSON.generate(msg)).to_msgpack
         end

data/lib/fluent/logger/version.rb

@@ -1,7 +1,7 @@
 module Fluent
 module Logger
 
-VERSION = '0.6.3'
+VERSION = '0.7.0'
 
 end
 end

data/spec/fluent_logger_spec.rb

@@ -12,15 +12,26 @@ describe Fluent::Logger::FluentLogger do
     DummyFluentd.new
   }
 
-  let(:logger) {
+  let(:internal_logger) {
     @logger_io = StringIO.new
-    logger = ::Logger.new(@logger_io)
-    Fluent::Logger::FluentLogger.new('logger-test', {
+    ::Logger.new(@logger_io)
+  }
+
+  let(:logger_config) {
+    {
       :host   => 'localhost',
       :port   => fluentd.port,
-      :logger => logger,
+      :logger => internal_logger,
       :buffer_overflow_handler => buffer_overflow_handler
-    })
+    }
+  }
+
+  let(:logger) {
+    Fluent::Logger::FluentLogger.new('logger-test', logger_config)
+  }
+
+  let(:logger_with_nanosec) {
+    Fluent::Logger::FluentLogger.new('logger-test', logger_config.merge(:nanosecond_precision => true))
   }
 
   let(:buffer_overflow_handler) { nil }
@@ -65,6 +76,16 @@ describe Fluent::Logger::FluentLogger do
         expect(logger.pending_bytesize).to eq 0
       }
 
+      if defined?(Fluent::EventTime)
+        it ('success with nanosecond') {
+          expect(logger_with_nanosec.pending_bytesize).to eq 0
+          expect(logger_with_nanosec.post('tag', {'a' => 'b'})).to be true
+          fluentd.wait_transfer
+          expect(fluentd.queue.last).to eq ['logger-test.tag', {'a' => 'b'}]
+          expect(fluentd.output.emits.first[1]).to be_a_kind_of(Fluent::EventTime)
+        }
+      end
+
       it ('close after post') {
         expect(logger).to be_connect
         logger.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-12 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.6
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: fluent logger for ruby