metriks-addons 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4e956a6fd668b75db1e1a0aaa5ce393f1794c1
-  data.tar.gz: b2fad9c2404f245fb75171eb2af41ddb96173c37
+  metadata.gz: 4db1c3d87383debd88414081ffbd778182284f39
+  data.tar.gz: 837248d062520be4f17924116f4c4a497cb5ae6a
 SHA512:
-  metadata.gz: 061e8b73b199cf750b416c1fea947c642b863a4007e5328c2de8c16a86e5dc0a9f2cf7a7e0a4514c50caac0c7cfac527b6b704d18a30754b50a6b4dc1ab90353
-  data.tar.gz: c200a04e9fae2dc94225c7e3ac15f617513c7e54935d8299be26e3e90b10e9543af96eb8a6b92f0663e96bfd2102c5e598723dc38ed74a118f668909ea02c78c
+  metadata.gz: a04a7d5cdcd2f1781ede3a8402ee11aaf61413520beab7bb9bc870a34d8d8f482c5cbb5ac3d378415f3806d16197ad5be6787df4ecd51b621b81a1758feb6dc9
+  data.tar.gz: 51dda187346fa9b97d5c0fd795af600e6ee06d187182b00081d01009459554a2ac6a7e2826908583f5cce0f102a4a3f37a2ffd696d27a333f70c71da85a0dff7

data/Gemfile

@@ -16,6 +16,10 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'activesupport', '~> 4.2.7' if RUBY_VERSION < '2.2.0'
+gem 'signalfx', '~> 0.1.0' if RUBY_VERSION < '2.2.0'
+
 group :test do
   gem "rake"
   gem "rspec"

data/lib/metriks-addons.rb

@@ -16,7 +16,8 @@
 require_relative 'metriks-addons/opentsdb_reporter'
 require_relative 'metriks-addons/signalfx_reporter'
 require_relative 'metriks-addons/cloudwatch_reporter'
+require_relative 'metriks-addons/datadog_reporter'
 
 module MetriksAddons
-  VERSION = '3.1.4'
+  VERSION = '3.2.0'
 end

data/lib/metriks-addons/datadog_reporter.rb

@@ -0,0 +1,122 @@
+##
+# Copyright (c) 2015. Qubole Inc
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+#    limitations under the License.
+##
+
+require 'metriks/time_tracker'
+require 'logger'
+require 'dogapi'
+require_relative 'base_reporter'
+
+module MetriksAddons
+  class DatadogApiReporter < BaseReporter
+    attr_accessor :client, :prefix, :source, :tags, :logger
+
+    def initialize(key, host_name, tags, options = {})
+      super(options)
+      @key = key
+      @tags = tags
+
+      @prefix = options[:prefix]
+      @client = Dogapi::Client.new(key)
+    end
+
+    def submit(datapoints)
+      return if datapoints.empty?
+
+      log "debug", "Datapoints for Datadog: #{datapoints.inspect}"
+      size = {}
+      response = @client.batch_metrics do
+        datapoints.each do |type, data|
+          size[type] = 0
+          data.each do |metric_name, points|
+            size[type] += points.size
+            if type == 'counter'
+              @client.emit_points(metric_name, points, :type => 'counter', :tags => @tags)
+            else
+              @client.emit_points(metric_name, points, :tags => @tags)
+            end
+          end
+        end
+      end
+
+      log "debug", "Sent #{datapoints.size} metrics to Datadog"
+      log "debug", "Response is: #{response}"
+    end
+
+    def get_datapoints
+      seconds = @time_tracker.now_floored
+      time = Time.at(seconds)
+
+      datapoints = {}
+      counter = {}
+      gauge = {}
+      log "debug", "Registry: #{@registry}"
+      @registry.each do |name, metric|
+        next if name.nil? || name.empty?
+        name = name.to_s.gsub(/ +/, '_')
+        if @prefix
+          name = "#{@prefix}.#{name}"
+        end
+
+        case metric
+          when Metriks::Meter
+            counter = counter.merge(create_datapoints name, metric, time, [
+                                                 :count
+                                             ])
+          when Metriks::Counter
+            counter = counter.merge(create_datapoints name, metric, time, [
+                                                 :count
+                                             ])
+          when Metriks::Gauge
+            gauge = gauge.merge(create_datapoints name, metric, time, [
+                                               :value
+                                           ])
+          when Metriks::Timer
+            counter = counter.merge(create_datapoints name, metric, time, [
+                                                 :count
+                                             ])
+            gauge = gauge.merge(create_datapoints name, metric, time, [
+                                               :min, :max, :mean
+                                           ])
+        end
+      end
+
+      datapoints['counter'] = counter if counter.any?
+      datapoints['gauge'] = gauge if gauge.any?
+      datapoints
+    end
+
+    def create_datapoints(base_name, metric, time, keys, snapshot_keys = [])
+      datapoints = {}
+
+      keys.flatten.each do |key|
+        name = key.to_s.gsub(/^get_/, '')
+        metric_name = "#{base_name}.#{name}"
+        value = metric.send(key)
+        datapoints[metric_name] = [[time, value]]
+      end
+
+      unless snapshot_keys.empty?
+        snapshot = metric.snapshot
+        snapshot_keys.flatten.each do |key|
+          name = key.to_s.gsub(/^get_/, '')
+          metric_name = "#{base_name}.#{name}"
+          value = snapshot.send(key)
+          datapoints[metric_name] = [[time, value]]
+        end
+      end
+      datapoints
+    end
+  end
+end

data/metriks-addons.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks-addons'
-  s.version           = '3.1.4'
-  s.date              = '2015-12-28'
+  s.version           = '3.2.0'
+  s.date              = '2017-01-30'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "Reporters for Metriks."
-  s.description = "OpenTSDB and SignalFX reporter for Metriks."
+  s.description = "OpenTSDB, SignalFX and DatadogApi reporter for Metriks."
 
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'metriks', '~> 0.9', '>= 0.9.9.7'
   s.add_runtime_dependency 'rest-client', '>= 1.6.7'
   s.add_runtime_dependency 'signalfx', '>= 0.1.0'
+  s.add_runtime_dependency 'dogapi', '1.23.0'
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -82,10 +83,12 @@ Gem::Specification.new do |s|
     lib/metriks-addons.rb
     lib/metriks-addons/base_reporter.rb
     lib/metriks-addons/cloudwatch_reporter.rb
+    lib/metriks-addons/datadog_reporter.rb
     lib/metriks-addons/opentsdb_reporter.rb
     lib/metriks-addons/signalfx_reporter.rb
     metriks-addons.gemspec
     spec/cloudwatch_spec.rb
+    spec/datadog_api_spec.rb
     spec/opentsdb_spec.rb
     spec/signalfx_spec.rb
   ]

data/spec/datadog_api_spec.rb

@@ -0,0 +1,87 @@
+##
+# Copyright (c) 2015. Qubole Inc
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+#    limitations under the License.
+##
+
+require 'webmock/rspec'
+require 'metriks'
+require 'metriks-addons/datadog_reporter'
+
+describe "Smoke test" do
+  before(:all) do
+    stub_request(:any, "http://localhost:4242")
+  end
+
+  before(:each) do
+    @registry = Metriks::Registry.new
+    @reporter = MetriksAddons::DatadogApiReporter.new(
+        "123456789",
+        "127.0.0.1",
+        [{:env => "test"}],
+        { :registry => @registry})
+  end
+
+  after(:each) do
+    @reporter.stop
+    @registry.stop
+  end
+
+  it "meter" do
+    @registry.meter('meter.testing').mark
+    datapoints = @reporter.get_datapoints
+    expect(datapoints['counter'].size).to eql(1)
+    expect(datapoints['counter']).to have_key("meter.testing.count")
+    expect(datapoints['counter']["meter.testing.count"][0][1]).to eql(1)
+    expect(datapoints['counter']["meter.testing.count"][0][0]).not_to be_nil
+  end
+
+  it "counters" do
+    @registry.counter('counter.testing').increment
+    datapoints = @reporter.get_datapoints
+    expect(datapoints['counter'].size).to eql(1)
+    expect(datapoints['counter']).to have_key("counter.testing.count")
+    expect(datapoints['counter']["counter.testing.count"][0][1]).to eql(1)
+    expect(datapoints['counter']["counter.testing.count"][0][0]).not_to be_nil
+  end
+
+  it "timer" do
+    @registry.timer('timer.testing').update(1.5)
+    datapoints = @reporter.get_datapoints
+    expect(datapoints['counter'].size).to eql(1)
+    expect(datapoints['gauge'].size).to eql(3)
+    expect(datapoints['counter']).to have_key("timer.testing.count")
+    expect(datapoints['counter']['timer.testing.count'][0][1]).to eql(1)
+    expect(datapoints['counter']['timer.testing.count'][0][0]).not_to be_nil
+
+    expect(datapoints['gauge']).to have_key("timer.testing.min")
+    expect(datapoints['gauge']['timer.testing.min'][0][1]).not_to be_nil
+    expect(datapoints['gauge']['timer.testing.min'][0][0]).not_to be_nil
+
+    expect(datapoints['gauge']).to have_key("timer.testing.max")
+    expect(datapoints['gauge']['timer.testing.max'][0][1]).not_to be_nil
+    expect(datapoints['gauge']['timer.testing.max'][0][0]).not_to be_nil
+
+    expect(datapoints['gauge']).to have_key("timer.testing.mean")
+    expect(datapoints['gauge']['timer.testing.mean'][0][1]).not_to be_nil
+    expect(datapoints['gauge']['timer.testing.mean'][0][0]).not_to be_nil
+  end
+
+  it "gauges" do
+    @registry.gauge('gauge.testing') { 123 }
+    datapoints = @reporter.get_datapoints
+    expect(datapoints['gauge'].size).to eql(1)
+    expect(datapoints['gauge']).to have_key("gauge.testing.value")
+    expect(datapoints['gauge']['gauge.testing.value'][0][1]).to eql(123)
+    expect(datapoints['gauge']['gauge.testing.value'][0][0]).not_to be_nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metriks-addons
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Rajat Venkatesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: dogapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.23.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: OpenTSDB and SignalFX reporter for Metriks.
+description: OpenTSDB, SignalFX and DatadogApi reporter for Metriks.
 email: rvenkatesh@qubole.com
 executables: []
 extensions: []
@@ -88,10 +102,12 @@ files:
 - lib/metriks-addons.rb
 - lib/metriks-addons/base_reporter.rb
 - lib/metriks-addons/cloudwatch_reporter.rb
+- lib/metriks-addons/datadog_reporter.rb
 - lib/metriks-addons/opentsdb_reporter.rb
 - lib/metriks-addons/signalfx_reporter.rb
 - metriks-addons.gemspec
 - spec/cloudwatch_spec.rb
+- spec/datadog_api_spec.rb
 - spec/opentsdb_spec.rb
 - spec/signalfx_spec.rb
 homepage: https://github.com/vrajat/metriks-addons
@@ -114,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 2
 summary: Reporters for Metriks.