fluent-plugin-metricsense 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59764f3c7ed4fbb6497511dfbb4192a00a99fc68
-  data.tar.gz: 6bd4a75bad047e5ddb75b254cfd3b61e0b9ba6f7
+  metadata.gz: 8dd6ab4f7b2fa39712c9ad5f13ecb744d36c7a4f
+  data.tar.gz: 4b64a429413ccf16f5ee3777efc4125b19318103
 SHA512:
-  metadata.gz: 2af8c1065e6fb16a8072dd519bc18b542c096a1503eabdea24db3984afab92a863af5e8c3dfe4c98c5173da503aa6e6ca709b7e8208d89079cedab878b8e28a2
-  data.tar.gz: f9b5f6559aed2936f955571a41f07536c8d5ebe81ae733b2bc979df2a45a28bf953903019beca9a54aae95ddd310dd23979cb69facede28e5df8b47d2e277559
+  metadata.gz: c59f0a0addc0c5604a5bfe8892ed5a808ce18f5ecf28a06ac6fca144a961583de708990d9830a6a952386c77c1254b1114b8753a749d2671f4fbbac29feb763a
+  data.tar.gz: e3ef2c3e6bc5e0986a93a830715373599e471cb5f05c7fbdfa11c8a4212ede895ef999fc7d8b2ac915e34d4c0219db2d6f114264454fa21734dbc34cfd5f6569

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/fluent-plugin-metricsense.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency "fluentd", "~> 0.10.6"
+  s.add_dependency "fluentd", ">= 0.10.6"
   s.add_dependency "dogapi"
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency 'bundler', ['>= 1.0.0']

data/lib/fluent/plugin/backends/datadog_backend.rb

@@ -62,30 +62,27 @@ module Fluent::MetricSenseOutput::Backends
           metric_points[metric][segment].push([Time.at(time), value])
         end
 
-        metric_points.each do |metric, segment_points|
-          segment_points.each do |segment, points|
-            tags = @tags.dup
-            if segment and not segment.empty?
-              tags.push(segment)
-            end
-
-            options = {}
-            options[:tags] = tags
-            options[:host] = @host if @host
-            options[:type] = "gauge"
-
-            log.debug("datadog emit points: metric=#{metric}, points=#{points.inspect}, options=#{options.inspect}")
-            begin
-              code, response = @dog.emit_points(metric, points, options)
-            rescue Exception => error
-              # dogapi may raise an Exception.
-              # fluentd expects StandardError as retriable error, though.
-              raise("datadog error: #{error.class}: #{error.message}")
-            end
-            if code.to_i / 100 != 2
-              raise("datadog error: HTTP #{code}: #{response.inspect}")
+        begin
+          log.debug("sending #{metric_points.length} metric(s) to datadog...")
+          @dog.batch_metrics do
+            metric_points.each do |metric, segment_points|
+              segment_points.each do |segment, points|
+                tags = @tags.dup
+                if segment and not segment.empty?
+                  tags.push(segment)
+                end
+                options = {}
+                options[:tags] = tags
+                options[:host] = @host if @host
+                options[:type] = "gauge"
+                @dog.emit_points(metric, points, options)
+              end
             end
           end
+        rescue Exception => error
+           # dogapi may raise an Exception.
+           # fluentd expects StandardError as retriable error, though.
+           raise("datadog error: #{error.class}: #{error.message}")
         end
       end
     end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metricsense
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency