fluent-plugin-hipchat 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956ca8f2c269a901d1afd66f55926fd421f2953d
-  data.tar.gz: a7968c4b26d1d73374ef829508494b1760a112fa
+  metadata.gz: 8efeebb26e4e7309f3b935d63e28f9d5dae01ab5
+  data.tar.gz: 2bd001e4640837b1114cc1cebd7eefbc52d33b17
 SHA512:
-  metadata.gz: 745a459a8b4b8518ac996e584315703850011cc2d0e2f05aee46de958769949e4f37526ea9c2bc223d2f9b86854b250579ff01e32b03dd44fdda3d078bddc1b4
-  data.tar.gz: 0d997194930e335c75745bfc449e25107dc867a1914e0e2f39c9af7a2d651ec08f8843055cdd38aa343438d7538edff20e48b7a205fad541ff1ec3655ea9d36f
+  metadata.gz: a6491adb2c5d5dbe884568ca755513bdcce4d3ad421e7b0beccbcbd02409b257d3b33c7f34980202158607a8229934b89d2720b95098cee1f4dd51abbc9d04be
+  data.tar.gz: 6c9e77d859642e54d3b1f8baf4fbe960cd651b825e6fe8b8b4cd666667278e51188654966df28f161c424f1ebde3f122ff4d112e71a7757c8f020079d61757c6

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/fluent-plugin-hipchat.gemspec

@@ -15,7 +15,7 @@ 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.8"
+  gem.add_dependency "fluentd", [">= 0.14.0", "< 2"]
   gem.add_dependency "hipchat-api",  ">= 1.0.0"
 
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/out_hipchat.rb

@@ -1,10 +1,15 @@
+require 'hipchat-api'
+require 'fluent/plugin/output'
 
-module Fluent
-  class HipchatOutput < BufferedOutput
+module Fluent::Plugin
+  class HipchatOutput < Output
     COLORS = %w(yellow red green purple gray random)
     FORMAT = %w(html text)
+    DEFAULT_BUFFER_TYPE = "memory"
     Fluent::Plugin.register_output('hipchat', self)
 
+    helpers :compat_parameters
+
     config_param :api_token, :string, :secret => true
     config_param :default_room, :string, :default => nil
     config_param :default_color, :string, :default => 'yellow'
@@ -19,14 +24,19 @@ module Fluent
     config_param :http_proxy_pass, :string, :default => nil
     config_param :flush_interval, :time, :default => 1
 
+    config_section :buffer do
+      config_set_default :@type, DEFAULT_BUFFER_TYPE
+      config_set_default :chunk_keys, ['tag']
+    end
+
     attr_reader :hipchat
 
     def initialize
       super
-      require 'hipchat-api'
     end
 
     def configure(conf)
+      compat_parameters_convert(conf, :buffer)
       super
 
       @hipchat = HipChat::API.new(conf['api_token'])
@@ -40,19 +50,28 @@ module Fluent
           conf['http_proxy_user'],
           conf['http_proxy_pass'])
       end
+      raise Fluent::ConfigError, "'tag' in chunk_keys is required." if not @chunk_key_tag
     end
 
     def format(tag, time, record)
-      [tag, time, record].to_msgpack
+      [time, record].to_msgpack
+    end
+
+    def formatted_to_msgpack_binary
+      true
+    end
+
+    def multi_workers_ready?
+      true
     end
 
     def write(chunk)
-      chunk.msgpack_each do |(tag,time,record)|
+      chunk.msgpack_each do |(time,record)|
         begin
           send_message(record) if record[@key_name]
           set_topic(record) if record['topic']
         rescue => e
-          $log.error("HipChat Error:", :error_class => e.class, :error => e.message)
+          log.error("HipChat Error:", :error_class => e.class, :error => e.message)
         end
       end
     end

data/test/plugin/out_hipchat.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 require 'fluent/plugin/out_hipchat'
 
 class HipchatOutputTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
+
   def setup
     super
     Fluent::Test.setup
@@ -23,7 +25,7 @@ class HipchatOutputTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf = CONFIG)
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::HipchatOutput) {
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::HipchatOutput) {
     }.configure(conf)
   end
 
@@ -40,6 +42,17 @@ class HipchatOutputTest < Test::Unit::TestCase
     assert_equal 1, d.instance.flush_interval
   end
 
+  def test_format
+    d = create_driver
+    stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red', 'html')
+    assert_equal d.instance.hipchat.instance_variable_get(:@token), 'testtoken'
+    time = event_time
+    d.run(default_tag: "test") do
+      d.feed(time, {'message' => 'foo', 'color' => 'red'})
+    end
+    assert_equal [time, {'message' => 'foo', 'color' => 'red'}].to_msgpack, d.formatted[0]
+  end
+
   def test_default_message
     d = create_driver(<<-EOF)
                       type hipchat
@@ -48,8 +61,9 @@ class HipchatOutputTest < Test::Unit::TestCase
                       EOF
     stub(d.instance.hipchat).rooms_message('testroom', 'fluentd', 'foo', 0, 'yellow', 'html')
     assert_equal d.instance.hipchat.instance_variable_get(:@token), 'xxx'
-    d.emit({'message' => 'foo'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'foo'})
+    end
   end
 
   def test_set_default_timeout
@@ -59,39 +73,43 @@ class HipchatOutputTest < Test::Unit::TestCase
                       default_timeout 5
                       EOF
     stub(d.instance.hipchat).set_timeout(5)
-    d.emit({'message' => 'foo'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'foo'})
+    end
   end
 
   def test_message
     d = create_driver
     stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red', 'html')
     assert_equal d.instance.hipchat.instance_variable_get(:@token), 'testtoken'
-    d.emit({'message' => 'foo', 'color' => 'red'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'foo', 'color' => 'red'})
+    end
   end
 
   def test_message_override
     d = create_driver
     stub(d.instance.hipchat).rooms_message('my', 'alice', 'aaa', 1, 'random', 'text')
-    d.emit(
-      {
-        'room' => 'my',
-        'from' => 'alice',
-        'message' => 'aaa',
-        'notify' => true,
-        'color' => 'random',
-        'format' => 'text',
-      }
-    )
-    d.run
+    d.run(default_tag: "test") do
+      d.feed(
+        {
+          'room' => 'my',
+          'from' => 'alice',
+          'message' => 'aaa',
+          'notify' => true,
+          'color' => 'random',
+          'format' => 'text',
+        }
+      )
+    end
   end
 
   def test_topic
     d = create_driver
     stub(d.instance.hipchat).rooms_topic('testroom', 'foo', 'testuser')
-    d.emit({'topic' => 'foo'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'topic' => 'foo'})
+    end
   end
 
   def test_set_topic_response_error
@@ -100,8 +118,9 @@ class HipchatOutputTest < Test::Unit::TestCase
       {'error' => { 'code' => 400, 'type' => 'Bad Request', 'message' => 'Topic body must be between 1 and 250 characters.' } }
     }
     stub($log).error("HipChat Error:", :error_class => StandardError, :error => 'Topic body must be between 1 and 250 characters.')
-    d.emit({'topic' => 'foo'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'topic' => 'foo'})
+    end
   end
 
   def test_send_message_response_error
@@ -110,15 +129,17 @@ class HipchatOutputTest < Test::Unit::TestCase
       {'error' => { 'code' => 400, 'type' => 'Bad Request', 'message' => 'From name may not contain HTML.' } }
     }
     stub($log).error("HipChat Error:", :error_class => StandardError, :error => 'From name may not contain HTML.')
-    d.emit({'from' => '<abc>', 'message' => 'foo'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'from' => '<abc>', 'message' => 'foo'})
+    end
   end
 
   def test_color_validate
     d = create_driver
     stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'yellow', 'html')
-    d.emit({'message' => 'foo', 'color' => 'invalid'})
-    d.run
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'foo', 'color' => 'invalid'})
+    end
   end
 
   def test_http_proxy

data/test/test_helper.rb

@@ -13,3 +13,5 @@ end
 require 'test/unit'
 require 'test/unit/rr'
 require 'fluent/test'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-hipchat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuichi Tateno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: hipchat-api
   requirement: !ruby/object:Gem::Requirement