fluent-plugin-elapsed-time 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b4411b3f7e6a8ed0dea0d37972d8df8cb2a295
-  data.tar.gz: 7f5453e0b6170779a246def7c9dec3f62c124eae
+  metadata.gz: 54e022a4e92b2c000e6d9384593349387312799e
+  data.tar.gz: 9de570e3b5f04b862d62765830f91e062b8bd975
 SHA512:
-  metadata.gz: e966c603341c1737cc66c20aebea264d2d70d3695e7c92ff3d246b9f3538ff7cfb8101eface9eb8dd2adbdb92446db052150ad80601239050bd4963883343b7a
-  data.tar.gz: c4b491e6f0c50878618074be99b4c187cc79608766a9f23857f4e3194cf9f5a22897b14198a7994ac65ff1a6e9de86933a9ba421609c230a1f692a078eda4d19
+  metadata.gz: 13b7bc08bd9c9194602d27a39b36e0d95f2653dd21ea12123381f903bdefc1563964c0f0bc21e0f05fb834cfc9742e931dc2f15c81bf61928509a0ecb3efd667
+  data.tar.gz: a1a4e2e466396d87f2a481972e721f7c226338a195e85cbd0198fea317bd11c6b596950e7ca2b78e14c5a76b05b5b779b259baf95e3bb74e64ace5c0ca029c56

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.*
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.6 (2014/09/22)
+
+Changes:
+
+* Change fluentd dependency from '~>' to '>='
+
 ## 0.0.5 (2014/02/04)
 
 Enhancement:

data/README.md

@@ -10,13 +10,43 @@ Use RubyGems:
 
     gem install fluent-plugin-elapsed-time
 
+## Illustration
+
+This illustration draws how fluent-plugin-elapsed-time measures elapsed times.
+
+```
+     +–––––––––––––+    +––––––––––––––+   +––––––––––––––+   +–––––––––––––––+
+     |   Input     |    |  ElapsedTime |   |   Output     |   |   Output      |
+     +––––––+––––––+    +––––––+–––––––+   +––––––+–––––––+   +–––––––+–––––––+
+#on_message |                  |                  |                   |
+            +––––––––––––––––––>                  |                   |
+            |      #emit       | start = Time.now |                   |
+            |                  +––––––––––––––––––>                   |
+            |                  |      #emit       +–––––––––––––––––––>        
+            |                  |                  |     #emit         |        
+            |                  |                  <– – – – –  – – – – +        
+            |                  <– – – – – – – – – +                   |
+            |                  | elapsed = Time.now - start           |
+            <– – – – – - – – – +                  |                   |
+            |                  |                  |                   |
+            +                  +                  +                   +
+```
+
 ## Configuration
 
 Example:
 
