fluent-plugin-stats 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11b934f53568a8eee91bce6436279e8b6503057b
-  data.tar.gz: fea48bdcd8022fedee054ec732333a38eaa75714
+  metadata.gz: 338c33bd6209c4f53fcab5de8cb1dfa6cc2369cd
+  data.tar.gz: 4ac24eb91942943e0052c82d6c93608b7022f6a3
 SHA512:
-  metadata.gz: 94019310b7906f9638feef6d27614921c390298b4406df88663e95d70419ccd1fd5d2b75fc203989b835606f0d084e29e27fdf27fc8f0a0ccad32f10a705afd4
-  data.tar.gz: 9408530d2b650a126a19ca125883876da8f490be347073808f574b6b3d69126315325c0f6443439fe2cb3b3937d874b77511107266192d814882aaf61c99e9bd
+  metadata.gz: 7f8019b96572c180192c5a5328c78654d2a2fe2f8de0c1c7ebb9608c190cc0f7f62ceea8b7e79397ab75fbaea649b29fe22806374a58f96786117bcbbea16827
+  data.tar.gz: 108927961b6cd33f144807db267700c3225a50ec2e775e522c507d82a13a2f04060c488d75aa98e1e4b39f78d62018a6bd970267f5597ef39ca25c507bb964a5

data/.gitignore

@@ -11,3 +11,4 @@ tmp/*
 coverage
 .yardoc
 pkg/*
+.ruby-version

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.0 (2017/09/15)
+
+Enhancements:
+
+* Support v0.14
+
 ## 0.3.6 (2014/12/3)
 
 Enhancements:

data/Gemfile.v0.10

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.10.0'

data/Gemfile.v0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.12.0'

data/fluent-plugin-stats.gemspec

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

data/lib/fluent/plugin/out_stats.rb

@@ -7,6 +7,11 @@ class Fluent::StatsOutput < Fluent::Output
     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
+
   def initialize
     super
     require 'pathname'
@@ -221,7 +226,7 @@ class Fluent::StatsOutput < Fluent::Output
       end
       report_time(" emit_tag:#{emit_tag} matches:#{matches}") do
         output = generate_output(matches)
-        Fluent::Engine.emit(emit_tag, time, output) if output and !output.empty?
+        router.emit(emit_tag, time, output) if output and !output.empty?
       end
     end
   end

data/spec/out_stats_spec.rb

@@ -92,7 +92,7 @@ describe Fluent::StatsOutput do
       end
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("stats.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("stats.#{tag}", time, {
           "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
         })
       end
@@ -111,10 +111,10 @@ describe Fluent::StatsOutput do
       end
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("stats.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("stats.#{tag}", time, {
           "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
         })
-        expect(Fluent::Engine).to receive(:emit).with("stats.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("stats.#{tag}", time, {
           "4xx_count"=>0,"5xx_count"=>0,"reqtime_max"=>0,"reqtime_min"=>0,"reqtime_avg"=>0.0
         })
       end
@@ -132,7 +132,7 @@ describe Fluent::StatsOutput do
       end
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("stats.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("stats.#{tag}", time, {
           "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
         })
       end
@@ -160,7 +160,7 @@ describe Fluent::StatsOutput do
     end
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("stats.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("stats.#{tag}", time, {
           "reqtime_sum"=>3.000,"reqtime_max"=>2.000,"reqtime_min"=>1.000,"reqtime_avg"=>1.500,"reqsize_sum"=>30
         })
       end
@@ -176,7 +176,7 @@ describe Fluent::StatsOutput do
       end
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -193,7 +193,7 @@ describe Fluent::StatsOutput do
       let(:tag) { 'foo.bar' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo.#{tag}", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo.#{tag}", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -210,7 +210,7 @@ describe Fluent::StatsOutput do
       let(:tag) { 'foo.bar' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("bar", time, {
+        expect(driver.instance.router).to receive(:emit).with("bar", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -227,7 +227,7 @@ describe Fluent::StatsOutput do
       let(:tag) { 'foo.bar' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("#{tag}.foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("#{tag}.foo", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -244,7 +244,7 @@ describe Fluent::StatsOutput do
       let(:tag) { 'foo.bar' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -261,7 +261,7 @@ describe Fluent::StatsOutput do
       let(:tag) { 'foo.bar' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "4xx_count"=>6,"5xx_count"=>6
         })
       end
@@ -288,7 +288,7 @@ describe Fluent::StatsOutput do
         end
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+          expect(driver.instance.router).to receive(:emit).with("foo", time, {
             "4xx_count"=>12,"5xx_count"=>12,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
           })
         end
@@ -308,10 +308,10 @@ describe Fluent::StatsOutput do
         end
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("stats.foo.bar", time, {
+          expect(driver.instance.router).to receive(:emit).with("stats.foo.bar", time, {
             "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
           })
-          expect(Fluent::Engine).to receive(:emit).with("stats.foo.bar2", time, {
+          expect(driver.instance.router).to receive(:emit).with("stats.foo.bar2", time, {
             "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
           })
         end
@@ -332,7 +332,7 @@ describe Fluent::StatsOutput do
         end
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("stats.foo", time, {
+          expect(driver.instance.router).to receive(:emit).with("stats.foo", time, {
             "4xx_count"=>12,"5xx_count"=>12,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
           })
         end
@@ -372,10 +372,9 @@ describe Fluent::StatsOutput do
         loaded_saved_duration = driver.instance.saved_duration
 
         expect(loaded_matches).to eql(stored_matches)
-        expect(loaded_saved_at).to eql(stored_saved_at)
+        expect(loaded_saved_at.to_i).to eql(stored_saved_at.to_i)
         expect(loaded_saved_duration).to eql(stored_saved_duration)
       end
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-stats
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2017-09-14 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 calculate statistics such as sum, max, min, avg
 email:
 - sonots@gmail.com
@@ -108,6 +122,8 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.10
+- Gemfile.v0.12
 - LICENSE
 - README.md
 - Rakefile
@@ -135,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-stats
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to calculate statistics such as sum, max, min, avg