fluent-plugin-flowcounter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4106b69e6d5a5c4e44996ab86bf6bf3220bc11b
-  data.tar.gz: fbe0fa0f5c544e265b37e3023a24e0bd66d0ae1f
+  metadata.gz: 373e8131d63b116d0e7bb4364fd93a19356bb141
+  data.tar.gz: 2000acaab8a219b70da435c4f77469155cbdd300
 SHA512:
-  metadata.gz: d4b7e9a9543eb01212b56b413569fb210bcaa6ea5bc53c2f8aa02371a5c80bc0612e618280c063df6c8be39365f24217e6bded2c793004ce70ea982f84225d0b
-  data.tar.gz: 39aa071b23d739acdccea9768036e03953d569fa4493a7a216b89228d65484843df0d5d73ee409458d0b1ad53389995f97d41917b8dcfa61daf705f13cf8f01c
+  metadata.gz: 715cd4f1dfeb133f64f334608df853f8efc2cf0debd31a87f63642dd0b82cf4c774126935e821a345bce8f348e8aea71a56409646b93c35f6cf51edb72df4a8a
+  data.tar.gz: 96e775ec5a88dc718a21676fe630236b50b7eba183a3bfeac47a0e66883292dd3b29b9ca16a261673eaf14340db56fd5ec48aa1f36341e1f3851568b8d0c5339

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2

data/README.md

@@ -54,7 +54,7 @@ Counts from field 'message', per hour, aggregates all tags, output with tag 'flu
       </store>
     </match>
     
-    <match flowcount>
+    <match fluentd.traffic>
       # output configurations where to send count results
     </match>
 

data/fluent-plugin-flowcounter.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-flowcounter"
-  gem.version     = "0.3.1"
+  gem.version     = "0.3.2"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = ["tagomoris@gmail.com"]
   gem.summary     = %q{Fluent plugin to count message flow}
   gem.description = %q{Plugin to counts messages/bytes that matches, per minutes/hours/days}
   gem.homepage    = "https://github.com/tagomoris/fluent-plugin-flowcounter"
-  gem.license     = "APLv2"
+  gem.license     = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
   gem.add_runtime_dependency "fluentd"
   gem.add_runtime_dependency "fluent-mixin-config-placeholders", ">= 0.3.0"
 end

data/lib/fluent/plugin/out_flowcounter.rb

@@ -163,6 +163,8 @@ class Fluent::FlowCounterOutput < Fluent::Output
     end
   end
 
+  FOR_MISSING = ''
+
   def emit(tag, es, chain)
     name = tag
     if @input_tag_remove_prefix and
@@ -178,7 +180,7 @@ class Fluent::FlowCounterOutput < Fluent::Output
     else
       es.each {|time,record|
         c += 1
-        b += @count_keys.inject(0){|s,k| s + record[k].bytesize}
+        b += @count_keys.inject(0){|s,k| s + (record[k] || FOR_MISSING).bytesize}
       }
     end
     countup(name, c, b)

data/test/plugin/test_out_flowcounter.rb

@@ -303,4 +303,31 @@ count_keys message
     assert_equal 1.0, r1[0]['count_rate']
     assert_equal 15.0, r1[0]['bytes_rate']
   end
+
+  def test_emit_records_without_specified_field
+    d3 = create_driver( %[
+      unit minute
+      aggregate all
+      tag  flowcount
+      input_tag_remove_prefix test
+      count_keys f4
+    ], 'test.tag4')
+    time = Time.now.to_i
+    d3.run do
+      60.times do
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+      end
+    end
+    d3.instance.flush_emit(60)
+    emits = d3.emits
+    assert_equal 1, emits.length
+    data = emits[0]
+    assert_equal 'flowcount', data[0]
+    assert_equal 60*5, data[2]['count']
+    assert_equal 0, data[2]['bytes']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flowcounter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !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: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,7 @@ files:
 - test/plugin/test_out_flowcounter.rb
 homepage: https://github.com/tagomoris/fluent-plugin-flowcounter
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []