fluent-plugin-grep 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0613931c1a98ce10f1cbbdc97a712b158b38e13
-  data.tar.gz: 4fc868cced83edb4fe14cb0960894178c2162eca
+  metadata.gz: 96e41f9ac8b3207023da172df7e94f0890dda86d
+  data.tar.gz: 5e0d3601c87d4a5cba48dd0395947287e36285e9
 SHA512:
-  metadata.gz: 15fc714a1b73e0628de80e8b4059db41ef990c7a0db68d0334ee00ab849c9dee3902d4ac356f6ed872ffc97cb0d9755b8c2a618fb50281d571c4512cb69ab40d
-  data.tar.gz: 5d926b83217838e8aa06894618b4871992573c763ee33b3e9f1cddd21984522900eb8b4cf42757fa65c7161fee174ae5dde70c507588e9f2b8552283dfb9daa6
+  metadata.gz: ec7018222ac042c04f005e9e3d294c2e32d810cd6296ddf7139b67685008546cdfcd7599e83c11a41c5cc9774f7eb7f1871a49725eccb847a5017038952a7685
+  data.tar.gz: 52f35e4778260dfffaf3ccc6b4d8ca09d37b5597e3a140a93c9201a175ed6b634f17ee6510bbaf4ee6951064c020ecbc81d0673c4934779601e9ddfe252b6e90

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2013/11/30)
+
+Features:
+
+- Add `remove_tag_prefix` option
+
 ## 0.1.1 (2013/11/02)
 
 Changes:

data/README.md

@@ -46,6 +46,10 @@ then output bocomes as belows (like, | grep WARN | grep -v favicon.ico):
 
     Add tag prefix for output message
 
+- remove_tag_prefix
+
+    Remove tag prefix for output message
+
 - replace_invalid_sequence
 
     Replace invalid byte sequence in UTF-8 with '?' character if `true`

data/fluent-plugin-grep.gemspec

@@ -3,8 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grep"
-  s.version     = "0.1.1"
-  s.authors     = ["Naotoshi SEO"]
+  s.version     = "0.2.0"
+  s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grep"
   s.summary     = "fluentd plugin to grep messages"

data/lib/fluent/plugin/out_grep.rb

@@ -6,6 +6,7 @@ class Fluent::GrepOutput < Fluent::Output
   config_param :exclude, :string, :default => nil
   config_param :tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => 'greped'
+  config_param :remove_tag_prefix, :string, :default => nil
   config_param :replace_invalid_sequence, :bool, :default => false
 
   def configure(conf)
@@ -14,10 +15,25 @@ class Fluent::GrepOutput < Fluent::Output
     @input_key = @input_key.to_s
     @regexp = Regexp.compile(@regexp) if @regexp
     @exclude = Regexp.compile(@exclude) if @exclude
+    @tag_prefix = "#{@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
   end
 
   def emit(tag, es, chain)
-    emit_tag = @tag ? @tag : "#{@add_tag_prefix}.#{tag}"
+    emit_tag = @tag_proc.call(tag)
 
     es.each do |time,record|
       value = record[@input_key]
@@ -33,17 +49,18 @@ class Fluent::GrepOutput < Fluent::Output
 
   private
 
+  def lstrip(string, substring)
+    string.index(substring) == 0 ? string[substring.size..-1] : string
+  end
+
   def match(string)
     begin
       return false if @regexp and !@regexp.match(string)
       return false if @exclude and @exclude.match(string)
     rescue ArgumentError => e
-      unless e.message.index("invalid byte sequence in") == 0
-        raise
-      end
+      raise e unless e.message.index("invalid byte sequence in") == 0
       string = replace_invalid_byte(string)
-      return false if @regexp and !@regexp.match(string)
-      return false if @exclude and @exclude.match(string)
+      retry
     end
     return true
   end

data/spec/out_grep_bench.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+require_relative 'spec_helper'
+
+# setup
+Fluent::Test.setup
+config = %[
+  input_key message
+  grep INFO
+  exlude something
+  remove_tag_prefix foo
+  add_tag_prefix bar
+]
+time = Time.now.to_i
+tag = 'foo.bar'
+driver = Fluent::Test::OutputTestDriver.new(Fluent::GrepOutput, tag).configure(config)
+
+# bench
+require 'benchmark'
+message = "2013/01/13T07:02:11.124202 INFO GET /ping"
+n = 100000
+Benchmark.bm(7) do |x|
+  x.report { driver.run { n.times { driver.emit({'message' => message}, time) } } }
+end
+
+# BEFORE TAG_PROC
+#              user     system      total        real
+#          2.560000   0.030000   2.590000 (  3.169847)
+# AFTER  TAG_PROC
+#              user     system      total        real
+#          2.480000   0.040000   2.520000 (  3.085798)
+

data/spec/out_grep_spec.rb

@@ -115,6 +115,21 @@ describe Fluent::GrepOutput do
       it { emit }
     end
 
+    context 'remove_tag_prefix' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          add_tag_prefix foo
+          remove_tag_prefix syslog
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.host1", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
     context 'replace_invalid_sequence' do
       let(:config) do
         CONFIG + %[
@@ -130,7 +145,7 @@ describe Fluent::GrepOutput do
       before do
         Fluent::Engine.stub(:now).and_return(time)
       end
-      it { expect { emit }.not_to raise_error(ArgumentError) }
+      it { expect { emit }.not_to raise_error }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
-- Naotoshi SEO
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -99,6 +99,7 @@ files:
 - Rakefile
 - fluent-plugin-grep.gemspec
 - lib/fluent/plugin/out_grep.rb
+- spec/out_grep_bench.rb
 - spec/out_grep_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sonots/fluent-plugin-grep
@@ -126,5 +127,6 @@ signing_key:
 specification_version: 4
 summary: fluentd plugin to grep messages
 test_files:
+- spec/out_grep_bench.rb
 - spec/out_grep_spec.rb
 - spec/spec_helper.rb