fluent-plugin-growthforecast 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ef251fcecd3b5a3e25e19999f7a729169ec5dd
-  data.tar.gz: ec9832faf2b9e613f20c21cd9865a09fe7d98820
+  metadata.gz: cf5a24c232fc6602f645d4346ef5998eb06de333
+  data.tar.gz: 44ba1c503ca39fe3caef6824319095eda7174d9d
 SHA512:
-  metadata.gz: cf66365063373360b71a8443b6f0495efdb626c3ac3b49fc2814fc6033afde42703910fd3716060e9f9251ac7847c7d95a9372312de8679a379db6914e47277a
-  data.tar.gz: 33f8c44d73ae0af1e5805a130aa0d0efccbd04c2bdd6020b1f81ce1e00c0f0934827905033c7f5caa19cbd00600e69a53bc5711d30dbfd79438604cff2307b52
+  metadata.gz: 95bf947b9b8bf21ab1f87dfe6ecc5074c24a564b22e07ce0c3201d5a840d9c60a952c8abd73835fbe6df24244b602a5cb3e9c33a8e75a908b50878d782ae0071
+  data.tar.gz: c04777c0fd35009631a57d46618f8a01961e63e9658722bb6517c96e538ce01466b2443b1c83afc4f5ea2df7409772aedf6a9ede9671e58121db972c1355dea6

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0

data/Rakefile

@@ -8,4 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-growthforecast.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-growthforecast"
-  gem.version       = "0.3.0"
+  gem.version       = "1.0.0"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{Fluentd output plugin to post numbers to GrowthForecast (by kazeburo)}
@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit", ">= 3.0.0"
-  gem.add_runtime_dependency "fluentd", "< 0.14.0"
-  gem.add_runtime_dependency "fluent-mixin-config-placeholders", ">= 0.3.0"
+  gem.add_runtime_dependency "fluentd", ">= 0.14.0"
   gem.add_runtime_dependency "resolve-hostname", ">= 0.0.4"
 end

data/lib/fluent/plugin/out_growthforecast.rb

@@ -1,96 +1,102 @@
-class Fluent::GrowthForecastOutput < Fluent::Output
+require 'net/http'
+require 'uri'
+require 'cgi/util'
+require 'resolve/hostname'
+
+class Fluent::Plugin::GrowthForecastOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('growthforecast', self)
 
   def initialize
     super
-    require 'net/http'
-    require 'uri'
-    require 'resolve/hostname'
   end
 
   config_param :gfapi_url, :string, # growth.forecast.local/api/
-               :desc => 'The URL of a GrowthForecast API endpoint.'
-  config_param :graph_path, :string, :default => nil,
-               :desc => <<-DESC
+               desc: 'The URL of a GrowthForecast API endpoint.'
+  config_param :graph_path, :string, default: nil,
+               desc: <<-DESC
 The graph path for GrowthForecast API endpoint with the order of service, section, graph_name.
 DESC
-  config_param :service, :string, :default => nil,
-               :desc => 'The service_name of graphs to create.'
-  config_param :section, :string, :default => nil,
-               :desc => 'The section_name of graphs to create.'
-  config_param :graphs, :string, :default => nil,
-               :desc => <<-DESC
+  config_param :service, :string, default: nil,
+               desc: 'The service_name of graphs to create.'
+  config_param :section, :string, default: nil,
+               desc: 'The section_name of graphs to create.'
+  config_param :graphs, :string, default: nil,
+               desc: <<-DESC
 You may use this option to specify graph names correspond to each of name_keys.
 Separate by , (comma). The number of graph names must be same with the number of name_keys.
 DESC
 
-  config_param :ssl, :bool, :default => false,
-               :desc => 'Use SSL (https) or not.'
-  config_param :verify_ssl, :bool, :default => false,
-               :desc => 'Do SSL verification or not.'
+  config_param :ssl, :bool, default: false,
+               desc: 'Use SSL (https) or not.'
+  config_param :verify_ssl, :bool, default: false,
+               desc: 'Do SSL verification or not.'
 
-  config_param :name_keys, :string, :default => nil,
-               :desc => <<-DESC
+  config_param :name_keys, :string, default: nil,
+               desc: <<-DESC
 Specify field names of the input record. Separate by , (comma).
 The values of these fields are posted as numbers, and names of thease fields are used as parts of grame_names.
 Either of name_keys or name_key_pattern is required.
 DESC
-  config_param :name_key_pattern, :string, :default => nil,
-               :desc => <<-DESC
+  config_param :name_key_pattern, :string, default: nil,
+               desc: <<-DESC
 Specify the field names of the input record by a regular expression.
 The values of these fields are posted as numbers,
 and names of thease fields are used as parts of grame_names.
 Either of name_keys or name_key_pattern is required.
 DESC
 
-  config_param :mode, :string, :default => 'gauge', # or count/modified
-               :desc => <<-DESC
+  config_param :mode, :string, default: 'gauge', # or count/modified
+               desc: <<-DESC
 The graph mode (either of gauge, count, or modified).
 Just same as mode of GrowthForecast POST parameter.
 DESC
 
-  config_param :remove_prefix, :string, :default => nil,
-               :desc => 'The prefix string which will be removed from the tag.'
-  config_param :tag_for, :string, :default => 'name_prefix', # or 'ignore' or 'section' or 'service'
-               :desc => 'Either of name_prefix, section, service, or ignore.'
+  config_param :remove_prefix, :string, default: nil,
+               desc: 'The prefix string which will be removed from the tag.'
+  config_param :tag_for, :string, default: 'name_prefix', # or 'ignore' or 'section' or 'service'
+               desc: 'Either of name_prefix, section, service, or ignore.'
 
-  config_param :background_post, :bool, :default => false,
-               :desc => 'Post to GrowthForecast in background thread, without retries for failures'
+  config_param :background_post, :bool, default: false,
+               desc: 'Post to GrowthForecast in background thread, without retries for failures'
 
-  config_param :timeout, :integer, :default => nil, # default 60secs
-               :desc => 'Read/Write timeout seconds'
-  config_param :retry, :bool, :default => true,
-               :desc => <<-DESC
+  config_param :timeout, :integer, default: nil, # default 60secs
+               desc: 'Read/Write timeout seconds'
+  config_param :retry, :bool, default: true,
+               desc: <<-DESC
 Do retry for HTTP request failures, or not.
 This feature will be set as false for background_post yes automatically.
 DESC
-  config_param :keepalive, :bool, :default => true,
-               :desc => 'Use a keepalive HTTP connection.'
-  config_param :enable_float_number, :bool, :default => false,
-               :desc => 'Post a floating number rather than an interger number.'
-
-  config_param :authentication, :string, :default => nil, # nil or 'none' or 'basic'
-               :desc => 'Specify basic if your GrowthForecast protected with basic authentication.'
-  config_param :username, :string, :default => '',
-               :desc => 'The username for authentication.'
-  config_param :password, :string, :default => '', :secret => true,
-               :desc => 'The password for authentication.'
+  config_param :keepalive, :bool, default: true,
+               desc: 'Use a keepalive HTTP connection.'
+  config_param :enable_float_number, :bool, default: false,
+               desc: 'Post a floating number rather than an interger number.'
+
+  config_param :authentication, :string, default: nil, # nil or 'none' or 'basic'
+               desc: 'Specify basic if your GrowthForecast protected with basic authentication.'
+  config_param :username, :string, default: '',
+               desc: 'The username for authentication.'
+  config_param :password, :string, default: '', secret: true,
+               desc: 'The password for authentication.'
+
+  config_section :buffer do
+    config_set_default :chunk_keys, ["tag"]
+    config_set_default :flush_mode, :immediate
+  end
 
   DEFAULT_GRAPH_PATH = {
-    :ignore => '${service}/${section}/${key_name}',
-    :service => '${tag}/${section}/${key_name}',
-    :section => '${service}/${tag}/${key_name}',
-    :name_prefix => '${service}/${section}/${tag}_${key_name}',
+    ignore: '${service}/${section}/${key_name}',
+    service: '${tag}/${section}/${key_name}',
+    section: '${service}/${tag}/${key_name}',
+    name_prefix: '${service}/${section}/${tag}_${key_name}',
   }
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
-
   def configure(conf)
     super
 
+    unless @chunk_key_tag
+      raise Fluent::ConfigError, "configure buffer chunk_keys with tag"
+    end
+
     if @gfapi_url !~ /\/api\/\Z/
       raise Fluent::ConfigError, "gfapi_url must end with /api/"
     end
@@ -156,46 +162,15 @@ DESC
             else
               :none
             end
-    @resolver = Resolve::Hostname.new(:system_resolver => true)
-  end
-
-  def start
-    super
-
-    @running = true
-    @thread = nil
-    @queue = nil
-    @mutex = nil
-    if @background_post
-      @mutex = Mutex.new
-      @queue = []
-      @thread = Thread.new(&method(:poster))
-    end
+    @resolver = Resolve::Hostname.new(system_resolver: true)
   end
 
-  def shutdown
-    @running = false
-    @thread.join if @thread
-    super
+  def multi_workers_ready?
+    true
   end
 
-  def poster
-    while @running
-      if @queue.size < 1
-        sleep(0.2)
-        next
-      end
-
-      events = @mutex.synchronize {
-        es,@queue = @queue,[]
-        es
-      }
-      begin
-        post_events(events) if events.size > 0
-      rescue => e
-        log.warn "HTTP POST in background Error occures to growthforecast server", :error_class => e.class, :error => e.message
-      end
-    end
+  def prefer_buffered_processing
+    @background_post
   end
 
   def placeholder_mapping(tag, name)
@@ -203,12 +178,17 @@ DESC
         ( (tag.start_with?(@removed_prefix_string) and tag.length > @removed_length) or tag == @remove_prefix)
       tag = tag[@removed_length..-1]
     end
-    {'${service}' => @service, '${section}' => @section, '${tag}' => tag, '${key_name}' => name}
+    {'${service}' => escape(@service), '${section}' => escape(@section), '${tag}' => escape(tag), '${key_name}' => escape(name)}
+  end
+
+  def escape(param)
+    escaped ||= param
+    escaped = CGI.escape(param) if param
   end
 
   def format_url(tag, name)
     graph_path = @graph_path.gsub(/(\${[_a-z]+})/, placeholder_mapping(tag, name))
-    return @gfapi_url + URI.escape(graph_path)
+    return @gfapi_url + graph_path
   end
 
   def connect_to(tag, name)
@@ -253,7 +233,7 @@ DESC
       host,port = connect_to(tag, name)
       req = post_request(tag, name, value)
       http = http_connection(host, port)
-      res = http.start {|http| http.request(req) }
+      res = http.start {|client| client.request(req) }
     rescue IOError, EOFError, SystemCallError
       # server didn't respond
       log.warn "net/http POST raises exception: #{$!.class}, '#{$!.message}'"
@@ -283,19 +263,13 @@ DESC
           log.warn "failed to post to growthforecast: #{host}:#{port}#{req.path}, post_data: #{req.body} code: #{res && res.code}"
         end
       rescue IOError, EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT, SystemCallError
-        log.warn "net/http keepalive POST raises exception: #{$!.class}, '#{$!.message}'"
-        begin
-          http.finish
-        rescue => e
-          # ignore all errors for connection with error
-        end
+        log.warn "net/http keepalive POST raises exception", error: $!
+        http.finish rescue nil # ignore all errors for connection with error
         http = nil
       end
     end
-    begin
-      http.finish
-    rescue => e
-      # ignore
+    if http
+      http.finish rescue nil
     end
   end
 
@@ -309,38 +283,52 @@ DESC
     end
   end
 
-  def emit(tag, es, chain)
+  def gf_events(tag, time, record)
     events = []
     if @name_keys
-      es.each {|time,record|
-        @name_keys.each_with_index {|name, i|
-          if value = record[name]
-            events.push({:tag => tag, :name => (@graphs ? @graphs[i] : name), :value => value})
-          end
-        }
-      }
-    else # for name_key_pattern
-      es.each {|time,record|
-        record.keys.each {|key|
-          if @name_key_pattern.match(key) and record[key]
-            events.push({:tag => tag, :name => key, :value => record[key]})
-          end
-        }
-      }
-    end
-    if @thread
-      @mutex.synchronize do
-        @queue += events
+      @name_keys.each_with_index do |name, i|
+        if value = record[name]
+          events.push({tag: tag, name: (@graphs ? @graphs[i] : name), value: value})
+        end
       end
-    else
-      begin
-        post_events(events)
-      rescue => e
-        log.warn "HTTP POST Error occures to growthforecast server", :error_class => e.class, :error => e.message
-        raise if @retry
+    else # for name_key_pattern
+      record.keys.each do |key|
+        if @name_key_pattern.match(key) and record[key]
+          events.push({tag: tag, name: key, value: record[key]})
+        end
       end
     end
+    events
+  end
+
+  def gf_events_from_es(tag, es)
+    events = []
+    es.each do |time, record|
+      events.concat(gf_events(tag, time, record))
+    end
+    events
+  end
+
+  def process(tag, es)
+    events = gf_events_from_es(tag, es)
+    begin
+      post_events(events)
+    rescue => e
+      log.warn "HTTP POST Error occurs to growthforecast server, ignored (use background_post for retries)", error: e
+    end
+  end
 
-    chain.next
+  def write(chunk)
+    tag = chunk.metadata.tag
+    events = []
+    chunk.each do |time, record|
+      events.concat(gf_events(tag, time, record))
+    end
+    begin
+      post_events(events)
+    rescue => e
+      log.warn "HTTP POST Error occures to growthforecast server", error: e
+      raise if @retry
+    end
   end
 end

data/test/plugin/test_out_growthforecast.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'fluent/test/driver/output'
 
 class GrowthForecastOutputTest < Test::Unit::TestCase
   # setup/teardown and tests of dummy growthforecast server defined at the end of this class...
@@ -119,8 +120,8 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
       remove_prefix test
   ]
 
-  def create_driver(conf=CONFIG1, tag='test.metrics')
-    Fluent::Test::OutputTestDriver.new(Fluent::GrowthForecastOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG1)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::GrowthForecastOutput).configure(conf)
   end
 
   def test_configure_and_format_url
@@ -170,9 +171,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     tag_for   name_prefix
   # ]
   def test_emit_1
-    d = create_driver(CONFIG1, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG1)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -202,9 +205,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     mode count
   # ]
   def test_emit_2
-    d = create_driver(CONFIG2, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG2)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -234,10 +239,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     mode modified
   # ]
   def test_emit_3
-    d = create_driver(CONFIG3, 'test.metrics')
-    # recent ruby's Hash saves elements order....
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG3)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      # recent ruby's Hash saves elements order....
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -268,9 +275,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   def test_emit_4_auth
     @auth = true # enable authentication of dummy server
 
-    d = create_driver(CONFIG1, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run # failed in background, and output warn log
+    d = create_driver(CONFIG1)
+    d.end_if{ @prohibited == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+      # failed in background, and output warn log
+    end
 
     assert_equal 0, @posted.size
     assert_equal 3, @prohibited
@@ -279,9 +289,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
       authentication basic
       username alice
       password wrong_password
-    ], 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run # failed in background, and output warn log
+    ])
+    d.end_if{ @prohibited == 6 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+      # failed in background, and output warn log
+    end
 
     assert_equal 0, @posted.size
     assert_equal 6, @prohibited
@@ -290,9 +303,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
       authentication basic
       username alice
       password secret!
-    ], 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run # failed in background, and output warn log
+    ])
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+      # failed in background, and output warn log
+    end
 
     assert_equal 6, @prohibited
     assert_equal 3, @posted.size
@@ -307,10 +323,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   # ]
 
   def test_emit_5
-    d = create_driver(CONFIG4, 'test.service')
-    # recent ruby's Hash saves elements order....
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG4)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.service') do
+      # recent ruby's Hash saves elements order....
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -339,9 +357,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     tag_for   ignore
   # ]
   def test_with_space_1
-    d = create_driver(CONFIG_SPACE, 'test.foo')
-    d.emit({ 'field z' => 3 })
-    d.run
+    d = create_driver(CONFIG_SPACE)
+    d.end_if{ @posted.size == 1 }
+    d.run(default_tag: 'test.foo') do
+      d.feed({ 'field z' => 3 })
+    end
 
     assert_equal 1, @posted.size
     v = @posted[0]
@@ -349,9 +369,9 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     assert_equal 3, v[:data][:number]
     assert_equal 'gauge', v[:data][:mode]
     assert_nil v[:auth]
-    assert_equal 'service x', v[:service]
-    assert_equal 'metrics y', v[:section]
-    assert_equal 'field z', v[:name]
+    assert_equal 'service+x', v[:service]
+    assert_equal 'metrics+y', v[:section]
+    assert_equal 'field+z', v[:name]
   end
 
   # CONFIG_NON_KEEPALIVE = %[
@@ -363,9 +383,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     keepalive false
   # ]
   def test_non_keepalive
-    d = create_driver(CONFIG_NON_KEEPALIVE, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG_NON_KEEPALIVE)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -397,10 +419,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     timeout   120
   # ]
   def test_threading
