fluent-plugin-stats 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28926898a6e0a00aad103bafd93aa8372cd22055
-  data.tar.gz: 810624bf7e711d5cb30377545c3516edb0c4a5de
+  metadata.gz: ec8019dd61e1e3a0f5b57c1710666d827965bb83
+  data.tar.gz: 2800e919c9c44957a0ff57e81fb4ee57cc4c959d
 SHA512:
-  metadata.gz: 929e982bb1c14ae5eeb7a8ff26be6196cc002128fd78921e474b9883d842b0d6a2719a6a1b2f6090713c84f252fece52270c0c175ccc4f31efefc02331b24955
-  data.tar.gz: 0a9a65241a2b21d2ec3c1267be1e73853c69463085d0fb9ed6c7ea45ba83f766e91910efa39827ea9332bf42e53a07c0fb50c718fe05b999bb0fc49ee15f31a0
+  metadata.gz: bb176774a693586253f5e4d2020abcf74f513ccead4c17fc856be0f9560cab3c02ba909bad95d770da2f0198a75f6ac3962aa5c80fe197101f3a6324c76fe4ee
+  data.tar.gz: 8fdf07f4e8e953ea71b1df81f908ab500df303c5a47144e4b93f7af89e36e1d96fe7486e3a505115bf0f5af194ccc643a0fbf8afe5b3828bff1c6b69eeca2659

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.4 (2014/04/12)
+
+Enhancements:
+
+* Add `add_tag_suffix`, and `remove_tag_suffix` options
+
 ## 0.3.3 (2014/02/04)
 
 Enhancement:

data/README.md

@@ -88,6 +88,14 @@ then output bocomes as belows:
 
     Remove tag prefix for output message. 
 
+- add_tag_suffix
+
+    Add tag suffix for output message.
+
+- remove_tag_suffix
+
+    Remove tag suffix for output message. 
+
 - aggragate
     
     Calculate by each `tag` or `all`. The default value is `tag`.

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.3"
+  s.version     = "0.3.4"
   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

@@ -28,6 +28,8 @@ class Fluent::StatsOutput < Fluent::Output
   config_param :tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => nil
   config_param :remove_tag_prefix, :string, :default => nil
+  config_param :add_tag_suffix, :string, :default => nil
+  config_param :remove_tag_suffix, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
   config_param :store_file, :string, :default => nil
   config_param :zero_emit, :bool, :default => false
@@ -59,24 +61,10 @@ class Fluent::StatsOutput < Fluent::Output
       raise Fluent::ConfigError, "tag must be specified for aggregate all" if @tag.nil?
     end
 
-    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil?
       @add_tag_prefix = 'stats' # not ConfigError for lower version compatibility
     end
-
-    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
-    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
-    @tag_proc =
-      if @tag
-        Proc.new {|tag| @tag }
-      elsif @tag_prefix and @tag_prefix_match
-        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}" }
-      elsif @tag_prefix_match
-        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
-      elsif @tag_prefix
-        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
-      else
-        Proc.new {|tag| tag }
-      end
+    @tag_proc = tag_proc
 
     @matches = {}
     @mutex = Mutex.new
@@ -115,6 +103,7 @@ class Fluent::StatsOutput < Fluent::Output
 
   # Called when new line comes. This method actually does not emit
   def emit(tag, es, chain)
+    _tag = tag
     tag = 'all' if @aggregate == 'all'
     # stats
     matches = { :count => 0, :sum => {}, :max => {}, :min => {}, :avg => {} }
@@ -173,23 +162,27 @@ class Fluent::StatsOutput < Fluent::Output
       @matches[tag][:count] += matches[:count]
     end
 
+    log.trace "out_stats: tag:#{_tag} @matches:#{@matches}"
+
     chain.next
   rescue => e
-    log.warn "#{e.class} #{e.message} #{e.backtrace.first}"
+    log.warn "out_stats: #{e.class} #{e.message} #{e.backtrace.first}"
   end
 
   # thread callback
   def watcher
     # instance variable, and public accessable, for test
     @last_checked ||= Fluent::Engine.now
-    while (sleep 0.1)
+    while (sleep 0.5)
       begin
         if Fluent::Engine.now - @last_checked >= @interval
-          @last_checked = Fluent::Engine.now
-          flush_emit
+          report_time do
+            @last_checked = Fluent::Engine.now
+            flush_emit
+          end
         end
       rescue => e
-        log.warn "#{e.class} #{e.message} #{e.backtrace.first}"
+        log.warn "out_stats: #{e.class} #{e.message} #{e.backtrace.first}"
       end
     end
   end
@@ -197,13 +190,18 @@ class Fluent::StatsOutput < Fluent::Output
   # This method is the real one to emit
   def flush_emit
     time = Fluent::Engine.now
-    flushed_matches, @matches = @matches, initial_matches(@matches)
+    flushed_matches = {}
+    @mutex.synchronize do
+      flushed_matches, @matches = @matches, initial_matches(@matches)
+    end
+    log.trace("out_stats: flushed_matches:#{flushed_matches} @matches:#{@matches}") unless flushed_matches.empty?
 
-    flushed_matches.keys.each do |tag|
-      matches = flushed_matches[tag]
-      output = generate_output(matches)
+    flushed_matches.each do |tag, matches|
       emit_tag = @tag_proc.call(tag)
-      Fluent::Engine.emit(emit_tag, time, output) if output and !output.empty?
+      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?
+      end
     end
   end
 
@@ -321,8 +319,31 @@ class Fluent::StatsOutput < Fluent::Output
     transform_keys(hash) { |key| key.to_s }
   end
 
-  def lstrip(string, substring)
-    string.index(substring) == 0 ? string[substring.size..-1] : string
+  def tag_proc
+    rstrip = Proc.new {|str, substr| str.chomp(substr) }
+    lstrip = Proc.new {|str, substr| str.start_with?(substr) ? str[substr.size..-1] : str }
+    tag_prefix = "#{rstrip.call(@add_tag_prefix, '.')}." if @add_tag_prefix
+    tag_suffix = ".#{lstrip.call(@add_tag_suffix, '.')}" if @add_tag_suffix
+    tag_prefix_match = "#{rstrip.call(@remove_tag_prefix, '.')}." if @remove_tag_prefix
+    tag_suffix_match = ".#{lstrip.call(@remove_tag_suffix, '.')}" if @remove_tag_suffix
+    tag_fixed = @tag if @tag
+    if tag_fixed
+      Proc.new {|tag| tag_fixed }
+    elsif tag_prefix_match and tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(lstrip.call(tag, tag_prefix_match), tag_suffix_match)}#{tag_suffix}" }
+    elsif tag_prefix_match
+      Proc.new {|tag| "#{tag_prefix}#{lstrip.call(tag, tag_prefix_match)}#{tag_suffix}" }
+    elsif tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag, tag_suffix_match)}#{tag_suffix}" }
+    else
+      Proc.new {|tag| "#{tag_prefix}#{tag}#{tag_suffix}" }
+    end
   end
 
+  def report_time(msg = nil, &blk)
+    t = Time.now
+    output = yield
+    log.debug sprintf("out_stats: elapsed_time:%.2f thread_id:%s%s caller:%s", (Time.now - t).to_f, Thread.current.object_id, msg, caller()[0])
+    output
+  end
 end

data/spec/out_stats_spec.rb

@@ -190,6 +190,7 @@ describe Fluent::StatsOutput do
           sum _count$
         ]
       end
+      let(:tag) { 'foo.bar' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, {
@@ -206,6 +207,7 @@ describe Fluent::StatsOutput do
           sum _count$
         ]
       end
+      let(:tag) { 'foo.bar' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("bar", time, {
@@ -215,6 +217,40 @@ describe Fluent::StatsOutput do
       it { emit }
     end
 
+    context 'add_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          add_tag_suffix foo
+          sum _count$
+        ]
+      end
+      let(:tag) { 'foo.bar' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, {
+          "4xx_count"=>6,"5xx_count"=>6
+        })
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          remove_tag_suffix bar
+          sum _count$
+        ]
+      end
+      let(:tag) { 'foo.bar' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo", time, {
+          "4xx_count"=>6,"5xx_count"=>6
+        })
+      end
+      it { emit }
+    end
+
     context 'aggregate' do
       let(:emit) do
         driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar') } }

metadata

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