fluent-plugin-dogstatsd 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce5e12ea022b781f31f745f2a31ff3764860ab2
-  data.tar.gz: 83e3d99b0b172ac3a4e678e88299b2aaeb31257c
+  metadata.gz: f188162ad60261d59a5dd838f6885ad22f793e57
+  data.tar.gz: 81fb1419996bf0ca51be6f212e69c752237b14b0
 SHA512:
-  metadata.gz: 779b3b7fbc3b189d88478edd560ee7dd65c02c8e3d29c02597f68dd11f3cee1ccb0139cd60a4317b2751566f5e23eedfe5959bb3ddd780ae7de8430db3edaf0d
-  data.tar.gz: 2f19c1bb877c1e22b581b39477221a4f0ff035e0b36fbccbd4cad556b6fb131053afd2177836e8358cbc464e84e6a8f3d3272fa3b4c4bf653cf5a0c1ae6bdc6b
+  metadata.gz: 748ec60e813ebff20e0c35dfc0d480806f0a8eec0ddc690073c13bece6c96d54a049164f080c625dbc06f823bb997996d011cc4ca499d3bf5d9d737d16352792
+  data.tar.gz: eb3d5f4ce5f50b456df495bce922e90169ceb6ce7d1913ec46288128f97b6b9471a3db2928ff9f9f216d8a489034cf40ca7a499f7e2c08646546ab692174ccbc

data/README.md

@@ -30,6 +30,12 @@ Supported types are `increment`, `decrement`, `count`, `gauge`, `histogram`, `ti
 
   # Use tag of fluentd record as key sent to Dogstatsd
   use_tag_as_key false
+
+  # (Treat fields in a record as tags)
+  # flat_tag true
+
+  # (Metric type in Datadog.)
+  # metric_type increment
 </match>
 ```
 

data/fluent-plugin-dogstatsd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fluentd"
-  spec.add_dependency "dogstatsd-ruby"
+  spec.add_dependency "dogstatsd-ruby", "~> 1.4.1"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/fluent/plugin/dogstatsd/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Dogstatsd
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/fluent/plugin/out_dogstatsd.rb

@@ -5,6 +5,8 @@ module Fluent
     config_param :host, :string, :default => nil
     config_param :port, :integer, :default => nil
     config_param :use_tag_as_key, :bool, :default => false
+    config_param :flat_tag, :bool, :default => false
+    config_param :metric_type, :string, :default => nil
 
     unless method_defined?(:log)
       define_method(:log) { $log }
@@ -16,7 +18,6 @@ module Fluent
       super
 
       require 'statsd' # dogstatsd-ruby
-      require 'fluent/plugin/dogstatsd/statsd_patch'
     end
 
     def start
@@ -38,20 +39,35 @@ module Fluent
           key = if @use_tag_as_key
                   tag
                 else
-                  record['key']
+                  record.delete('key')
                 end
 
-          value = record['value']
+          unless key
+            log.warn "'key' is not specified. skip this record:", tag: tag
+            next
+          end
+
+          value = record.delete('value')
 
           options = {}
 
-          if record['tags']
-            options[:tags] = record['tags'].map do |k, v|
+          tags = if @flat_tag
+                   record
+                 else
+                   record['tags']
+                 end
+
+          title = record.delete('title')
+          text  = record.delete('text')
+          type  = @metric_type || record.delete('type')
+
+          if tags
+            options[:tags] = tags.map do |k, v|
               "#{k}:#{v}"
             end
           end
 
-          case record['type']
+          case type
           when 'increment'
             s.increment(key, options)
           when 'decrement'
@@ -67,7 +83,11 @@ module Fluent
           when 'set'
             s.set(key, value, options)
           when 'event'
-            s.event(record['title'], record['text'], options)
+            s.event(title, text, options)
+          when nil
+            log.warn "type is not provided (You can provide type via `metric_type` in config or `type` field in a record."
+          else
+            log.warn "Type '#{type}' is unknown."
           end
         end
       end

data/test/plugin/test_out_dogstatsd.rb

@@ -41,8 +41,6 @@ class DogstatsdOutputTest < Test::Unit::TestCase
   def test_write
     d = create_driver
 
-    d.instance.statsd = DummyStatsd.new
-
     d.emit({'type' => 'increment', 'key' => 'hello.world1'}, Time.now.to_i)
     d.emit({'type' => 'increment', 'key' => 'hello.world2'}, Time.now.to_i)
     d.emit({'type' => 'decrement', 'key' => 'hello.world'}, Time.now.to_i)
@@ -67,14 +65,40 @@ class DogstatsdOutputTest < Test::Unit::TestCase
     ])
   end
 
+  def test_flat_tag
+    d = create_driver(<<-EOC)
+#{default_config}
+flat_tag true
+    EOC
+
+    d.emit({'type' => 'increment', 'key' => 'hello.world', 'tagKey' => 'tagValue'}, Time.now.to_i)
+    d.run
+
+    assert_equal(d.instance.statsd.messages, [
+      [:increment, 'hello.world', {tags: ["tagKey:tagValue"]}],
+    ])
+  end
+
+  def test_metric_type
+    d = create_driver(<<-EOC)
+#{default_config}
+metric_type decrement
+    EOC
+
+    d.emit({'key' => 'hello.world', 'tags' => {'tagKey' => 'tagValue'}}, Time.now.to_i)
+    d.run
+
+    assert_equal(d.instance.statsd.messages, [
+      [:decrement, 'hello.world', {tags: ["tagKey:tagValue"]}],
+    ])
+  end
+
   def test_use_tag_as_key
     d = create_driver(<<-EOC)
 #{default_config}
 use_tag_as_key true
     EOC
 
-    d.instance.statsd = DummyStatsd.new
-
     d.emit({'type' => 'increment'}, Time.now.to_i)
     d.run
 
@@ -85,7 +109,6 @@ use_tag_as_key true
 
   def test_tags
     d = create_driver
-    d.instance.statsd = DummyStatsd.new
     d.emit({'type' => 'increment', 'key' => 'hello.world', 'tags' => {'key' => 'value'}}, Time.now.to_i)
     d.run
 
@@ -102,7 +125,9 @@ use_tag_as_key true
   end
 
   def create_driver(conf = default_config)
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::DogstatsdOutput, 'dogstatsd.tag').configure(conf)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::DogstatsdOutput, 'dogstatsd.tag').configure(conf).tap do |d|
+      d.instance.statsd = DummyStatsd.new
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dogstatsd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -28,16 +28,16 @@ dependencies:
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,6 @@ files:
 - Rakefile
 - fluent-plugin-dogstatsd.gemspec
 - lib/fluent/plugin/dogstatsd.rb
-- lib/fluent/plugin/dogstatsd/statsd_patch.rb
 - lib/fluent/plugin/dogstatsd/version.rb
 - lib/fluent/plugin/out_dogstatsd.rb
 - test/plugin/test_out_dogstatsd.rb

data/lib/fluent/plugin/dogstatsd/statsd_patch.rb

@@ -1,9 +0,0 @@
-require 'statsd'
-
-# https://github.com/DataDog/dogstatsd-ruby/pull/10
-class Statsd
-  def flush_buffer()
-    send_to_socket(@buffer.join("\n"))
-    @buffer = Array.new
-  end
-end