-Following example measures the max and average time taken to process [fluent-plugin-grep](https://github.com/sonots/fluent-plugin-grep) => [fluent-plugin-parser](https://github.com/tagomoris/fluent-plugin-parser) => out_stdout chain in messages. Please notice that this plugin measures the total processing time until match chain finishes.
+Following example measures the max and average time taken to process [fluent-plugin-grep](https://github.com/sonots/fluent-plugin-grep) => out_stdout chain in messages. Please notice that this plugin measures the total processing time until match chain finishes.
 
 ```apache
+<match greped.**>
+  type stdout
+</match>
+
+<match elapsed>
+  type stdout
+</match>
+
 <match **>
   type elapsed_time
   tag elapsed
@@ -28,22 +58,6 @@ Following example measures the max and average time taken to process [fluent-plu
     add_tag_prefix greped
   </store>
 </match>
-
-<match greped.**>
-  type parse
-  format ltsv
-  key_name message
-  remove_prefix greped
-  add_prefix parsed
-</match>
-
-<match parsed.**>
-  type stdout
-</match>
-
-<match elapsed>
-  type stdout
-</match>
 ```
 
 Output will be like
@@ -101,6 +115,14 @@ where `max` and `avg` are the maximum and average elapsed times, and `num` is th
         # after @interval later
         elapsed: {"max":0,"avg":0,"num"=>0}
 
+## Relatives
+
+* [fluent-plugin-measure_time](https://github.com/sonots/fluent-plugin-measure_time)
+
+  * This plugin make possible to measure the elapsed time of not only output plugins but also input plugins.
+  * Also, this plugin has a flexibility to measure arbitrary methods of plugins. 
+  * But, this does not have flexibility of output messages such as `add_tag_prefix`, `aggregate` options because of its limitaion of internal mechanism.
+
 ## ChangeLog
 
 See [CHANGELOG.md](CHANGELOG.md) for details.

data/fluent-plugin-elapsed-time.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-elapsed-time"
-  gem.version     = "0.0.5"
+  gem.version     = "0.0.6"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-elapsed-time"
@@ -17,9 +17,10 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "fluentd", "~> 0.10.17"
+  gem.add_dependency "fluentd", ">= 0.10.17"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec-its"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
 end

data/lib/fluent/plugin/out_elapsed_time.rb

@@ -63,57 +63,41 @@ module Fluent
         raise ConfigError, "out_elapsed_time: aggregate allows `tag` or `all`"
       end
 
-      @tag_slice_proc =
-        if @remove_tag_slice
-          lindex, rindex = @remove_tag_slice.split('..', 2)
-          if lindex.nil? or rindex.nil? or lindex !~ /^-?\d+$/ or rindex !~ /^-?\d+$/
-            raise Fluent::ConfigError, "out_elapsed_time: remove_tag_slice must be formatted like [num]..[num]"
-          end
-          l, r = lindex.to_i, rindex.to_i
-          Proc.new {|tag| (tags = tag.split('.')[l..r]).nil? ? "" : tags.join('.') }
-        else
-          Proc.new {|tag| tag }
-        end
-
-      @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
-      @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
-      @tag_proc =
-        if @tag_prefix and @tag_prefix_match
-          Proc.new {|tag| "#{@tag_prefix}#{lstrip(@tag_slice_proc.call(tag), @tag_prefix_match)}" }
-        elsif @tag_prefix_match
-          Proc.new {|tag| lstrip(@tag_slice_proc.call(tag), @tag_prefix_match) }
-        elsif @tag_prefix
-          Proc.new {|tag| "#{@tag_prefix}#{@tag_slice_proc.call(tag)}" }
-        elsif @tag
-          Proc.new {|tag| @tag }
-        else
-          Proc.new {|tag| @tag_slice_proc.call(tag) }
-        end
+      @tag_proc = tag_proc
 
       @emit_proc =
         if @each == :message
-          chain = NullOutputChain.instance
-          Proc.new {|tag, es|
-            start = Time.now
-            es.each do |time, record|
-              @outputs.each {|output| output.emit(tag, OneEventStream.new(time, record), chain) }
-              finish = Time.now
-              emit_tag = @tag_proc.call(tag)
-              elapsed(emit_tag) << (finish - start).to_f
-              start = finish
-            end
-          }
+          self.method(:emit_message)
         else
-          chain = NullOutputChain.instance
-          Proc.new {|tag, es|
-            t = Time.now
-            @outputs.each {|output| output.emit(tag, es, chain) }
-            emit_tag = @tag_proc.call(tag)
-            elapsed(emit_tag) << (Time.now - t).to_f
-          }
+          self.method(:emit_es)
         end
     end
 
+    def emit(tag, es, chain)
+      @emit_proc.call(tag, es)
+      chain.next
+    end
+
+    def emit_message(tag, es)
+      chain = NullOutputChain.instance
+      start = Time.now
+      es.each do |time, record|
+        @outputs.each {|output| output.emit(tag, OneEventStream.new(time, record), chain) }
+        finish = Time.now
+        emit_tag = @tag_proc.call(tag)
+        elapsed(emit_tag) << (finish - start).to_f
+        start = finish
+      end
+    end
+
+    def emit_es(tag, es)
+      chain = NullOutputChain.instance
+      t = Time.now
+      @outputs.each {|output| output.emit(tag, es, chain) }
+      emit_tag = @tag_proc.call(tag)
+      elapsed(emit_tag) << (Time.now - t).to_f
+    end
+
     def initial_elapsed(prev_elapsed = nil)
       return {} if !@zero_emit or prev_elapsed.nil?
       elapsed = {}
@@ -162,13 +146,39 @@ module Fluent
       messages.each {|tag, message| Engine.emit(tag, Engine.now, message) }
     end
 
-    def emit(tag, es, chain)
-      @emit_proc.call(tag, es)
-      chain.next
-    end
+    private
+
+    def tag_proc
+      tag_slice_proc =
+        if @remove_tag_slice
+          lindex, rindex = @remove_tag_slice.split('..', 2)
+          if lindex.nil? or rindex.nil? or lindex !~ /^-?\d+$/ or rindex !~ /^-?\d+$/
+            raise Fluent::ConfigError, "out_elapsed_time: remove_tag_slice must be formatted like [num]..[num]"
+          end
+          l, r = lindex.to_i, rindex.to_i
+          Proc.new {|tag| (tags = tag.split('.')[l..r]).nil? ? "" : tags.join('.') }
+        else
+          Proc.new {|tag| tag }
+        end
 
-    def lstrip(string, substring)
-      string.index(substring) == 0 ? string[substring.size..-1] : string
+      rstrip = Proc.new {|str, substr| str.chomp(substr) }
+      lstrip = Proc.new {|str, substr| str.start_with?(substr) ? str[substr.size..-1] : str }
+      tag_prefix = "#{rstrip.call(@add_tag_prefix, '.')}." if @add_tag_prefix
+      tag_suffix = ".#{lstrip.call(@add_tag_suffix, '.')}" if @add_tag_suffix
+      tag_prefix_match = "#{rstrip.call(@remove_tag_prefix, '.')}." if @remove_tag_prefix
+      tag_suffix_match = ".#{lstrip.call(@remove_tag_suffix, '.')}" if @remove_tag_suffix
+      tag_fixed = @tag if @tag
+      if tag_prefix_match and tag_suffix_match
+        Proc.new {|tag| "#{tag_prefix}#{rstrip.call(lstrip.call(tag_slice_proc.call(tag), tag_prefix_match), tag_suffix_match)}#{tag_suffix}" }
+      elsif tag_prefix_match
+        Proc.new {|tag| "#{tag_prefix}#{lstrip.call(tag_slice_proc.call(tag), tag_prefix_match)}#{tag_suffix}" }
+      elsif tag_suffix_match
+        Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag_slice_proc.call(tag), tag_suffix_match)}#{tag_suffix}" }
+      elsif tag_prefix || @remove_tag_slice || tag_suffix
+        Proc.new {|tag| "#{tag_prefix}#{tag_slice_proc.call(tag)}#{tag_suffix}" }
+      else
+        Proc.new {|tag| tag_fixed }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ Bundler.require(:default, :test)
 
 require 'fluent/test'
 require 'rspec'
+require 'rspec/its'
 require 'pry'
 
 $TESTING=true

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elapsed-time
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.17
 - !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: rspec
   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: rspec-its
+  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'
 description: Fluentd plugin to measure elapsed time to process messages
@@ -86,9 +100,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -108,17 +122,17 @@ 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: Fluentd plugin to measure elapsed time to process messages