fluent-plugin-mackerel 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTNiZDMwMGM1MGFhOTdiZGE2NjNkNDJmNjAxMDg1MmIyZDllMTc4Yw==
+    YjIwZThjMzJiNmNjNjE1ZGU1MWM3YWQwYzJmZjVkYmMzY2Y5MzdkNw==
   data.tar.gz: !binary |-
-    Y2Y3MmIwYmIwNzFjMDZhZDhjMTdlZjcyMDBmODI3ZDcyMDQxNDIzYw==
+    MjgxN2FjOGIwZWZjMmRjMWNkZDQ0MzJkMzc0N2U3ZGZhZjI3OTAzNw==
 SHA512:
   metadata.gz: !binary |-
-    MDFhODQ4ZjI5NGFiYTQ0YzZmZWM4YTI0NTkyYTYyZjRhZDkwMmI5NTZiNzYx
-    ZDVlMDkwODNiMjViMTI2N2UxYzE4NDVhMmJhMzFmZmRhNmMwYTRmYzVlMzRj
-    YjFkNDZjYmM4MGIxOWVhY2MyMTg2MmVhNmUzNzM0ZjE3YzliZTU=
+    ODAzNWZiYjc4MzU4ODM2NDJhZWY5M2M5MGU3MDU5Yzc3NGNiNmYyMzcyYzNj
+    N2FjZmY3NWYwZGIwZTMyYmQ4OTg1NGFmYWU2YzE1NzAxODYzMTJjNDI4MzM4
+    ZDlkNzBkNjc3NGZlYWIyZDVkMzQyZjIwMTk3N2U2NDQyZjlmYzI=
   data.tar.gz: !binary |-
-    NDNkOTdiYTFmZmMyZTYzMWU0OTc4Zjk2Y2FiNGMyZjEzMTdhOTRkZTg4MjE1
-    OWI1OWRkY2Q4ZWM4NGIyNjI3OWE4NjVmYWFjYmYzODA0NWIxMGQ3MGM3M2Q0
-    Nzg3ZGMzYjIzODI2NTQzODdlZjk4MmViZmFjMTAyNTc0ODlkODE=
+    NjA1NzE2MmVlY2YyZmFmYzU4NmJhMGJkZTNiYjE3MjU2NDk3ZmJiZDBlOGI4
+    MmQzMDg3ZTBiOGRjNjI1ZDljMzY2YjFjZWFlNDAxNDVlNWVhOTdmMTNjODZj
+    NTU5YWI2YThlZTg2YTExZjVkNDY2ZWY1YTU2YzZhNDc0MGIwMzU=

data/README.md

@@ -90,6 +90,13 @@ You can also send ["service" metric](http://help-ja.mackerel.io/entry/spec/api/v
 ```
 `flush_interval` is not allowed to be set less than 60 secs not to send API requests more than once in a minute.
 
+This plugin overwrites the default value of `buffer_queue_limit` and `buffer_chunk_limit` as follows.
+
+* buffer_queue_limit to 4096
+* buffer_chunk_limit to 100K
+
+Without any special reasons to change, you should leave them as they are.
+
 Since version 0.0.4, metrics_prefix was removed and you should use metrics_name instead.
 
 ### MackerelHostidTagOutput
@@ -158,7 +165,7 @@ For debugging purpose, you can change Mackerel endpoint by `origin` parameter li
 
 ## References
 
-* [Send service and host metric to Mackerel by using fluentd (Japanese, Official Document)](http://help-ja.mackerel.io/entry/advanced/fluentd)
+* [Posting Service Metrics with fluentd](http://help.mackerel.io/entry/advanced/fluentd)
 * [How to use fluent-plugin-mackerel (Japanese)](http://qiita.com/tksmd/items/1212331a5a18afe520df)
 
 ## Copyright

data/fluent-plugin-mackerel.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mackerel"
-  spec.version       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["tksmd","hatz48"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send metrics to mackerel.io}
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rr", ">= 1.0.0"
+  spec.add_development_dependency "test-unit"
   spec.add_runtime_dependency "fluentd"
 
   spec.required_ruby_version = '>= 1.9.3'

data/lib/fluent/plugin/out_mackerel.rb

@@ -13,6 +13,10 @@ module Fluent
     config_param :out_key_pattern, :string, :default => nil
     config_param :origin, :string, :default => nil
 
+    MAX_BUFFER_CHUNK_LIMIT = 100 * 1024
+    config_set_default :buffer_chunk_limit, MAX_BUFFER_CHUNK_LIMIT
+    config_set_default :buffer_queue_limit, 4096
+
     attr_reader :mackerel
 
     # Define `log` method for v0.10.42 or earlier
@@ -118,23 +122,23 @@ module Fluent
         end
       end
 
+      send(metrics) unless metrics.empty?
+      metrics.clear
+    end
+
+    def send(metrics)
       begin
-        while true
-          partial = metrics.slice!(0, 100)
-          if partial.empty?
-            break
-          end
-          if @hostid
-            @mackerel.post_metrics(partial)
-          else
-            @mackerel.post_service_metrics(@service, partial)
-          end
+        if @hostid
+          @mackerel.post_metrics(metrics)
+        else
+          @mackerel.post_service_metrics(@service, metrics)
         end
       rescue => e
         log.error("out_mackerel:", :error_class => e.class, :error => e.message)
+        raise e
       end
-      metrics.clear
     end
+
   end
 
 end

data/test/plugin/test_out_mackerel.rb

@@ -69,6 +69,21 @@ class MackerelOutputTest < Test::Unit::TestCase
     out_keys val1,val2
   ]
 
+  CONFIG_BUFFER_LIMIT_DEFAULT = %[
+    type mackerel
+    service xyz
+    api_key 123456
+    out_keys val1,val2,val3
+  ]
+
+  CONFIG_BUFFER_LIMIT_IGNORE = %[
+    type mackerel
+    service xyz
+    api_key 123456
+    out_keys val1,val2,val3
+    buffer_chunk_limit 1k
+  ]
+
   def create_driver(conf = CONFIG, tag='test')
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::MackerelOutput, tag).configure(conf)
   end
@@ -107,6 +122,13 @@ class MackerelOutputTest < Test::Unit::TestCase
     d = create_driver(CONFIG_OUT_KEY_PATTERN)
     assert_match d.instance.instance_variable_get(:@out_key_pattern), "val1"
     assert_no_match d.instance.instance_variable_get(:@out_key_pattern), "foo"
+
+    d = create_driver(CONFIG_BUFFER_LIMIT_DEFAULT)
+    assert_equal d.instance.instance_variable_get(:@buffer_chunk_limit), Fluent::MackerelOutput::MAX_BUFFER_CHUNK_LIMIT
+    assert_equal d.instance.instance_variable_get(:@buffer_queue_limit), 4096
+
+    d = create_driver(CONFIG_BUFFER_LIMIT_IGNORE)
+    assert_equal d.instance.instance_variable_get(:@buffer_chunk_limit), Fluent::MackerelOutput::MAX_BUFFER_CHUNK_LIMIT
   end
 
   def test_write

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mackerel
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - tksmd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mackerel-client
@@ -67,6 +67,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.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