-    d = create_driver(CONFIG_THREADING_KEEPALIVE, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
-    sleep 0.5 # wait internal posting thread loop
+    d = create_driver(CONFIG_THREADING_KEEPALIVE)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -431,10 +454,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     keepalive false
   # ]
   def test_threading_non_keepalive
-    d = create_driver(CONFIG_THREADING_NON_KEEPALIVE, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
-    sleep 0.5 # wait internal posting thread loop
+    d = create_driver(CONFIG_THREADING_NON_KEEPALIVE)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -465,9 +489,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   #     tag_for   name_prefix
   # ]
   def test_graphs
-    d = create_driver(CONFIG_GRAPHS, 'test.metrics')
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG_GRAPHS)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -499,9 +525,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   def test_enable_float_number
     @enable_float_number = true # enable float number of dummy server
 
-    d = create_driver(CONFIG_ENABLE_FLOAT_NUMBER, 'test.metrics')
-    d.emit({ 'field1' => 50.5, 'field2' => -20.1, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG_ENABLE_FLOAT_NUMBER)
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.metrics') do
+      d.feed({ 'field1' => 50.5, 'field2' => -20.1, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -515,7 +543,7 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     assert_equal 'metrics', v1st[:section]
     assert_equal 'test.metrics_field1', v1st[:name]
 
-    assert_equal -20.1, v2nd[:data][:number]
+    assert_equal (-20.1), v2nd[:data][:number]
     assert_equal 'test.metrics_field2', v2nd[:name]
 
     assert_equal 1, v3rd[:data][:number]
@@ -523,10 +551,13 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
   end
 
   def test_gfapi_path
-    d = create_driver(CONFIG_GFAPI_PATH, 'test.service')
-    # recent ruby's Hash saves elements order....
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
-    d.run
+    d = create_driver(CONFIG_GFAPI_PATH)
+
+    d.end_if{ @posted.size == 3 }
+    d.run(default_tag: 'test.service') do
+      # recent ruby's Hash saves elements order....
+      d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    end
 
     assert_equal 3, @posted.size
     v1st = @posted[0]
@@ -556,10 +587,10 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     @enable_float_number = false
     @dummy_server_thread = Thread.new do
       srv = if ENV['VERBOSE']
-              WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => GF_TEST_LISTEN_PORT})
+              WEBrick::HTTPServer.new({BindAddress: '127.0.0.1', Port: GF_TEST_LISTEN_PORT})
             else
               logger = WEBrick::Log.new('/dev/null', WEBrick::BasicLog::DEBUG)
-              WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => GF_TEST_LISTEN_PORT, :Logger => logger, :AccessLog => []})
+              WEBrick::HTTPServer.new({BindAddress: '127.0.0.1', Port: GF_TEST_LISTEN_PORT, Logger: logger, AccessLog: []})
             end
       begin
         srv.mount_proc('/api') { |req,res| # /api/:service/:section/:name
@@ -586,11 +617,11 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
 
           number = @enable_float_number ? post_param['number'].to_f : post_param['number'].to_i
           @posted.push({
-              :service => service,
-              :section => section,
-              :name => graph_name,
-              :auth => nil,
-              :data => { :number => number, :mode => post_param['mode'] },
+              service: service,
+              section: section,
+              name: graph_name,
+              auth: nil,
+              data: { number: number, mode: post_param['mode'] },
             })
 
           res.status = 200
@@ -608,7 +639,7 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     # to wait completion of dummy server.start()
     require 'thread'
     cv = ConditionVariable.new
-    watcher = Thread.new {
+    _watcher = Thread.new {
       connected = false
       while not connected
         begin
@@ -636,9 +667,12 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     host = server.split(':')[0]
     port = server.split(':')[1].to_i
     client = Net::HTTP.start(host, port)
+    content_type = {'Content-Type' => 'application/x-www-form-urlencoded'}
 
     assert_equal '200', client.request_get('/').code
-    assert_equal '200', client.request_post('/api/service/metrics/hoge', 'number=1&mode=gauge').code
+    assert_equal '200', client.request_post('/api/service/metrics/hoge',
+                                            'number=1&mode=gauge',
+                                            initheader = content_type).code
 
     assert_equal 1, @posted.size
 
@@ -649,7 +683,9 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     assert_equal 'metrics', @posted[0][:section]
     assert_equal 'hoge', @posted[0][:name]
 
-    assert_equal '200', client.request_post(URI.escape('/api/service x/metrics/hoge'), 'number=1&mode=gauge').code
+    assert_equal '200', client.request_post('/api/service%20x/metrics/hoge',
+                                            'number=1&mode=gauge',
+                                            initheader = content_type).code
 
     assert_equal 2, @posted.size
 
@@ -662,7 +698,9 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
 
     @auth = true
 
-    assert_equal '403', client.request_post('/api/service/metrics/pos', 'number=30&mode=gauge').code
+    assert_equal '403', client.request_post('/api/service/metrics/pos',
+                                            'number=30&mode=gauge',
+                                            initheader = content_type).code
 
     req_with_auth = lambda do |number, mode, user, pass|
       url = URI.parse("http://#{host}:#{port}/api/service/metrics/pos")
@@ -688,5 +726,4 @@ class GrowthForecastOutputTest < Test::Unit::TestCase
     @dummy_server_thread.kill
     @dummy_server_thread.join
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-growthforecast
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -40,32 +40,18 @@ dependencies:
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: fluent-mixin-config-placeholders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: resolve-hostname
   requirement: !ruby/object:Gem::Requirement