fluent-plugin-stats 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf27cb39ed1dd976c0c6722b0be301d03e57eac9
-  data.tar.gz: 95384c6fe1303b54e722158db18685924dc9718e
+  metadata.gz: 11b934f53568a8eee91bce6436279e8b6503057b
+  data.tar.gz: fea48bdcd8022fedee054ec732333a38eaa75714
 SHA512:
-  metadata.gz: 8ee9239994adaa274869f4a7d73ea8c6864dd808acfbe3392f89bf2566fb5692b4d323e64806c0e6bb454044c87fe69f08e75a183b7f18c5c4712ac4a8cddef5
-  data.tar.gz: 63af8f6ead4b5982e9505656c03cbe8dde5301d6e0e42d2839267eb36d24cec47267589962f2071db41805a897d428c441cdc8b08288cf8116eaea333c477600
+  metadata.gz: 94019310b7906f9638feef6d27614921c390298b4406df88663e95d70419ccd1fd5d2b75fc203989b835606f0d084e29e27fdf27fc8f0a0ccad32f10a705afd4
+  data.tar.gz: 9408530d2b650a126a19ca125883876da8f490be347073808f574b6b3d69126315325c0f6443439fe2cb3b3937d874b77511107266192d814882aaf61c99e9bd

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.6 (2014/12/3)
+
+Enhancements:
+
+* Do not compute average for zero_emit message
+  * ToDo: Still, we should get the denominator to compute average from input json field
+
 ## 0.3.5 (2014/08/07)
 
 Enhancements:

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.5"
+  s.version     = "0.3.6"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-stats"

data/lib/fluent/plugin/out_stats.rb

@@ -80,12 +80,14 @@ class Fluent::StatsOutput < Fluent::Output
       matches = {}
       prev_matches.keys.each do |aggregate_key|
         next unless prev_matches[aggregate_key][:count] > 0 # Prohibit to emit anymore
-        matches[aggregate_key] = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {} }
+        matches[aggregate_key] = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {}, :avg_count => {} }
         # ToDo: would want default configuration for :max, :min
         prev_matches[aggregate_key][:sum].keys.each {|key| matches[aggregate_key][:sum][key] = 0 }
         prev_matches[aggregate_key][:max].keys.each {|key| matches[aggregate_key][:max][key] = 0 }
         prev_matches[aggregate_key][:min].keys.each {|key| matches[aggregate_key][:min][key] = 0 }
         prev_matches[aggregate_key][:avg].keys.each {|key| matches[aggregate_key][:avg][key] = 0 }
+        prev_matches[aggregate_key][:avg_count] ||= {} # for lower version compatibility
+        prev_matches[aggregate_key][:avg_count].keys.each {|key| matches[aggregate_key][:avg_count][key] = 0 }
       end
       matches
     else
@@ -109,7 +111,7 @@ class Fluent::StatsOutput < Fluent::Output
   # Called when new line comes. This method actually does not emit
   def emit(tag, es, chain)
     # stats
-    matches = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {} }
+    matches = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {}, :avg_count => {} }
     es.each do |time, record|
       record = stringify_keys(record)
       @sum_keys.each do |key|
@@ -127,6 +129,8 @@ class Fluent::StatsOutput < Fluent::Output
       @avg_keys.each do |key|
         next unless record[key] and value = record[key].to_f
         matches[:avg][key] = sum(matches[:avg][key], value)
+        # ignore zero emitted value
+        matches[:avg_count][key] = sum(matches[:avg_count][key], 1) unless (@zero_emit and value.zero?)
       end
       record.keys.each do |key|
         key = key.to_s
@@ -142,6 +146,8 @@ class Fluent::StatsOutput < Fluent::Output
         end
         if @avg and @avg.match(key)
           matches[:avg][key] = sum(matches[:avg][key], value) # sum yet
+          # ignore zero emitted value
+          matches[:avg_count][key] = sum(matches[:avg_count][key], 1) unless (@zero_emit and value.zero?)
         end
       end if @sum || @max || @min || @avg
       matches[:count] += 1
@@ -150,7 +156,8 @@ class Fluent::StatsOutput < Fluent::Output
     aggregate_key = @aggregate_proc.call(tag)
 
     # thread safe merge
-    @matches[aggregate_key] ||= { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {} }
+    @matches[aggregate_key] ||= { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {}, :avg_count => {} }
+    @matches[aggregate_key][:avg_count] ||= {} # for lower version compatibility
     @mutex.synchronize do
       matches[:sum].keys.each do |key|
         @matches[aggregate_key][:sum][key] = sum(@matches[aggregate_key][:sum][key], matches[:sum][key])
@@ -163,6 +170,7 @@ class Fluent::StatsOutput < Fluent::Output
       end
       matches[:avg].keys.each do |key|
         @matches[aggregate_key][:avg][key] = sum(@matches[aggregate_key][:avg][key], matches[:avg][key]) # sum yet
+        @matches[aggregate_key][:avg_count][key] = sum(@matches[aggregate_key][:avg_count][key], matches[:avg_count][key])
       end
       @matches[aggregate_key][:count] += matches[:count]
     end
@@ -230,9 +238,11 @@ class Fluent::StatsOutput < Fluent::Output
     matches[:min].keys.each do |key|
       output[key + @min_suffix] = matches[:min][key]
     end
+    matches[:avg_count] ||= {} # for lower version compatibility
     matches[:avg].keys.each do |key|
       output[key + @avg_suffix] = matches[:avg][key]
-      output[key + @avg_suffix] /= matches[:count].to_f if matches[:count] > 0
+      count = matches[:avg_count][key].to_f
+      output[key + @avg_suffix] /= count unless count.zero?
     end
     output
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-stats
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-stats
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to calculate statistics such as sum, max, min, avg