fluent-plugin-dd 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWMzODQ3ODM1YTNiMGFmNGMyMGJmNWQ0NzYxNjcxYzdkNWNhMmRiOQ==
+    Mzg2ZDBiZmE5YmNmOGQzNzcyYTAzMjUxMGU3YmZmMmVmMmM1Mzk2OA==
   data.tar.gz: !binary |-
-    OTFlZTRhZWIzZjdkMGU3NGY1MTRjNjU0MmZjODRlNTJkMTc1ZGJkZA==
+    YWVkNzllMDY0NmZhYTc2NjI1ZjU2MjE5MjZhMzQxODQ0NjlmYWQxMw==
 SHA512:
   metadata.gz: !binary |-
-    NDA5OWE0NjEzMjcxYWU3MzljNjFjMzhmM2VkYTM1MjQwNGZkNDU0ZDE5M2Ez
-    ZjYzM2IzNWE5ODljZmM2YTA4YzE4MGZiNDAwODY2YTJjYWIzODMxMWYxNDZj
-    NTEzZGI5ZTBkNDRjNmFiZGQ4NWM1NjAzMTFiZmE3ZGU3ZDI0Mzg=
+    MDRkY2M3NTdiMWVhMmM0OGUyYjRhNGE3YjM2ZGIzZTFiNTUxZmIyNDlhOTM5
+    OWNjNDQ0M2I5ZjUzODE2MTE4YTkwMDNjNGQ1OTBkY2ExOTQ2MDExZDM3OTAw
+    ZWVkNTc5ODk2OWNkMmU2YzRjMWJjZjU4MDM0ZTU0ZDIyMmQyNGM=
   data.tar.gz: !binary |-
-    ZmJkOWUyMGU1YmZmNzhhMWMxNTJlNTM3N2U0YzQxODBjZjBjMmM2NzY0YzEw
-    NmY0N2JjZjg0OWRjMjAyZTU2MmQ5OTJhOGJmOTY3NjlkNTEwYjAzZDUwOTc3
-    YTRlMTlhZGE2ZjM5MmZmYjM1MDkxZGI3YjBlZDFjMzc5NTk3NTk=
+    ZGMzM2M4MmZmNjhjODI1ZmViNmI2YjJhMDJjZDgzYzIwMDhlNmJiMWVmMWQy
+    NTJhYTRhZGExYjU2NzhkYjhhZDljNWI2Y2E2MTc4OTFjOGM2YzNmMDY2NzBi
+    ZGVjYTQ2ZjQ5YzEyMGViOThhZTcyZDNlNjQwMTU4MGJkMGI1N2E=

data/README.md

@@ -23,6 +23,7 @@ Output plugin for Datadog
 
 ```sh
 echo '{"metric":"some.metric.name", "value":50.0}' | fluent-cat datadog.metric
+echo '{"metric":"some.metric.name", "value":100.0, "tag":"any.tag", "host":"any.host", "type":"gauge"}' | fluent-cat datadog.metric
 ```
 
 ## Contributing

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.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
   spec.description   = %q{Output plugin for Datadog}

data/lib/fluent/plugin/out_dd.rb

@@ -1,16 +1,10 @@
 class Fluent::DdOutput < Fluent::BufferedOutput
-  include Fluent::SetTimeKeyMixin
-  include Fluent::SetTagKeyMixin
-
   Fluent::Plugin.register_output('dd', self)
 
   unless method_defined?(:log)
     define_method('log') { $log }
   end
 
-  config_set_default :include_time_key, true
-  config_set_default :include_tag_key, true
-
   config_param :dd_api_key, :string
   config_param :host, :string, :default => nil
 
@@ -18,7 +12,6 @@ class Fluent::DdOutput < Fluent::BufferedOutput
     super
     require 'dogapi'
     require 'socket'
-    require 'time'
   end
 
   def start
@@ -45,31 +38,32 @@ class Fluent::DdOutput < Fluent::BufferedOutput
   end
 
   def format(tag, time, record)
-    record.to_msgpack
+    [tag, time, record].to_msgpack
   end
 
   def write(chunk)
     enum = chunk.to_enum(:msgpack_each)
 
-    enum.select {|record|
+    enum.select {|tag, time, record|
       unless record['metric']
-        log.warn("`metric` key does not exist: #{record.inspect}")
+        log.warn("`metric` key does not exist: #{[tag, time, record].inspect}")
       end
 
       record['metric']
-    }.chunk {|record|
-      record.values_at('metric', 'tag', 'host', 'type')
+    }.chunk {|tag, time, record|
+      tag = record['tag'] || tag
+      [tag] + record.values_at('metric', 'host', 'type')
     }.each {|i, records|
-      metric, tag, host, type = i
+      tag, metric, host, type = i
 
-      points = records.map do |record|
-        time = Time.parse(record['time'])
+      points = records.map do |tag, time, record|
+        time = Time.at(time)
         value = record['value']
         [time, value]
       end
 
       options = {}
-      options['tags'] = [tag] if tag
+      options['tags'] = tag.split(',').map {|i| i.strip } if tag
       options['host'] = host if host
       options['type'] = type if type
 

data/spec/out_dd_spec.rb

@@ -59,6 +59,74 @@ describe Fluent::DdOutput do
     end
   end
 
+  it 'should be called emit_points for each tag (tag is included in the record)' do
+    run_driver 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]],
+        {"tags"=>["test.11"]}
+      )
+
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 150.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 200.0]],
+        {"tags"=>["test.21"]}
+      )
+
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 250.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 300.0]],
+        {"tags"=>["test.31"]}
+      )
+
+      d.emit({"metric" => "some.metric.name", "value" => 50.0,  "tag" => "test.11"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 100.0, "tag" => "test.11"}, time)
+
+      d.emit({"metric" => "some.metric.name", "value" => 150.0, "tag" => "test.21"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 200.0, "tag" => "test.21"}, time)
+
+      d.emit({"metric" => "some.metric.name", "value" => 250.0, "tag" => "test.31"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 300.0, "tag" => "test.31"}, time)
+    end
+  end
+
+  it 'should be called emit_points with multiple tags' do
+    run_driver 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]],
+        {"tags"=>["test.12","test.13"]}
+      )
+
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 150.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 200.0]],
+        {"tags"=>["test.22","test.23"]}
+      )
+
+      dog.should_receive(:emit_points).with(
+        "some.metric.name",
+        [[Time.parse("2014-02-08 04:14:15 UTC"), 250.0],
+         [Time.parse("2014-02-08 04:14:15 UTC"), 300.0]],
+        {"tags"=>["test.32","test.33"]}
+      )
+
+      d.emit({"metric" => "some.metric.name", "value" => 50.0,  "tag" => "test.12,test.13"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 100.0, "tag" => "test.12,test.13"}, time)
+
+      d.emit({"metric" => "some.metric.name", "value" => 150.0, "tag" => "test.22,test.23"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 200.0, "tag" => "test.22,test.23"}, time)
+
+      d.emit({"metric" => "some.metric.name", "value" => 250.0, "tag" => "test.32,test.33"}, time)
+      d.emit({"metric" => "some.metric.name", "value" => 300.0, "tag" => "test.32,test.33"}, time)
+    end
+  end
+
   it 'should be called emit_points for each host' do
     run_driver do |d, dog|
       dog.should_receive(:emit_points).with(
@@ -125,9 +193,9 @@ describe Fluent::DdOutput do
 
       log = d.instance.log
       log.should_receive(:warn)
-         .with('`metric` key does not exist: {"no metric"=>"some.metric.name", "value"=>51.0, "time"=>"2014-02-08T04:14:15Z", "tag"=>"test.default"}')
+         .with('`metric` key does not exist: ["test.default", 1391832855, {"no metric"=>"some.metric.name", "value"=>51.0}]')
       log.should_receive(:warn)
-         .with('`metric` key does not exist: {"no metric"=>"some.metric.name", "value"=>101.0, "time"=>"2014-02-08T04:14:15Z", "tag"=>"test.default"}')
+         .with('`metric` key does not exist: ["test.default", 1391832855, {"no metric"=>"some.metric.name", "value"=>101.0}]')
 
       d.emit({"no metric" => "some.metric.name", "value" => 51.0}, time)
       d.emit({"no metric" => "some.metric.name", "value" => 101.0}, time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd