fluent-plugin-grepcounter 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90eca84d0b796ebd73afe0413d519a7d5d0517ec
-  data.tar.gz: 39accc620e237df5075a40d8c752535df1c9c989
+  metadata.gz: 75e1b135258e27a199ad76aff3b150c6d898ca4e
+  data.tar.gz: ce4a20861ad649906f1439f94b0f55f13c6b4bb8
 SHA512:
-  metadata.gz: e6fc4b7c068508e720d119c8ce7ed41c1b686259aac99bdaa44dd3e1ecfb0274f92eb6371eab2aee7cef510a437aa5c65f0ecd9c6469af5d53965f9b1d6e0c01
-  data.tar.gz: fdf50b8f80388238581370f1491a967af796f2cd4dcebaca5be2a0293157a72d5b7098d4d36369193567843740ae8d42b8d8a552706deeaf21716f35ddb89e2e
+  metadata.gz: f3a5ace25e1e8a5a68e94e6862849671ce291b93c5c85ca13ee35a9f6c3504de1d71e1c39c400956c77e0d2304f9d1192b8669b274ff32d58a3c531d574fc1e2
+  data.tar.gz: 7dee91e123f491709e8e9fabe339f357cddb8192ac50a2c2150823f7ff1f46748e9f810d21f815735d2257fe39782662e624b86b4ede37dfa2fba28c9fff0789

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.5 (2014/08/06)
+
+Enhancements:
+
+* Add `remove_tag_slice` option
+* Add `aggregate out_tag` option
+
 ## 0.5.4 (2014/04/12)
 
 Changes:

data/README.md

@@ -1,4 +1,7 @@
-# fluent-plugin-grepcounter [![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-grepcounter.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-grepcounter)
+# fluent-plugin-grepcounter
+
+[![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-grepcounter.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-grepcounter)
+[![Coverage Status](https://coveralls.io/repos/sonots/fluent-plugin-grepcounter/badge.png?branch=master)](https://coveralls.io/r/sonots/fluent-plugin-grepcounter?branch=master)
 
 Fluentd plugin to count the number of matched messages, and emit if exeeds the `threshold`. 
 
@@ -123,6 +126,24 @@ Then, output bocomes as belows (indented). You can see the `message` field is jo
 
     Remove tag suffix for output message
 
+* remove_tag_slice *min..max*
+
+    Remove tag parts by slice function. FYI: This option behaves like `tag.split('.').slice(min..max)`.
+
+    For example,
+
+        remove_tag_slice 0..-2
+
+    changes an input tag `foo.bar.host1` to `foo.bar`. 
+
+* aggregate
+
+    Aggregation unit. One of `all`, `in_tag`, `out_tag` can be specified. Default is `all`.
+
+    * `all` counts summation for all input messages and emit one message in each interval.
+    * `in_tag` counts summation for each input tag seperately. 
+    * `out_tag` counts summation for each tag *modified* by `add_tag_prefix`, `remove_tag_prefix`, or `remove_tag_slice`. 
+
 - delimiter
 
     Output matched messages after `join`ed with the specified delimiter.

data/fluent-plugin-grepcounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grepcounter"
-  s.version     = "0.5.4"
+  s.version     = "0.5.5"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "fluentd"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-nav"
+  s.add_development_dependency "coveralls"
 end

data/lib/fluent/plugin/out_grepcounter.rb

@@ -32,6 +32,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   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 :remove_tag_slice, :string, :default => nil
   config_param :output_with_joined_delimiter, :string, :default => nil # obsolete
   config_param :delimiter, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
@@ -94,7 +95,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
       end
     end
 
-    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil?
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil? and @remove_tag_slice.nil?
       @add_tag_prefix = 'count' # not ConfigError to support lower version compatibility
     end
     @tag_proc = tag_proc
@@ -102,11 +103,14 @@ class Fluent::GrepCounterOutput < Fluent::Output
     case @aggregate
     when 'all'
       raise Fluent::ConfigError, "grepcounter: `tag` must be specified with aggregate all" if @tag.nil?
-    when 'tag'
-      # raise Fluent::ConfigError, "grepcounter: add_tag_prefix must be specified with aggregate tag" if @add_tag_prefix.nil?
+    when 'tag' # obsolete
+      @aggregate = 'in_tag'
+    when 'in_tag'
+    when 'out_tag'
     else
-      raise Fluent::ConfigError, "grepcounter: aggregate allows tag/all"
+      raise Fluent::ConfigError, "grepcounter: aggregate allows all/in_tag/out_tag"
     end
+    @aggregate_proc = aggregate_proc(@tag_proc)
 
     if @store_file
       f = Pathname.new(@store_file)
@@ -156,12 +160,14 @@ class Fluent::GrepCounterOutput < Fluent::Output
         count += 1
       end
     end
+
+    aggregate_key = @aggregate_proc.call(tag)
     # thread safe merge
-    @counts[tag] ||= 0
-    @matches[tag] ||= []
+    @counts[aggregate_key] ||= 0
+    @matches[aggregate_key] ||= []
     @mutex.synchronize do
-      @counts[tag] += count
-      @matches[tag] += matches
+      @counts[aggregate_key] += count
+      @matches[aggregate_key] += matches
     end
 
     chain.next
@@ -192,22 +198,29 @@ class Fluent::GrepCounterOutput < Fluent::Output
     time = Fluent::Engine.now
     flushed_counts, flushed_matches, @counts, @matches = @counts, @matches, {}, {}
 
-    if @aggregate == 'all'
-      count = 0; matches = []
-      flushed_counts.keys.each do |tag|
-        count += flushed_counts[tag]
-        matches += flushed_matches[tag]
-      end
+    case @aggregate
+    when 'all'
+      count = flushed_counts[:all]
+      matches = flushed_matches[:all]
       output = generate_output(count, matches)
       Fluent::Engine.emit(@tag, time, output) if output
-    else
+    when 'out_tag'
+      flushed_counts.keys.each do |out_tag|
+        count = flushed_counts[out_tag]
+        matches = flushed_matches[out_tag]
+        output = generate_output(count, matches)
+        if output
+          Fluent::Engine.emit(out_tag, time, output)
+        end
+      end
+    else # in_tag
       flushed_counts.keys.each do |tag|
         count = flushed_counts[tag]
         matches = flushed_matches[tag]
         output = generate_output(count, matches, tag)
         if output
-          emit_tag = @tag_proc.call(tag)
-          Fluent::Engine.emit(emit_tag, time, output)
+          out_tag = @tag_proc.call(tag)
+          Fluent::Engine.emit(out_tag, time, output)
         end
       end
     end
@@ -234,7 +247,30 @@ class Fluent::GrepCounterOutput < Fluent::Output
     output
   end
 
+  def aggregate_proc(tag_proc)
+    case @aggregate
+    when 'all'
+      Proc.new {|tag| :all }
+    when 'in_tag'
+      Proc.new {|tag| tag }
+    when 'out_tag'
+      Proc.new {|tag| tag_proc.call(tag) }
+    end
+  end
+
   def tag_proc
+    tag_slice_proc =
+      if @remove_tag_slice
+        lindex, rindex = @remove_tag_slice.split('..', 2)
+        if lindex.nil? or rindex.nil? or lindex !~ /^-?\d+$/ or rindex !~ /^-?\d+$/
+          raise Fluent::ConfigError, "out_grepcounter: remove_tag_slice must be formatted like [num]..[num]"
+        end
+        l, r = lindex.to_i, rindex.to_i
+        Proc.new {|tag| (tags = tag.split('.')[l..r]).nil? ? "" : tags.join('.') }
+      else
+        Proc.new {|tag| tag }
+      end
+
     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
@@ -242,16 +278,16 @@ class Fluent::GrepCounterOutput < Fluent::Output
     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}" }
+    if tag_prefix_match and tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(lstrip.call(tag_slice_proc.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}" }
+      Proc.new {|tag| "#{tag_prefix}#{lstrip.call(tag_slice_proc.call(tag), tag_prefix_match)}#{tag_suffix}" }
     elsif tag_suffix_match
-      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag, tag_suffix_match)}#{tag_suffix}" }
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag_slice_proc.call(tag), tag_suffix_match)}#{tag_suffix}" }
+    elsif tag_prefix || @remove_tag_slice || tag_suffix
+      Proc.new {|tag| "#{tag_prefix}#{tag_slice_proc.call(tag)}#{tag_suffix}" }
     else
-      Proc.new {|tag| "#{tag_prefix}#{tag}#{tag_suffix}" }
+      Proc.new {|tag| tag_fixed }
     end
   end
 

data/spec/out_grepcounter_spec.rb

@@ -93,8 +93,8 @@ describe Fluent::GrepCounterOutput do
     context 'default' do
       let(:config) { CONFIG }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -102,8 +102,8 @@ describe Fluent::GrepCounterOutput do
     context 'regexp' do
       let(:config) { CONFIG + %[ regexp WARN ] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>3,
           "message"=>[
             "2013/01/13T07:02:13.232645 WARN POST /auth",
@@ -118,8 +118,8 @@ describe Fluent::GrepCounterOutput do
     context 'regexpN' do
       let(:config) { %[ regexp1 message WARN ] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>3,
         }).delete!('message'))
       end
@@ -129,8 +129,8 @@ describe Fluent::GrepCounterOutput do
     context 'exclude' do
       let(:config) { CONFIG + %[regexp WARN \n exclude favicon] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>2,
           "message"=>[
             "2013/01/13T07:02:13.232645 WARN POST /auth",
@@ -144,8 +144,8 @@ describe Fluent::GrepCounterOutput do
     context 'excludeN' do
       let(:config) { %[regexp1 message WARN \n exclude1 message favicon] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>2,
         }).delete!('message'))
       end
@@ -156,8 +156,8 @@ describe Fluent::GrepCounterOutput do
       context '>= threshold' do
         let(:config) { CONFIG + %[threshold 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -165,8 +165,8 @@ describe Fluent::GrepCounterOutput do
       context 'not >= threshold' do
         let(:config) { CONFIG + %[threshold 5] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -174,8 +174,8 @@ describe Fluent::GrepCounterOutput do
       context '<= threshold' do
         let(:config) { CONFIG + %[threshold 4 \n comparator <=] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -183,8 +183,8 @@ describe Fluent::GrepCounterOutput do
       context 'not <= threshold' do
         let(:config) { CONFIG + %[threshold 3 \n comparator <=] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -194,8 +194,8 @@ describe Fluent::GrepCounterOutput do
       context 'greater_equal' do
         let(:config) { CONFIG + %[greater_equal 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -203,8 +203,8 @@ describe Fluent::GrepCounterOutput do
       context 'not greater_equal' do
         let(:config) { CONFIG + %[greater_equal 5] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -212,8 +212,8 @@ describe Fluent::GrepCounterOutput do
       context 'greater_than' do
         let(:config) { CONFIG + %[greater_than 3] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -221,8 +221,8 @@ describe Fluent::GrepCounterOutput do
       context 'not greater_than' do
         let(:config) { CONFIG + %[greater_than 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -230,8 +230,8 @@ describe Fluent::GrepCounterOutput do
       context 'less_equal' do
         let(:config) { CONFIG + %[less_equal 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -239,8 +239,8 @@ describe Fluent::GrepCounterOutput do
       context 'not less_equal' do
         let(:config) { CONFIG + %[less_equal 3] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -248,8 +248,8 @@ describe Fluent::GrepCounterOutput do
       context 'less_than' do
         let(:config) { CONFIG + %[less_than 5] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -257,8 +257,8 @@ describe Fluent::GrepCounterOutput do
       context 'not less_than' do
         let(:config) { CONFIG + %[less_than 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -266,8 +266,8 @@ describe Fluent::GrepCounterOutput do
       context 'between' do
         let(:config) { CONFIG + %[greater_than 1 \n less_than 5] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -275,8 +275,8 @@ describe Fluent::GrepCounterOutput do
       context 'not between' do
         let(:config) { CONFIG + %[greater_than 1 \n less_than 4] }
         before do
-          Fluent::Engine.stub(:now).and_return(time)
-          Fluent::Engine.should_not_receive(:emit)
+          allow(Fluent::Engine).to receive(:now).and_return(time)
+          expect(Fluent::Engine).not_to receive(:emit)
         end
         it { emit }
       end
@@ -285,8 +285,8 @@ describe Fluent::GrepCounterOutput do
     context 'output_tag (obsolete)' do
       let(:config) { CONFIG + %[output_tag foo] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo", time, expected)
       end
       it { emit }
     end
@@ -294,8 +294,8 @@ describe Fluent::GrepCounterOutput do
     context 'tag' do
       let(:config) { CONFIG + %[tag foo] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo", time, expected)
       end
       it { emit }
     end
@@ -304,8 +304,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[add_tag_prefix foo] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -314,8 +314,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[remove_tag_prefix syslog] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("host1", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("host1", time, expected)
       end
       it { emit }
     end
@@ -324,8 +324,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[add_tag_suffix foo] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("#{tag}.foo", time, expected)
       end
       it { emit }
     end
@@ -334,8 +334,18 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[remove_tag_suffix host1] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("syslog", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_slice' do
+      let(:config) { CONFIG + %[remove_tag_slice 0..-2] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
       end
       it { emit }
     end
@@ -349,8 +359,8 @@ describe Fluent::GrepCounterOutput do
       ]}
       let(:tag) { 'syslog.foo.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo.foo.foo", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo.foo.foo", time, expected)
       end
       it { emit }
     end
@@ -359,8 +369,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[add_tag_prefix foo.] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -369,8 +379,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[remove_tag_prefix syslog.] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("host1", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("host1", time, expected)
       end
       it { emit }
     end
@@ -379,8 +389,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[add_tag_suffix .foo] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("#{tag}.foo", time, expected)
       end
       it { emit }
     end
@@ -389,8 +399,8 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[remove_tag_suffix .host1] }
       let(:tag) { 'syslog.host1' }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("syslog", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
       end
       it { emit }
     end
@@ -399,9 +409,9 @@ describe Fluent::GrepCounterOutput do
       # \\n shall be \n in config file
       let(:config) { CONFIG + %[output_with_joined_delimiter \\n] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
         message = expected["message"].join('\n')
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
       end
       it { emit }
     end
@@ -410,9 +420,9 @@ describe Fluent::GrepCounterOutput do
       # \\n shall be \n in config file
       let(:config) { CONFIG + %[delimiter \\n] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
         message = expected["message"].join('\n')
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
+        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
       end
       it { emit }
     end
@@ -433,8 +443,47 @@ describe Fluent::GrepCounterOutput do
 
       let(:config) { CONFIG + %[aggregate all \n output_tag count] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("count", time, expected)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("count", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'aggregate in_tag' do
+      let(:messages) { ['foobar', 'foobar'] }
+      let(:emit) do
+        driver.run { messages.each {|message| driver.emit_with_tag({'message' => message}, time, 'foo.bar') } }
+        driver.run { messages.each {|message| driver.emit_with_tag({'message' => message}, time, 'foo.bar2') } }
+        driver.instance.flush_emit(0)
+      end
+
+      let(:config) { CONFIG + %[aggregate tag \n remove_tag_slice 0..-2] }
+      before do
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+          "count"=>2, "message"=>["foobar", "foobar"], "input_tag"=>"foo.bar", "input_tag_last"=>"bar"
+        })
+        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+          "count"=>2, "message"=>["foobar", "foobar"], "input_tag"=>"foo.bar2", "input_tag_last"=>"bar2"
+        })
+      end
+      it { emit }
+    end
+
+    context 'aggregate out_tag' do
+      let(:messages) { ['foobar', 'foobar'] }
+      let(:emit) do
+        driver.run { messages.each {|message| driver.emit_with_tag({'message' => message}, time, 'foo.bar') } }
+        driver.run { messages.each {|message| driver.emit_with_tag({'message' => message}, time, 'foo.bar2') } }
+        driver.instance.flush_emit(0)
+      end
+
+      let(:config) { CONFIG + %[aggregate out_tag \n remove_tag_slice 0..-2] }
+      before do
+        allow(Fluent::Engine).to receive(:now).and_return(time)
+        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+          "count"=>4, "message"=>["foobar", "foobar", "foobar", "foobar"]
+        })
       end
       it { emit }
     end
@@ -443,7 +492,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[regexp WARN \n replace_invalid_sequence true] }
       let(:messages) { [ "\xff".force_encoding('UTF-8') ] }
       before do
-        Fluent::Engine.stub(:now).and_return(time)
+        allow(Fluent::Engine).to receive(:now).and_return(time)
       end
       it { expect { emit }.not_to raise_error }
     end
@@ -477,10 +526,10 @@ describe Fluent::GrepCounterOutput do
         loaded_saved_at = driver.instance.saved_at
         loaded_saved_duration = driver.instance.saved_duration
 
-        loaded_counts.should == stored_counts
-        loaded_matches.should == stored_matches
-        loaded_saved_at.should == stored_saved_at
-        loaded_saved_duration.should == stored_saved_duration
+        expect(loaded_counts).to eql(stored_counts)
+        expect(loaded_matches).to eql(stored_matches)
+        expect(loaded_saved_at).to eql(stored_saved_at)
+        expect(loaded_saved_duration).to eql(stored_saved_duration)
       end
     end
 

data/spec/spec_helper.rb

@@ -4,8 +4,14 @@ require 'bundler'
 Bundler.setup(:default, :test)
 Bundler.require(:default, :test)
 
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 require 'fluent/test'
 require 'rspec'
+require 'rspec/its'
 require 'pry'
 # require 'delorean'
 

metadata

@@ -1,83 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   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'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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 count the number of matched messages, and emit if exceeds
@@ -88,11 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rdebugrc
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -112,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-grepcounter
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to count the number of matched messages, and emit if exceeds

data/.rdebugrc

@@ -1,4 +0,0 @@
-set autolist
-set autoeval
-set autoreload
-