fluent-plugin-measure_time 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193e1f487b71b8b3e05144ada9ef36651b95d230
-  data.tar.gz: d0a5363194ca0c40b26d242dff97d703e7850c11
+  metadata.gz: f2f3162b94cdaf1e70abdef53ae1cdca1b60f3c8
+  data.tar.gz: 41debb162108e360783ea14bbb9296a79b3eaf91
 SHA512:
-  metadata.gz: c76cda2d36d046e9496509fe3f139394660b1e2791294489bcfbb1c78706af03830886e972f081ef6c07a77512d059a12b7a405ddfd64e49c35f93eeb204b038
-  data.tar.gz: cbdd31735b323db8d30d5292b66cf939131f491b07968312f00691684859310722d497c3cc20ae55c87fc3012414e2c672db4e1d4eb70b1d1ec4650bf49a2d1c
+  metadata.gz: 116da97ef9fb6cea05e203ca22f58cad55e3317e52a3ee0c22b5a410a3e381f62338a889084f7844e0b41add505297e3a00e3a2c3b3d1f8c54db476c4e88a860
+  data.tar.gz: 29c5f059fe191a338bc05069aaa3e8d9b4503e59c72a5e6ee8cba1554df96bfd6ad99e7eef315e00852cc64aa26151252abf307466701b04bad4fb2b6f79d5e3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.1  (2014/04/12)
+
+Fixes:
+
+* Fix emit messages
+
 ## 0.1.0  (2014/04/12)
 
 First release
+

data/README.md

@@ -15,7 +15,7 @@ Use RubyGems:
 
 This plugin is doing something tricky, which extends arbitrary plugins so that it can use `<measure_time></measure_time>` directive to measure elapsed times. 
 
-Example:
+**Example 1:**
 
 ```apache
 <source>
@@ -45,7 +45,7 @@ measure_time: {"time":0.000849735,"class":"Fluent::ForwardInput","hook":"on_mess
 
 where `time` denotes the measured elapsed time, and `class`, `hook`, and `object_id` denotes the hooked class, the hooked method, and the object id of the plugin instance. 
 
-Example: interval
+**Example 2: interval**
 
 With `interval` option, this plugin compute statistics of measured elapsed times in each interval
 

data/fluent-plugin-measure_time.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-measure_time"
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-measure_time"

data/lib/fluent/plugin/in_measure_time.rb

@@ -44,7 +44,7 @@ module Fluent
       unless @hook = conf['hook']
         raise Fluent::ConfigError, '`hook` option must be specified in <measure_time></measure_time> directive'
       end
-      @hook_msg = {"class" => @klass, "hook" => @hook, "object_id" => @plugin.object_id}
+      @hook_msg = {:class => @klass.to_s, :hook => @hook.to_s, :object_id => @plugin.object_id.to_s}
       @interval = conf['interval'].to_i if conf['interval']
       @add_or_emit_proc =
         if @interval
@@ -55,7 +55,7 @@ module Fluent
         else
           # emit information immediately
           Proc.new {|elapsed|
-            msg = {"time" => elapsed}.merge(@hook_msg)
+            msg = {:time => elapsed}.merge(@hook_msg)
             ::Fluent::Engine.emit(@tag, ::Fluent::Engine.now, msg)
           }
         end

data/spec/in_measure_time_spec.rb

@@ -19,6 +19,7 @@ describe "extends Fluent::ForwardInput" do
   before { Fluent::Test.setup }
 
   def create_driver(conf=CONFIG)
+    Fluent::MeasureTimeInput.new.configure("")
     Fluent::Test::InputTestDriver.new(Fluent::ForwardInput).configure(conf)
   end
 
@@ -52,13 +53,13 @@ describe "extends Fluent::ForwardInput" do
 
   describe 'test configure' do
     let(:config) {CONFIG + %[
-      <measure>
+      <measure_time>
         tag test
         interval 10
         hook on_message
-      </measure>
+      </measure_time>
     ]}
-    let(:subject) { driver.instance.measure }
+    let(:subject) { driver.instance.measure_time }
     its(:tag) { should == 'test' }
     its(:interval) { should == 10 }
     its(:hook) { should == 'on_message' }
@@ -66,19 +67,18 @@ describe "extends Fluent::ForwardInput" do
 
   describe 'test emit' do
     let(:config) {CONFIG + %[
-      <measure>
-        tag measure
+      <measure_time>
+        tag measure_time
         interval 1
-        # hook Fluent::ForwardInput::Handler.on_read # not support inner class yet
-        hook Fluent::ForwardInput.on_message
-      </measure>
+        hook on_message
+      </measure_time>
     ]}
     it 'should flush' do
       d = driver.instance
       d.__send__(:on_message, ['tag1', 0, {'a'=>1}].to_msgpack)
-      triple = d.measure.flush(0)
-      triple[0].should == 'measure'
-      triple[2].keys.should =~ [:num, :max, :avg]
+      triple = d.measure_time.flush(0)
+      triple[0].should == 'measure_time'
+      triple[2].keys.should =~ [:num, :max, :avg, :class, :hook, :object_id]
     end
   end
 end
@@ -97,13 +97,13 @@ describe "extends Fluent::StdoutOutput" do
 
   describe 'test configure' do
     let(:config) {CONFIG + %[
-      <measure>
+      <measure_time>
         tag test
         interval 10
         hook emit
-      </measure>
+      </measure_time>
     ]}
-    let(:subject) { driver.instance.instance_variable_get(:@measure) }
+    let(:subject) { driver.instance.measure_time }
     its(:tag) { should == 'test' }
     its(:interval) { should == 10 }
     its(:hook) { should == 'emit' }
@@ -111,18 +111,34 @@ describe "extends Fluent::StdoutOutput" do
 
   describe 'test emit' do
     let(:config) {CONFIG + %[
-      <measure>
-        tag measure
+      <measure_time>
+        tag measure_time
+        hook emit
+      </measure_time>
+    ]}
+    it 'should flush' do
+      time = Fluent::Engine.now
+      Fluent::Engine.stub(:now).and_return(time)
+      Fluent::Engine.should_receive(:emit) # .with("measure_time", time, {})
+      d = driver.instance
+      d.emit('tag1', Fluent::OneEventStream.new(0, {'a'=>1}), Fluent::NullOutputChain.instance)
+    end
+  end
+
+  describe 'test interval' do
+    let(:config) {CONFIG + %[
+      <measure_time>
+        tag measure_time
         interval 1
         hook emit
-      </measure>
+      </measure_time>
     ]}
     it 'should flush' do
       d = driver.instance
       d.emit('tag1', Fluent::OneEventStream.new(0, {'a'=>1}), Fluent::NullOutputChain.instance)
-      triple = d.measure.flush(0)
-      triple[0].should == 'measure'
-      triple[2].keys.should =~ [:num, :max, :avg]
+      triple = d.measure_time.flush(0)
+      triple[0].should == 'measure_time'
+      triple[2].keys.should =~ [:num, :max, :avg, :class, :hook, :object_id]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-measure_time
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi Seo