fluentd 0.10.15 → 0.10.16

data/ChangeLog

@@ -1,4 +1,11 @@
 
+Release 0.10.16 - 2012/03/26
+
+* Added in_gc plugin
+* Added in_object_space plugin
+* Changed dependency yajl-ruby from '~> 1.0.0' to '~> 1.0'
+
+
 Release 0.10.15 - 2012/03/09
 
 * Added experimental in_status plugin

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gemspec.require_paths = ["lib"]
     gemspec.add_dependency "msgpack", "~> 0.4.4"
     gemspec.add_dependency "json", ">= 1.4.3"
-    gemspec.add_dependency "yajl-ruby", "~> 1.0.0"
+    gemspec.add_dependency "yajl-ruby", "~> 1.0"
     gemspec.add_dependency "cool.io", "~> 1.1.0"
     gemspec.add_dependency "http_parser.rb", "~> 0.5.1"
     gemspec.add_development_dependency "rake", ">= 0.9.2"

data/VERSION

@@ -1 +1 @@
-0.10.15
+0.10.16

data/fluentd.gemspec

@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<msgpack>, ["~> 0.4.4"])
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
-      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0"])
       s.add_runtime_dependency(%q<cool.io>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
       s.add_development_dependency(%q<rake>, [">= 0.9.2"])
@@ -128,7 +128,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 1.0.0"])
       s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
       s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+      s.add_dependency(%q<yajl-ruby>, ["~> 1.0"])
       s.add_dependency(%q<cool.io>, ["~> 1.1.0"])
       s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
       s.add_dependency(%q<rake>, [">= 0.9.2"])
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 1.0.0"])
     s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
     s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
+    s.add_dependency(%q<yajl-ruby>, ["~> 1.0"])
     s.add_dependency(%q<cool.io>, ["~> 1.1.0"])
     s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
     s.add_dependency(%q<rake>, [">= 0.9.2"])

data/lib/fluent/plugin/in_gc_stat.rb

@@ -0,0 +1,78 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent
+
+
+class GCStatInput < Input
+  Plugin.register_input('gc_stat', self)
+
+  def initialize
+    super
+  end
+
+  config_param :emit_interval, :time, :default => 60
+  config_param :tag, :string
+
+  class TimerWatcher < Coolio::TimerWatcher
+    def initialize(interval, repeat, &callback)
+      @callback = callback
+      super(interval, repeat)
+    end
+
+    def on_timer
+      @callback.call
+    rescue
+      # TODO log?
+      $log.error $!.to_s
+      $log.error_backtrace
+    end
+  end
+
+  def configure(conf)
+    super
+  end
+
+  def start
+    @loop = Coolio::Loop.new
+    @timer = TimerWatcher.new(@emit_interval, true, &method(:on_timer))
+    @loop.attach(@timer)
+    @thread = Thread.new(&method(:run))
+  end
+
+  def shutdown
+    @loop.watchers.each {|w| w.detach }
+    @loop.stop
+    @thread.join
+  end
+
+  def run
+    @loop.run
+  rescue
+    $log.error "unexpected error", :error=>$!.to_s
+    $log.error_backtrace
+  end
+
+  def on_timer
+    now = Engine.now
+    record = GC.stat
+    Engine.emit(@tag, now, record)
+  end
+end
+
+
+end

data/lib/fluent/plugin/in_object_space.rb

@@ -0,0 +1,118 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent
+
+
+class ObjectSpaceInput < Input
+  Plugin.register_input('object_space', self)
+
+  def initialize
+    super
+  end
+
+  config_param :emit_interval, :time, :default => 60
+  config_param :tag, :string
+  config_param :top, :integer, :default => 15
+
+  class TimerWatcher < Coolio::TimerWatcher
+    def initialize(interval, repeat, &callback)
+      @callback = callback
+      super(interval, repeat)
+    end
+
+    def on_timer
+      @callback.call
+    rescue
+      # TODO log?
+      $log.error $!.to_s
+      $log.error_backtrace
+    end
+  end
+
+  def configure(conf)
+    super
+  end
+
+  def start
+    @loop = Coolio::Loop.new
+    @timer = TimerWatcher.new(@emit_interval, true, &method(:on_timer))
+    @loop.attach(@timer)
+    @thread = Thread.new(&method(:run))
+  end
+
+  def shutdown
+    @loop.watchers.each {|w| w.detach }
+    @loop.stop
+    @thread.join
+  end
+
+  def run
+    @loop.run
+  rescue
+    $log.error "unexpected error", :error=>$!.to_s
+    $log.error_backtrace
+  end
+
+  class Counter
+    def initialize(klass, init_count)
+      @klass = klass
+      @count = init_count
+    end
+
+    def incr!
+      @count += 1
+    end
+
+    def name
+      @klass.name
+    end
+
+    attr_reader :count
+  end
+
+  def on_timer
+    now = Engine.now
+
+    array = []
+    map = {}
+
+    ObjectSpace.each_object {|obj|
+      klass = obj.class
+      if c = map[klass]
+        c.incr!
+      else
+        c = Counter.new(klass, 1)
+        array << c
+        map[klass] = c
+      end
+    }
+
+    array.sort_by! {|c| -c.count }
+
+    record = {}
+    array.each_with_index {|c,i|
+      break if i >= @top
+      record[c.name] = c.count
+    }
+
+    Engine.emit(@tag, now, record)
+  end
+end
+
+
+end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.15'
+VERSION = '0.10.16'
 
 end

data/test/plugin/in_object_space.rb

@@ -0,0 +1,41 @@
+require 'fluent/test'
+
+class ObjectSpaceInputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    emit_interval 1
+    tag t1
+    top 2
+  ]
+
+  def create_driver(conf=CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::ObjectSpaceInput).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+    assert_equal 1, d.instance.emit_interval
+    assert_equal "t1", d.instance.tag
+    assert_equal 2, d.instance.top
+  end
+
+  def test_emit
+    d = create_driver
+
+    time = Time.parse("2011-01-02 13:14:15").to_i
+
+    d.run do
+      sleep 2
+    end
+
+    emits = d.emits
+    assert_equal true, emits.length > 0
+
+    tag, time, record = emits[0]
+    assert_equal 2, record.size
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.15
+  version: 0.10.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70355087964700 !ruby/object:Gem::Requirement
+  requirement: &70356207478320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70355087964700
+  version_requirements: *70356207478320
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70355087961840 !ruby/object:Gem::Requirement
+  requirement: &70356207476840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70355087961840
+  version_requirements: *70356207476840
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70355087958040 !ruby/object:Gem::Requirement
+  requirement: &70356207475080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355087958040
+  version_requirements: *70356207475080
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &70355087953920 !ruby/object:Gem::Requirement
+  requirement: &70356207473980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70355087953920
+  version_requirements: *70356207473980
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70355087948700 !ruby/object:Gem::Requirement
+  requirement: &70356207466200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355087948700
+  version_requirements: *70356207466200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355087947960 !ruby/object:Gem::Requirement
+  requirement: &70356207981360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70355087947960
+  version_requirements: *70356207981360
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70355087946840 !ruby/object:Gem::Requirement
+  requirement: &70356211841320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70355087946840
+  version_requirements: *70356211841320
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70355087946240 !ruby/object:Gem::Requirement
+  requirement: &70356212310240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70355087946240
+  version_requirements: *70356212310240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70355087945380 !ruby/object:Gem::Requirement
+  requirement: &70356224203900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70355087945380
+  version_requirements: *70356224203900
 description: 
 email: frsyuki@gmail.com
 executables:
@@ -151,7 +151,9 @@ files:
 - lib/fluent/plugin/buf_zfile.rb
 - lib/fluent/plugin/in_exec.rb
 - lib/fluent/plugin/in_forward.rb
+- lib/fluent/plugin/in_gc_stat.rb
 - lib/fluent/plugin/in_http.rb
+- lib/fluent/plugin/in_object_space.rb
 - lib/fluent/plugin/in_status.rb
 - lib/fluent/plugin/in_stream.rb
 - lib/fluent/plugin/in_syslog.rb
@@ -181,6 +183,7 @@ files:
 - test/plugin/in_exec.rb
 - test/plugin/in_forward.rb
 - test/plugin/in_http.rb
+- test/plugin/in_object_space.rb
 - test/plugin/in_stream.rb
 - test/plugin/out_copy.rb
 - test/plugin/out_exec.rb
@@ -224,6 +227,7 @@ test_files:
 - test/plugin/in_exec.rb
 - test/plugin/in_forward.rb
 - test/plugin/in_http.rb
+- test/plugin/in_object_space.rb
 - test/plugin/in_stream.rb
 - test/plugin/out_copy.rb
 - test/plugin/out_exec.rb