fluent-plugin-dd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d32c3397a0057d06d90fbb81f840017d27cd526d
-  data.tar.gz: cb5707e226e2a28b0abae125258b18c50a3c2235
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODQ1NTNjMTEyZjZhOTAyNTAzOGFlN2VlMDQ2MGFjMzYxZmM4ZmI5ZQ==
+  data.tar.gz: !binary |-
+    OWQxOTE3ZmQzM2Y2NmZkODZhYjlhNjkxMDhkNWJiN2ZjYTYxYTI2Nw==
 SHA512:
-  metadata.gz: 15b1db3c558997642e120226f905f0e002728619174e10dd5bbb182e0c5478e1b943dc8cf8d12abf86b3a14b49ae91de7af6fc1add471753e0c9d3bc7a1d9e62
-  data.tar.gz: 2e18ce4ef7e1513876f1f3f54b411a714ffac4ca5648fa59ff7ce4d61405588cd1a9ef7a133115c9e9a1eb7a8992962a536a255d5dc35c1531ae811c9bba4707
+  metadata.gz: !binary |-
+    YTIyMmE0YmMwNWU4NDNlZGM0YTRlNjM1NWY4OGQ5YzZlMGI5MGExNjRjODdj
+    M2Q2OWFmMGYwMGJhNjAxZTBlMDg2NzkwZmNiOTBjMzc1NWVmNTgyOWYyMThl
+    YWQ2YjA1ODUwNDYxZDdlYTMyMWY0Y2I3ZTczYTljNDE1MDM2NDY=
+  data.tar.gz: !binary |-
+    ZmEzNjMwMTQ5NDFkODI3ZTM5ODgyMzNmZjI1M2Y5YTc2NTJkYmIwN2JlM2Ix
+    M2I3NGU3ZGFiZWJlNmE2YjRhZDY0Y2Y2MjM0ZTA0NTgzNmEyYzc5YjY3ZjM0
+    NzU5YzdkYTYwNDdkZGVmZWE3MGEwZTU0MjVjMzJlNjg5NTJlOGU=

data/README.md

@@ -17,6 +17,7 @@ Output plugin for Datadog
   dd_api_key ...
   #host my_host.example.com
   #use_fluentd_tag_for_datadog_tag false
+  #emit_in_background false
 </match>
 ```
 

data/fluent-plugin-dd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-dd'
-  spec.version       = '0.1.3'
+  spec.version       = '0.1.4'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
   spec.description   = %q{Output plugin for Datadog}

data/lib/fluent/plugin/out_dd.rb

@@ -8,19 +8,37 @@ class Fluent::DdOutput < Fluent::BufferedOutput
   config_param :dd_api_key, :string
   config_param :host, :string, :default => nil
   config_param :use_fluentd_tag_for_datadog_tag, :bool, :default => false
+  config_param :emit_in_background, :bool, :default => false
 
   def initialize
     super
     require 'dogapi'
     require 'socket'
+    require 'thread'
   end
 
   def start
     super
+
+    if @emit_in_background
+      @queue = Queue.new
+
+      @thread = Thread.start do
+        while(chunk = @queue.pop)
+          emit_points(chunk)
+          Thread.pass
+        end
+      end
+    end
   end
 
   def shutdown
     super
+
+    if @emit_in_background
+      @queue.push(false)
+      @thread.join
+    end
   end
 
   def configure(conf)
@@ -43,6 +61,16 @@ class Fluent::DdOutput < Fluent::BufferedOutput
   end
 
   def write(chunk)
+    if @emit_in_background
+      @queue.push(chunk)
+    else
+      emit_points(chunk)
+    end
+  end
+
+  private
+
+  def emit_points(chunk)
     enum = chunk.to_enum(:msgpack_each)
 
     enum.select {|tag, time, record|

data/spec/out_dd_spec.rb

@@ -22,6 +22,20 @@ describe Fluent::DdOutput do
     end
   end
 
+  it 'should be called emit_points in the background' do
+    run_driver(:emit_in_background => true) do |d, dog|
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 50.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 100.0]],
+        {}
+      )
+
+      d.emit({"metric" => "some.metric.name", "value" => 50.0}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 100.0}, time)
+    end
+  end
+
   it 'should be called emit_points with tag' do
     run_driver(:use_fluentd_tag_for_datadog_tag => true) do |d, dog|
       dog.should_receive(:emit_points).with(

data/spec/spec_helper.rb

@@ -15,17 +15,11 @@ end
 def run_driver(options = {})
   options = options.dup
 
-  dd_api_key = options[:dd_api_key] || 'test_dd_api_key'
-  host = options[:host] || 'test_host'
+  dd_api_key = options.delete(:dd_api_key) || 'test_dd_api_key'
+  host = options.delete(:host) || 'test_host'
 
-  option_keys = [
-    :use_fluentd_tag_for_datadog_tag
-  ]
-
-  additional_options = option_keys.map {|key|
-    if options[key]
-      "#{key} #{options[key]}"
-    end
+  additional_options = options.map {|key, value|
+    "#{key} #{value}"
   }.join("\n")
 
   fluentd_conf = <<-EOS

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,28 +56,28 @@ dependencies:
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: Output plugin for Datadog
@@ -107,21 +107,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Output plugin for Datadog
 test_files:
 - spec/out_dd_spec.rb
 - spec/spec_helper.rb
-has_rdoc: