fluent-plugin-groupcounter 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eae1a0bcfc8a083aae95ca82cf3870d3ec1055c
-  data.tar.gz: 14201fa360defd334687a6ee18aa3722fdba9791
+  metadata.gz: 26090aad310f08ef321e34aa1a70d163b22c5836
+  data.tar.gz: 6646e5b26176862e2690a075cb6efe3aef2eaac1
 SHA512:
-  metadata.gz: 089d7eec6dc0e3206e105610b9e28b8f6813c927d79d006c5ec04abcdb1870adc7a4d18808fc821a3050af86ce352557cfc48da51e50d9572fdc1ee465558e3c
-  data.tar.gz: ccc024bf4414587322556d0a9725ad475786b8ac7e71c9c6cd5d07c24bf73b307a5d0169542a0e4cfd7333a566fc898b5d7653991ece26a53449cedfb0ace0d9
+  metadata.gz: 80d21ba0055a19bce8c1b8ec268b6b44bff868a1951e7bfebb62eed72f49d3b82a678861a8f23770bc7727b15fdf6a60ee7281142b1913feb7ac419990fa4411
+  data.tar.gz: 7298c6d5fc76383e69c9f538b0f05e335351c3986929fc0c7eb069703c492b77aee4950d81ecaee903cad6d625df51e8bfb4a70ce1cb3dce745d4eff363750e6

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.3 (2013/12/28)
+
+Changes
+
+* Add `add_tag_prefix` and `remove_tag_prefix` options. `tag_prefix` and `input_tag_remove_prefix` are obsolete. 

data/README.md

@@ -16,7 +16,7 @@ Think of quering `SELECT COUNT(\*) GROUP BY code,method,path`. Configuration bec
       type groupcounter
       aggregate tag
       output_per_tag true
-      tag_prefix groupcounter
+      add_tag_prefix groupcounter
       group_by_keys code,method,path
     </match>
 
@@ -68,11 +68,11 @@ Output becomes like
 
     The output tag. Default is `groupcount`.
 
-* tag\_prefix
+* add\_tag\_prefix
 
     The prefix string which will be added to the input tag. `output_per_tag yes` must be specified together. 
 
-* input\_tag\_remove\_prefix
+* remove\_tag\__prefix
 
     The prefix string which will be removed from the input tag.
 
@@ -125,6 +125,18 @@ Output becomes like
 
     Default is `_avg`. Should be used with `avg_key` option.
 
+## ChangeLog
+
+See [CHANGELOG.md](CHANGELOG.md) for details.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new [Pull Request](../../pull/new/master)
+
 ## Copyright
 
 * Copyright

data/fluent-plugin-groupcounter.gemspec

@@ -3,12 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-groupcounter"
-  s.version     = "0.2.2"
-  s.authors     = ["Ryosuke IWANAGA", "Naotoshi SEO"]
-  s.email       = ["@riywo", "sonots@gmail.com"]
+  s.version     = "0.2.3"
+  s.authors     = ["Ryosuke IWANAGA", "Naotoshi Seo"]
+  s.email       = ["riywo.jp@gmail.com", "sonots@gmail.com"]
   s.homepage    = "https://github.com/riywo/fluent-plugin-groupcounter"
   s.summary     = %q{Fluentd plugin to count like SELECT COUNT(\*) GROUP BY}
   s.description = %q{Fluentd plugin to count like SELECT COUNT(\*) GROUP BY}
+  s.licenses    = ["Apache"]
 
   s.rubyforge_project = "fluent-plugin-groupcounter"
 

data/lib/fluent/plugin/out_groupcounter.rb

@@ -13,8 +13,10 @@ class Fluent::GroupCounterOutput < Fluent::Output
   config_param :output_per_tag, :bool, :default => false
   config_param :aggregate, :string, :default => 'tag'
   config_param :tag, :string, :default => 'groupcount'
-  config_param :tag_prefix, :string, :default => nil
-  config_param :input_tag_remove_prefix, :string, :default => nil
+  config_param :tag_prefix, :string, :default => nil # obsolete
+  config_param :add_tag_prefix, :string, :default => nil
+  config_param :input_tag_remove_prefix, :string, :default => nil # obsolete
+  config_param :remove_tag_prefix, :string, :default => nil
   config_param :group_by_keys, :string, :default => nil
   config_param :group_by_expression, :string, :default => nil
   config_param :max_key, :string, :default => nil
@@ -56,13 +58,18 @@ class Fluent::GroupCounterOutput < Fluent::Output
                    raise Fluent::ConfigError, "groupcounter aggregate allows tag/all"
                  end
 
+    @add_tag_prefix ||= @tag_prefix
+    @remove_tag_prefix ||= @input_tag_remove_prefix
     if @output_per_tag
-      raise Fluent::ConfigError, "tag_prefix must be specified with output_per_tag" unless @tag_prefix
-      @tag_prefix_string = @tag_prefix + '.'
+      raise Fluent::ConfigError, "add_tag_prefix must be specified with output_per_tag" unless @add_tag_prefix
     end
-
-    if @input_tag_remove_prefix
-      @removed_prefix_string = @input_tag_remove_prefix + '.'
+    if @add_tag_prefix
+      @tag_prefix_string = @add_tag_prefix + '.'
+    else
+      @tag_prefix_string = ''
+    end
+    if @remove_tag_prefix
+      @removed_prefix_string = @remove_tag_prefix + '.'
       @removed_length = @removed_prefix_string.length
     end
 
@@ -152,7 +159,7 @@ class Fluent::GroupCounterOutput < Fluent::Output
     time = Fluent::Engine.now
     if @output_per_tag
       flush.each do |tag, message|
-        Fluent::Engine.emit(@tag_prefix_string + tag, time, message)
+        Fluent::Engine.emit("#{@tag_prefix_string}#{tag}", time, message)
       end
     else
       message = flush
@@ -265,9 +272,8 @@ class Fluent::GroupCounterOutput < Fluent::Output
   end
 
   def stripped_tag(tag)
-    return tag unless @input_tag_remove_prefix
+    return tag unless @remove_tag_prefix
     return tag[@removed_length..-1] if tag.start_with?(@removed_prefix_string) and tag.length > @removed_length
-    return tag[@removed_length..-1] if tag == @input_tag_remove_prefix
     tag
   end
 

data/spec/out_groupcounter_spec.rb

@@ -14,11 +14,11 @@ describe Fluent::GroupCounterOutput do
     count_interval 5s
     aggragate tag
     output_per_tag true
-    tag_prefix count
+    add_tag_prefix count
     group_by_keys code,method,path
   ]
 
-  let(:tag) { 'test' }
+  let(:tag) { 'test.hoge' }
   let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::GroupCounterOutput, tag).configure(config) }
 
   describe 'test configure' do
@@ -32,8 +32,8 @@ describe Fluent::GroupCounterOutput do
         its(:output_per_tag) { should == false }
         its(:aggregate) { should == :tag }
         its(:tag) { should == 'groupcount' }
-        its(:tag_prefix) { should be_nil }
-        its(:input_tag_remove_prefix) { should be_nil }
+        its(:add_tag_prefix) { should be_nil }
+        its(:remove_tag_prefix) { should be_nil }
         its(:group_by_keys) { should == %w[foo] }
       end
 
@@ -44,8 +44,8 @@ describe Fluent::GroupCounterOutput do
         its(:output_per_tag) { should == true }
         its(:aggregate) { should == :tag }
         its(:tag) { should == 'groupcount' }
-        its(:tag_prefix) { should == 'count' }
-        its(:input_tag_remove_prefix) { should be_nil }
+        its(:add_tag_prefix) { should == 'count' }
+        its(:remove_tag_prefix) { should be_nil }
         its(:group_by_keys) { should == %w[code method path] }
       end
     end
@@ -74,7 +74,7 @@ describe Fluent::GroupCounterOutput do
       }
     end
     let(:expected_with_tag) do
-      Hash[*(expected.map {|key, val| next ["test_#{key}", val] }.flatten)] 
+      Hash[*(expected.map {|key, val| next ["test.hoge_#{key}", val] }.flatten)] 
     end
 
     context 'typical' do
@@ -217,7 +217,7 @@ describe Fluent::GroupCounterOutput do
     context 'no group_by' do
       let(:config) do
         %[
-          tag_prefix count
+          add_tag_prefix count
           output_per_tag true
 
           count_suffix count
@@ -271,10 +271,14 @@ describe Fluent::GroupCounterOutput do
       end
     end
 
-    context 'tag_prefix' do
+    context 'tag_prefix (obsolete)' do
       let(:config) do
-        CONFIG + %[
+        %[
+          count_interval 5s
+          aggragate tag
+          output_per_tag true
           tag_prefix foo
+          group_by_keys code,method,path
         ]
       end
       before do
@@ -284,6 +288,47 @@ describe Fluent::GroupCounterOutput do
       it { emit }
     end
 
+    context 'add_tag_prefix' do
+      let(:config) do
+        CONFIG + %[
+          add_tag_prefix foo
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'input_tag_remove_prefix (obsolete)' do
+      let(:config) do
+        CONFIG + %[
+          add_tag_prefix foo
+          input_tag_remove_prefix test
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.hoge", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_prefix' do
+      let(:config) do
+        CONFIG + %[
+          add_tag_prefix foo
+          remove_tag_prefix test
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.hoge", time, expected)
+      end
+      it { emit }
+    end
+
     context 'aggregate all' do
       let(:emit) do
         driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar') } }
@@ -294,7 +339,7 @@ describe Fluent::GroupCounterOutput do
       let(:config) do
         CONFIG + %[
           aggregate all
-          tag_prefix count
+          add_tag_prefix count
         ]
       end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groupcounter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryosuke IWANAGA
-- Naotoshi SEO
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -83,7 +83,7 @@ dependencies:
         version: '0'
 description: Fluentd plugin to count like SELECT COUNT(\*) GROUP BY
 email:
-- '@riywo'
+- riywo.jp@gmail.com
 - sonots@gmail.com
 executables: []
 extensions: []
@@ -92,6 +92,7 @@ files:
 - .gitignore
 - .pryrc
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -100,7 +101,8 @@ files:
 - spec/out_groupcounter_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/riywo/fluent-plugin-groupcounter
-licenses: []
+licenses:
+- Apache
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-groupcounter
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to count like SELECT COUNT(\*) GROUP BY
 test_files:
 - spec/out_groupcounter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: