fluent-plugin-histogram 0.2.2 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY2M2ZhNzY5YmE2ZDc4MzMwYTA2YTYxMmYzYWFiNDExMGQ0OWFiNA==
+    MjE3MzNkNjEwZDczYzBhMDk0NmIxMWEwNDk2ZTliOWNhYzRhOGJjNw==
   data.tar.gz: !binary |-
-    Y2Q3MWViYTNkMjViMzU2MDA1MGIwZTMyM2FkMzg3NjQyMThlZTdjNA==
+    YzEyYTFkNmQxNWY1MjZhMzNhZTU1NjczMTNjMzIzMmE0M2QyZTk5OA==
 SHA512:
   metadata.gz: !binary |-
-    MWYzNDg5ZjkyZGQyNGMzNGNjYWNiZjQ1MDc3M2NhNDNkODA3OTcxMjljYTNh
-    ZWYzOWNjOTI2YzJiYjY1OWZjOWM3OGU5YjVmOTU4NmY0M2U0MDM2MGNhMTA1
-    ODY2YTI4OWM5ZDRlN2VkOGNjN2QwOTMwOTE1OWQ0ZjhjYzkwYmQ=
+    MWUzNzgyMDM3NGRiNGZiODlkOWEzMjhiNzg0NzQ2NzJiN2E0Mzc5MDA2MGQz
+    NmU2M2ZhNTg0MGJjYzNkN2Q4NzdjZTU4N2JiM2EyNGJhYTJiMDdjZDU2MDBj
+    YTdjMjYxMDE2ZDg0Mjg3NzMyZTFiYjdjOTMxMjRhYTFjYTMzMWU=
   data.tar.gz: !binary |-
-    Yzc0MTRkMTJkYTNkY2Y1NWY3ZjVlYWNlNDA3ZjNmMjdkNGUzYzFkMTRlYjQ2
-    YWNlNWMxZTg0ZjY5YWYyMGI1YjE2MjE1N2Q3NjZjYzcxYTNjODVlNzllN2Ez
-    ZjVhNGRiMDU5ZGM5ZWUyM2YxY2I4MmI3OTE4OWQxZTFjZTExMmU=
+    NGQyMmRkNzQxZWVmZjc4MThkNTM1YmZiYmVlZjA1YzZmODBjZDg4NWYyODlj
+    MmYzNTZiNGI3Njk1MTExYjc4YmIwNDYxMGJlYzQ4ZGY2MGIzMmE1ZTFhYTNk
+    NWNhODIwODZmNjI2NjVjNjdmMmRkYWQ2MjY0YWY5NjgyN2U3YmE=

data/fluent-plugin-histogram.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-histogram"
-  gem.version       = "0.2.2"
+  gem.version       = "0.2.4"
   gem.authors       = ["Yusuke SHIMIZU"]
   gem.email         = "a.ryuklnm@gmail.com"
   gem.description   = "Combine inputs data and make histogram which helps to detect a hotspot."

data/lib/fluent/plugin/out_histogram.rb

@@ -175,11 +175,18 @@ module Fluent
       output = {}
       flushed.each do |tag, hist|
         output[tag] = {}
-        sum = hist.inject(:+)
-        avg = sum / hist.size
-        sd = hist.instance_eval do
-          sigmas = map { |n| (avg - n)**2 }
-          Math.sqrt(sigmas.inject(:+) / size)
+        act_hist = hist.dup.select!{|v| v > 0}
+        if act_hist.size == 0 # equal to zero_hist
+          sum = 0
+          avg = 0
+          sd = 0
+        else
+          sum = act_hist.inject(:+)
+          avg = sum / act_hist.size
+          sd = act_hist.instance_eval do
+            sigmas = map { |n| (avg - n)**2 }
+            Math.sqrt(sigmas.inject(:+) / size)
+          end
         end
         output[tag][:hist] = hist if @out_include_hist
         output[tag][:sum] = @disable_revalue ? sum : sum / @revalue

data/test/plugin/test_out_histogram.rb

@@ -53,12 +53,13 @@ class HistogramOutputTest < Test::Unit::TestCase
       hist[id] += 1
     end
 
-    sd = hist.instance_eval do
+    act_hist = hist.dup.select{|v| v > 0}
+    sd = act_hist.instance_eval do
       avg = inject(:+) / size
       sigmas = map { |n| (avg - n)**2 }
       Math.sqrt(sigmas.inject(:+) / size)
     end
-    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/bin_num, :sd=>sd.to_i}},
+    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/act_hist.size, :sd=>sd.to_i}},
                  f.instance.flush)
   end
 
@@ -98,12 +99,13 @@ class HistogramOutputTest < Test::Unit::TestCase
       hist[(id - alpha) % bin_num] += 1
     end
 
-    sd = hist.instance_eval do
+    act_hist = hist.select{|v| v > 0}
+    sd = act_hist.instance_eval do
       avg = inject(:+) / size
       sigmas = map { |n| (avg - n)**2 }
       Math.sqrt(sigmas.inject(:+) / size)
     end
-    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/bin_num, :sd=>sd.to_i}},
+    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/act_hist.size, :sd=>sd.to_i}},
                  f.instance.flush)
   end
 
@@ -156,8 +158,9 @@ class HistogramOutputTest < Test::Unit::TestCase
       f.instance.increment("test.input", i.to_s)
     end
     flushed = f.instance.flush
+    act_hist = flushed["test.input"][:hist].select{|v| v > 0}
     assert_equal(1000, flushed["test.input"][:sum])
-    assert_equal(1000/bin_num, flushed["test.input"][:avg])
+    assert_equal(1000/act_hist.size, flushed["test.input"][:avg])
   end
 
   def test_emit
@@ -171,8 +174,9 @@ class HistogramOutputTest < Test::Unit::TestCase
       end
     end
     flushed = f.instance.flush
+    act_hist = flushed["test"][:hist].select{|v| v > 0}
     assert_equal(300, flushed["test"][:sum])
-    assert_equal(300/bin_num, flushed["test"][:avg])
+    assert_equal(300/act_hist.size, flushed["test"][:avg])
   end
 
   def test_some_hist_exist_case_tagging_with_emit
@@ -302,14 +306,31 @@ bias:#{flushed_bias["histo.localhost"]}")
     id = "c"[0..9].codepoints.collect{|cp| cp}.join().to_i % bin_num
     hist[id] += 3
 
-    sd = hist.instance_eval do
+    act_hist = hist.dup.select{|v| v > 0}
+    sd = act_hist.instance_eval do
       avg = inject(:+) / size
       sigmas = map { |n| (avg - n)**2 }
       Math.sqrt(sigmas.inject(:+) / size)
     end
     flushed = f.instance.flush
-    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/bin_num, :sd=>sd.to_i}}, flushed)
+    assert_equal({"test.input" => {:hist => hist, :sum => 6, :avg => 6/act_hist.size, :sd=>sd.to_i}}, flushed)
   end
 
+  def test_output_zero_length_hist
+    bin_num = 5
+    f = create_driver(%[ bin_num #{bin_num} ])
+    flushed = f.instance.flush
+    assert_equal({}, flushed)
+
+    f.run do
+      f.emit({"keys" => "a"})
+    end
+    f.instance.flush # flush
+    flushed = f.instance.flush
+    assert_equal([0]*5, flushed["test"][:hist])
+    assert_equal(0, flushed["test"][:sum])
+    assert_equal(0, flushed["test"][:avg])
+    assert_equal(0, flushed["test"][:sd])
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-histogram
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Yusuke SHIMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler