fluent-plugin-flowcounter 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3639330b2bfa7435b5a737363733c630d12a8d6c
-  data.tar.gz: f32013615c744fa27fcd6e2014ef055753c99ec9
+  metadata.gz: 9a2c1125317b984edda98fd4811d0263028ceead
+  data.tar.gz: 3d60b7b9e9358570806138fa7e317a0a24a06272
 SHA512:
-  metadata.gz: 4c9b9cbde88a539fac3d12dcc6983f33061b1e9c1e39f36cef2ac8e109726b683a9b343ff2123619f2d72a273741b205547f8025349be80270438b34254e6911
-  data.tar.gz: 526a506b799a7167e88543281fe2f5c5547614b09018a0c8b8ef2a45281a315a5093fdf8e55be231db5a16aaa06f1a158a215d64beb2891d3d5638a5d3cfab99
+  metadata.gz: ab1a0ddf3e18281456030574881e57fc0464fc9f83091f21462e16e9bfaa01859a90f1cdbe725d03f46184c2ed4ba0df3ee38ad58249fbba6f6ca12dda36c717
+  data.tar.gz: 084cb3293584dd6278bb936a9a163db4080027da94c8b6d3512e6f17a0cdbe750ee5525ac2ddb963f8f15f1f3c656baa43d30b7efa539c4d916df3a80111b779

data/README.md

@@ -1,11 +1,11 @@
 # fluent-plugin-flowcounter
 
-Count metricses below about matches.
+Count metrics below about matches. This is a plugin for [Fluentd](http://fluentd.org)
 
-* Messages per minute/hour/day
-* Bytes per minute/hour/day
-* Messages per second (average every minute/hour/day)
-* Bytes per second (average every minute/hour/day)
+* Messages per second/minute/hour/day
+* Bytes per second/minute/hour/day
+* Messages per second (average every second/minute/hour/day)
+* Bytes per second (average every second/minute/hour/day)
 
 FlowCounterOutput emits messages contains results data, so you can output these message (with 'flowcount' tag by default) to any outputs you want.
 

data/fluent-plugin-flowcounter.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-flowcounter"
-  gem.version     = "0.1.9"
+  gem.version     = "0.2.0"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = ["tagomoris@gmail.com"]
   gem.summary     = %q{Fluent plugin to count message flow}

data/lib/fluent/plugin/out_flowcounter.rb

@@ -3,6 +3,11 @@ require 'fluent/mixin/config_placeholders'
 class Fluent::FlowCounterOutput < Fluent::Output
   Fluent::Plugin.register_output('flowcounter', self)
 
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   config_param :unit, :string, :default => 'minute'
   config_param :aggregate, :string, :default => 'tag'
   config_param :output_style, :string, :default => 'joined'
@@ -15,16 +20,26 @@ class Fluent::FlowCounterOutput < Fluent::Output
   attr_accessor :counts
   attr_accessor :last_checked
   attr_accessor :count_all
+  attr_reader :tick
 
   def configure(conf)
     super
 
     @unit = case @unit
+            when 'second' then :second
             when 'minute' then :minute
             when 'hour' then :hour
             when 'day' then :day
             else
-              raise Fluent::ConfigError, "flowcounter unit allows minute/hour/day"
+              raise Fluent::ConfigError, "flowcounter unit allows second/minute/hour/day"
+            end
+    @tick = case @unit
+            when :second then 1
+            when :minute then 60
+            when :hour then 3600
+            when :day then 86400
+            else
+              raise Fluent::ConfigError, "flowcounter unit allows second/minute/hour/day"
             end
     @aggregate = case @aggregate
                  when 'tag' then :tag
@@ -132,16 +147,9 @@ class Fluent::FlowCounterOutput < Fluent::Output
   def watch
     # instance variable, and public accessable, for test
     @last_checked = Fluent::Engine.now
-    tick = case @unit
-           when :minute then 60
-           when :hour then 3600
-           when :day then 86400
-           else
-             raise RuntimeError, "@unit must be one of minute/hour/day"
-           end
     while true
       sleep 0.5
-      if Fluent::Engine.now - @last_checked >= tick
+      if Fluent::Engine.now - @last_checked >= @tick
         now = Fluent::Engine.now
         flush_emit(now - @last_checked)
         @last_checked = now

data/test/plugin/test_out_flowcounter.rb

@@ -31,6 +31,7 @@ count_keys message
       count_keys message
     ]
     assert_equal :minute, d.instance.unit
+    assert_equal 60, d.instance.tick
     assert_equal :tag, d.instance.aggregate
     assert_equal :joined, d.instance.output_style
     assert_equal 'flowcount', d.instance.tag
@@ -41,17 +42,31 @@ count_keys message
       count_keys field1,field2
     ]
     assert_equal :minute, d.instance.unit
+    assert_equal 60, d.instance.tick
     assert_equal :tag, d.instance.aggregate
     assert_equal :joined, d.instance.output_style
     assert_equal 'flowcount', d.instance.tag
     assert_nil d.instance.input_tag_remove_prefix
     assert_equal ['field1', 'field2'], d.instance.count_keys
 
+    d = create_driver %[
+      unit second
+      count_keys message
+    ]
+    assert_equal :second, d.instance.unit
+    assert_equal 1, d.instance.tick
+    assert_equal :tag, d.instance.aggregate
+    assert_equal :joined, d.instance.output_style
+    assert_equal 'flowcount', d.instance.tag
+    assert_nil d.instance.input_tag_remove_prefix
+    assert_equal ['message'], d.instance.count_keys
+
     d = create_driver %[
       unit hour
       count_keys message
     ]
     assert_equal :hour, d.instance.unit
+    assert_equal 3600, d.instance.tick
     assert_equal :tag, d.instance.aggregate
     assert_equal :joined, d.instance.output_style
     assert_equal 'flowcount', d.instance.tag
@@ -63,6 +78,7 @@ count_keys message
       count_keys message
     ]
     assert_equal :minute, d.instance.unit
+    assert_equal 60, d.instance.tick
     assert_equal :tag, d.instance.aggregate
     assert_equal :tagged, d.instance.output_style
     assert_equal 'flowcount', d.instance.tag
@@ -77,6 +93,7 @@ count_keys message
       count_keys message
     ]
     assert_equal :day, d.instance.unit
+    assert_equal 86400, d.instance.tick
     assert_equal :all, d.instance.aggregate
     assert_equal :joined, d.instance.output_style
     assert_equal 'test.flowcount', d.instance.tag
@@ -91,6 +108,7 @@ count_keys message
       count_keys *
     ]
     assert_equal :day, d.instance.unit
+    assert_equal 86400, d.instance.tick
     assert_equal :all, d.instance.aggregate
     assert_equal :joined, d.instance.output_style
     assert_equal 'test.flowcount', d.instance.tag

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flowcounter
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !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: 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: fluent-mixin-config-placeholders
   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'
 description: Plugin to counts messages/bytes that matches, per minutes/hours/days
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - LICENSE.txt
@@ -81,21 +81,20 @@ 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: Fluent plugin to count message flow
 test_files:
 - test/helper.rb
 - test/plugin/test_out_flowcounter.rb
-has_rdoc: