fluent-plugin-flowcounter-simple 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6068639d44bb2bd1f48f368276c79218b37df9d0
-  data.tar.gz: 676f07aef67aaa0a1be88317bf4f7db75768ce48
+  metadata.gz: ea1531a6eca03db802d05acb32f7ac39cfd29576
+  data.tar.gz: 6db938ffaa1c09dc074816b6491fc8dfa752b9f1
 SHA512:
-  metadata.gz: a276cb04edb29041e5c1b361176c8e12c3c37c8d3f06ee6d5666eb7c8ce7249028481e90777573197a22d5323f68869232bf7fa55ad585806f4611f9cc2ee862
-  data.tar.gz: 05ee368bb3ee9e36a1fe5cd696d51ef1df983f5ba5b26234bb941a49f21ee3a4aa285ede7ae8866e9dead52b14d2926321397b1863887941f8630bf0eadc59d2
+  metadata.gz: 3564af10781be5858eed85223f0657581a7140e729d994fba324bbb0222532d524408a1821182352316657f73f01182254daa62cad3e5de94257ace2b96e7939
+  data.tar.gz: 7b327631a4d0cb1a082d26e0bebb3674549cf4b37184de7057993d942181d1e26d44c6481934d4272235758869383e192d71237cc582e860595535e5e8a0a8ce

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
 gemfile:
   - Gemfile
+  - Gemfile.v0.10

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+## 0.0.4 (2015/04/24)
+
+Enhancements:
+
+* Add filter plugin
+
 ## 0.0.3 (2014/02/04)
 
-Enhancement:
+Enhancements:
 
 * Support `log_level` option of Fleuntd v0.10.43
 

data/Gemfile.v0.10

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.10.0'

data/README.md

@@ -2,14 +2,29 @@
 
 Simple Fluentd Plugin to count number of messages and outputs to log
 
-## Configuration
+## Output Plugin Configuration
 
     <match foo.bar.**>
       type flowcounter_simple
       unit second
-    </source>
+    </match>
 
-This plugin does not emit, just writes into the log file as
+This plugin does not emit, just writes counts into the log file as
+
+    plugin:out_flowcounter_simple  count:30  indicator:num  unit:second
+
+## Filter Plugin Configuration
+
+Fluentd >= v0.12
+
+```apache
+<filter foo.bar.**>
+  type flowcounter_simple
+  unit second
+</filter>
+```
+
+This filter plugin pass through records, and writes counts into the log file as
 
     plugin:out_flowcounter_simple  count:30  indicator:num  unit:second
 

data/Rakefile

@@ -9,3 +9,9 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
+
+desc 'Open an irb session preloaded with the gem library'
+task :console do
+      sh 'irb -rubygems -I lib -r"fluent/load"'
+end
+task :c => :console

data/examples/filter.conf

@@ -0,0 +1,13 @@
+<source>
+  type dummy
+  tag dummy
+</source>
+
+<filter dummy>
+  type flowcounter_simple
+  unit second
+</filter>
+
+<match dummy>
+  type null
+</match>

data/examples/output.conf

@@ -0,0 +1,9 @@
+<source>
+  type dummy
+  tag dummy
+</source>
+
+<match dummy>
+  type flowcounter_simple
+  unit second
+</match>

data/fluent-plugin-flowcounter-simple.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-flowcounter-simple"
-  gem.version     = "0.0.3"
+  gem.version     = "0.0.4"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = ["sonots@gmail.com"]
   gem.summary     = %q{Simple Fluentd Plugin to count number of messages and outputs to log}
@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "test-unit"
+  gem.add_development_dependency "test-unit-rr"
 end

data/lib/fluent/plugin/filter_flowcounter_simple.rb

@@ -0,0 +1,21 @@
+# I'm lazy to to implement filter plugin. Use output plugin instance
+require_relative 'out_flowcounter_simple'
+require 'forwardable'
+
+class Fluent::FlowCounterSimpleFilter < Fluent::Filter
+  Fluent::Plugin.register_filter('flowcounter_simple', self)
+
+  extend Forwardable
+  attr_reader :output
+  def_delegators :@output, :configure, :start, :shutdown, :flush_emit
+
+  def initialize
+    super
+    @output = Fluent::FlowCounterSimpleOutput.new
+  end
+
+  def filter_stream(tag, es)
+    @output.emit(tag, es, Fluent::NullOutputChain.instance)
+    es
+  end
+end if defined?(Fluent::Filter)

