fluent-plugin-stats 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036f3acd030741392ec82058f22e3921cfb4bf3a
-  data.tar.gz: 67a195961977e80ff7ef70e0d1418236a5ec7a4b
+  metadata.gz: c448a36c0de1af2d025a96065a51ebbaa29f3a67
+  data.tar.gz: a5e1b567b9c1d1ba0c2af2bebf3192aa1d001a4e
 SHA512:
-  metadata.gz: a208ce10bcf0245ef0d5a36dde4134012583455881bcc370a16061cbed12b1cc7555df81725fc124cdd3c4bd9a8046440d39c7f2d4c15799d9c74609bf1872c5
-  data.tar.gz: a2639f78d865f3e71a87d7ccb68aed91e1eb652c9cc6bc70d1bac0c04753d877e749a818791d98cf84801b1ba0036da508b5020c7be0182c96599c6693d0dfd4
+  metadata.gz: d8489b420002f513bca5414625211565e657ee66d0587c2e8280cc5e1b57adf7142aeabd0c5950724b8c2925c1e99ec2f7c1facb38105032fe5dba360da2e91e
+  data.tar.gz: 294c70be814bde4a92eaf25d385259dbde3b66491bf15560a462b3195bcc7540e11fb43b716d458e1ae296c5bf7004dc180e6c873719120c958232439bb803a3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.2 (2014/01/24)
+
+Fixes
+
+- Fix the case when input record keys are symbols
+
 ## 0.3.1 (2014/01/02)
 
 Fixes

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.1"
+  s.version     = "0.3.2"
   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

@@ -114,6 +114,7 @@ class Fluent::StatsOutput < Fluent::Output
     # stats
     matches = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {} }
     es.each do |time, record|
+      record = stringify_keys(record)
       @sum_keys.each do |key|
         next unless record[key] and value = record[key].to_f
         matches[:sum][key] = sum(matches[:sum][key], value)
@@ -131,6 +132,7 @@ class Fluent::StatsOutput < Fluent::Output
         matches[:avg][key] = sum(matches[:avg][key], value)
       end
       record.keys.each do |key|
+        key = key.to_s
         value = record[key].to_f
         if @sum and @sum.match(key)
           matches[:sum][key] = sum(matches[:sum][key], value)
@@ -175,13 +177,11 @@ class Fluent::StatsOutput < Fluent::Output
   def watcher
     # instance variable, and public accessable, for test
     @last_checked ||= Fluent::Engine.now
-    while true
-      sleep 0.5
+    while (sleep 0.1)
       begin
         if Fluent::Engine.now - @last_checked >= @interval
-          now = Fluent::Engine.now
-          flush_emit(now - @last_checked)
-          @last_checked = now
+          @last_checked = Fluent::Engine.now
+          flush_emit
         end
       rescue => e
         $log.warn "#{e.class} #{e.message} #{e.backtrace.first}"
@@ -190,7 +190,7 @@ class Fluent::StatsOutput < Fluent::Output
   end
 
   # This method is the real one to emit
-  def flush_emit(step)
+  def flush_emit
     time = Fluent::Engine.now
     flushed_matches, @matches = @matches, initial_matches(@matches)
 
@@ -304,6 +304,17 @@ class Fluent::StatsOutput < Fluent::Output
   end
 
   private
+  def transform_keys(hash)
+    result = {}
+    hash.each_key do |key|
+      result[yield(key)] = hash[key]
+    end
+    result
+  end
+
+  def stringify_keys(hash)
+    transform_keys(hash) { |key| key.to_s }
+  end
 
   def lstrip(string, substring)
     string.index(substring) == 0 ? string[substring.size..-1] : string

data/spec/out_stats_spec.rb

@@ -70,15 +70,15 @@ describe Fluent::StatsOutput do
       [
         {"4xx_count"=>"1","5xx_count"=>2,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3},
         {"4xx_count"=>"2","5xx_count"=>2,"reqtime_max"=>5,"reqtime_min"=>2,"reqtime_avg"=>2},
-        {"4xx_count"=>"3","5xx_count"=>2,"reqtime_max"=>1,"reqtime_min"=>3,"reqtime_avg"=>4},
+        {:'4xx_count'=>"3",:'5xx_count'=>2,:reqtime_max=>1,:reqtime_min=>3,:reqtime_avg=>4},
       ]
     end
     let(:emit) do
       driver.run { messages.each {|message| driver.emit(message, time) } }
-      driver.instance.flush_emit(0)
+      driver.instance.flush_emit
     end
     let(:empty_emit) do
-      driver.instance.flush_emit(0)
+      driver.instance.flush_emit
     end
 
     context 'sum/max/min/avg' do
@@ -219,7 +219,7 @@ describe Fluent::StatsOutput do
       let(:emit) do
         driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar') } }
         driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar2') } }
-        driver.instance.flush_emit(0)
+        driver.instance.flush_emit
       end
 
       context 'aggregate all' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-stats
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd