fluent-plugin-elapsed-time 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95316fca33950f404743d84a29cba5533c1f09a7
-  data.tar.gz: aac3ab464cfb475b7008971da6f0f8db41714ff0
+  metadata.gz: a9486c23f926fb9df5ffb3b43dc7a8f0c1f6cc8e
+  data.tar.gz: 5fc89bd6f09f28dae4bcd1506396e8dc046abf30
 SHA512:
-  metadata.gz: 4c1dfa104a0ffbdcd0b67a348f219c29bc0fb2ae50fff4611d964eb44df7a3abde7c1903bfe1303ebcf802810008ade1bd7b4f15af16215d0119c3aa4732dc47
-  data.tar.gz: ae092b3946153266d0da616916efd79645a85c15ab508856364ab51a624d833969e0a9b64096035ca6a00b8424211b526dbc5edb226f597060e1f1daadcbded1
+  metadata.gz: e3adf30806c1ea8f95e4debbd786bf03d9de8902e05f57fc168c3811cbb9e05d11ff274ce56232da350418e2b157d13e2fa30bbe32fb4ebb3449295d58796138
+  data.tar.gz: f82150ba8cf69d5b0157731ce284c9fc8b07e6b6c9760f03319b7f4fde6e09a3866a19a6918e96d7486ce9d0d59583c6659ac31ec4f745cbb8d18b81a237de6c

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.*
+  - 2.2.*
+  - 2.3.0
 gemfile:
   - Gemfile
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.8 (2017/02/09)
+
+Enhancement:
+
+* Support v0.14
+
 ## 0.0.7 (2014/11/22)
 
 Changes:

data/fluent-plugin-elapsed-time.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-elapsed-time"
-  gem.version     = "0.0.7"
+  gem.version     = "0.0.8"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-elapsed-time"
@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec-its"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/out_elapsed_time.rb

@@ -7,6 +7,11 @@ module Fluent
       define_method("log") { $log }
     end
 
+    # Define `router` method of v0.12 to support v0.10 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
+
     config_param :tag, :string, :default => 'elapsed'
     config_param :add_tag_prefix, :string, :default => nil
     config_param :remove_tag_prefix, :string, :default => nil
@@ -29,6 +34,7 @@ module Fluent
       super
       @outputs = []
       @elapsed = {}
+      @emit_procs = []
     end
 
     # for test
@@ -51,6 +57,12 @@ module Fluent
 
         output = Plugin.new_output(type)
         output.configure(e)
+        emit_proc = if output.respond_to?(:emit_events)
+                      Proc.new {|output, tag, es, _chain| output.emit_events(tag, es)}
+                    else
+                      Proc.new {|output, tag, es, _chain| output.emit(tag, es, NullOutputChain.instance)}
+                    end
+        @emit_procs << emit_proc
         @outputs << output
       }
 
@@ -82,7 +94,9 @@ module Fluent
       chain = NullOutputChain.instance
       start = Time.now
       es.each do |time, record|
-        @outputs.each {|output| output.emit(tag, OneEventStream.new(time, record), chain) }
+        @outputs.each_with_index {|output, idx|
+          @emit_procs[idx].call(output, tag, OneEventStream.new(time, record), chain)
+        }
         finish = Time.now
         emit_tag = @tag_proc.call(tag)
         elapsed(emit_tag) << (finish - start).to_f
@@ -93,7 +107,9 @@ module Fluent
     def emit_es(tag, es)
       chain = NullOutputChain.instance
       t = Time.now
-      @outputs.each {|output| output.emit(tag, es, chain) }
+      @outputs.each_with_index {|output, idx|
+        @emit_procs[idx].call(output, tag, es,chain)
+      }
       emit_tag = @tag_proc.call(tag)
       elapsed(emit_tag) << (Time.now - t).to_f
     end
@@ -143,7 +159,7 @@ module Fluent
         avg = num == 0 ? 0 : elapsed.map(&:to_f).inject(:+) / num.to_f
         messages[tag] = {"max" => max, "avg" => avg, "num" => num}
       end
-      messages.each {|tag, message| Engine.emit(tag, Engine.now, message) }
+      messages.each {|tag, message| router.emit(tag, Engine.now, message) }
     end
 
     private

data/spec/out_elapsed_time_spec.rb

@@ -65,44 +65,44 @@ describe Fluent::ElapsedTimeOutput do
     context 'each message' do
       let(:config) { CONFIG + %[each message]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.elapsed.size.should == 4
+        expect(driver.instance.elapsed.size).to eq(4)
       }
     end
 
     context 'each es' do
       let(:config) { CONFIG + %[each es]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.elapsed.size.should == 4
+        expect(driver.instance.elapsed.size).to eq(4)
       }
     end
 
     context 'each message with aggregate tag' do
       let(:config) { CONFIG + %[each message\naggregate tag\nadd_tag_prefix elapsed]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.elapsed("elapsed.#{tag}").size.should == 4
+        expect(driver.instance.elapsed("elapsed.#{tag}").size).to eq(4)
       }
     end
 
     context 'each es with aggregate tag' do
       let(:config) { CONFIG + %[each es\naggregate tag\nadd_tag_prefix elapsed]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.elapsed("elapsed.#{tag}").size.should == 4
+        expect(driver.instance.elapsed("elapsed.#{tag}").size).to eq(4)
         driver.instance.flush_emit
       }
     end
@@ -110,36 +110,36 @@ describe Fluent::ElapsedTimeOutput do
     context 'remove_tag_slice' do
       let(:config) { CONFIG + %[remove_tag_slice 0..-2\naggregate tag\nadd_tag_prefix elapsed]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       let(:expected_tag) { tag.split('.')[0..-2].join('.') }
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.elapsed("elapsed.#{expected_tag}").size.should == 4
+        expect(driver.instance.elapsed("elapsed.#{expected_tag}").size).to eq(4)
       }
     end
 
     context 'zero_emit true' do
       let(:config) { CONFIG + %[zero_emit true]}
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.flush_emit["elapsed"]["num"].should == 4
-        driver.instance.flush_emit["elapsed"].should == {"max" => 0, "avg" => 0, "num" => 0}
+        expect(driver.instance.flush_emit["elapsed"]["num"]).to eq(4)
+        expect(driver.instance.flush_emit["elapsed"]).to eq({"max" => 0, "avg" => 0, "num" => 0})
       }
     end
 
     context 'zero_emit false' do
       let(:config) { CONFIG }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it {
         driver.run { messages.each {|message| driver.emit({'message' => message}, time) } }
-        driver.instance.flush_emit["elapsed"]["num"].should == 4
-        driver.instance.flush_emit.should == {}
+        expect(driver.instance.flush_emit["elapsed"]["num"]).to eq(4)
+        expect(driver.instance.flush_emit).to eq({})
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elapsed-time
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluentd plugin to measure elapsed time to process messages
 email: sonots@gmail.com
 executables: []
@@ -132,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to measure elapsed time to process messages