data/test/helper.rb

@@ -13,6 +13,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
 require 'fluent/plugin/out_flowcounter_simple'
+require 'fluent/plugin/filter_flowcounter_simple'
 
 class Test::Unit::TestCase
+  def capture_log(log)
+    tmp = log.out
+    log.out = StringIO.new
+    yield
+    return log.out.string
+  ensure
+    log.out = tmp
+  end
 end

data/test/plugin/test_filter_flowcounter_simple.rb

@@ -0,0 +1,49 @@
+require_relative '../helper'
+require "test/unit/rr"
+
+class FlowCounterSimpleFilterTest < Test::Unit::TestCase
+  include Fluent
+
+  def setup
+    Fluent::Test.setup
+    @time = Fluent::Engine.now
+  end
+
+  CONFIG = %[
+    unit second
+  ]
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::FilterTestDriver.new(Fluent::FlowCounterSimpleFilter).configure(conf, true)
+  end
+
+  def test_filter
+    msgs = []
+    10.times do
+      msgs << {'message'=> 'a' * 100}
+      msgs << {'message'=> 'b' * 100}
+    end
+    d = create_driver
+    filtered, out = filter(d, msgs)
+    assert_equal msgs, filtered
+    assert( out.include?("count:20"), out )
+  end
+
+  private
+
+  def filter(d,  msgs)
+    stub(d.instance.output).start
+    stub(d.instance.output).shutdown
+    d.run {
+      msgs.each {|msg|
+        d.filter(msg, @time)
+      }
+    }
+    out = capture_log(d.instance.output.log) do
+      d.instance.flush_emit(0)
+    end
+    filtered = d.filtered_as_array
+    filtered_msgs = filtered.map {|m| m[2] }
+    [filtered_msgs, out]
+  end
+end if defined?(Fluent::Filter)

data/test/plugin/test_out_flowcounter_simple.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 
 class FlowCounterSimpleOutputTest < Test::Unit::TestCase
   def setup
@@ -37,8 +37,8 @@ class FlowCounterSimpleOutputTest < Test::Unit::TestCase
         d1.emit({'message'=> 'c' * 100})
       end
     end
-    log = capture_log { d1.instance.flush_emit(60) }
-    assert( log.include?("count:30"), log )
+    out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }
+    assert( out.include?("count:30"), out )
   end
 
   def test_byte
@@ -50,8 +50,8 @@ class FlowCounterSimpleOutputTest < Test::Unit::TestCase
         d1.emit({'message'=> 'c' * 100})
       end
     end
-    log = capture_log { d1.instance.flush_emit(60) }
-    assert( log.include?("count:3360"), log )
+    out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }
+    assert( out.include?("count:3360"), out )
   end
 
   def test_comment
@@ -63,18 +63,7 @@ class FlowCounterSimpleOutputTest < Test::Unit::TestCase
         d1.emit({'message'=> 'c' * 100})
       end
     end
-    log = capture_log { d1.instance.flush_emit(60) }
-    assert( log.include?("comment:foobar"), log )
-  end
-
-private
-
-  def capture_log
-    tmp = $log.out
-    $log.out = StringIO.new
-    yield
-    return $log.out.string
-  ensure
-    $log.out = tmp
+    out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }
+    assert( out.include?("comment:foobar"), out )
   end
 end

metadata

@@ -1,69 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flowcounter-simple
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2015-04-23 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: 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: test-unit
+  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: test-unit-rr
+  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: Simple Fluentd Plugin to count number of messages and outputs to log
@@ -73,16 +101,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.10
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/filter.conf
+- examples/output.conf
 - fluent-plugin-flowcounter-simple.gemspec
+- lib/fluent/plugin/filter_flowcounter_simple.rb
 - lib/fluent/plugin/out_flowcounter_simple.rb
 - test/helper.rb
+- test/plugin/test_filter_flowcounter_simple.rb
 - test/plugin/test_out_flowcounter_simple.rb
 homepage: https://github.com/sonots/fluent-plugin-flowcounter-simple
 licenses:
@@ -94,20 +127,21 @@ 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: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Fluentd Plugin to count number of messages and outputs to log
 test_files:
 - test/helper.rb
+- test/plugin/test_filter_flowcounter_simple.rb
 - test/plugin/test_out_flowcounter_simple.rb